Skip to content

Fix relative path with a file in between #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix relative path with a file in between #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/test_url_normalize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"http://www.foo.com:80/foo": "http://www.foo.com/foo",
"http://www.foo.com.:81/foo": "http://www.foo.com:81/foo",
"http://www.foo.com./foo/bar.html": "http://www.foo.com/foo/bar.html",
"http://www.foo.com/foo/bar.html/../bar.html": "http://www.foo.com/bar.html",
"http://www.foo.com/%7Ebar": "http://www.foo.com/~bar",
"http://www.foo.com/%7ebar": "http://www.foo.com/~bar",
"пример.испытание/Служебная:Search/Test": "https://xn--e1afmkfd.xn--80akhbyknj4f/%D0%A1%D0%BB%D1%83%D0%B6%D0%B5%D0%B1%D0%BD%D0%B0%D1%8F:Search/Test",
Expand Down
6 changes: 5 additions & 1 deletion url_normalize/url_normalize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@ def normalize_path(path, scheme):
# Prevent dot-segments appearing in non-relative URI paths.
if scheme in ["", "http", "https", "ftp", "file"]:
output, part = [], None
for part in path.split("/"):
parts = path.split("/")
last_idx = len(parts) - 1
for idx, part in enumerate(parts):
if part == "":
if not output:
output.append(part)
Expand All @@ -158,6 +160,8 @@ def normalize_path(path, scheme):
elif part == "..":
if len(output) > 1:
output.pop()
elif re.search(r'\.', part) and idx != last_idx:
pass
else:
output.append(part)
if part in ["", ".", ".."]:
Expand Down