Skip to content

Replace urlparse with urlsplit #887

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

Merged
Mr0grog merged 1 commit into from
Oct 10, 2025
Merged

Replace urlparse with urlsplit #887

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
10 changes: 5 additions & 5 deletions web_monitoring/cli/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import threading
import time
from tqdm import tqdm
from urllib.parse import urlparse
from urllib.parse import urlsplit
from web_monitoring import db
import wayback
from wayback.exceptions import (WaybackException, WaybackRetryError,
Expand Down Expand Up @@ -931,14 +931,14 @@ def _is_page(version):
aren't filtering down to a explicit list of URLs.
"""
return (version.mime_type not in SUBRESOURCE_MIME_TYPES and
splitext(urlparse(version.url).path)[1] not in SUBRESOURCE_EXTENSIONS)
splitext(urlsplit(version.url).path)[1] not in SUBRESOURCE_EXTENSIONS)


def _parse_path(path_string):
if path_string is None:
return None

parsed = urlparse(path_string)
parsed = urlsplit(path_string)
if parsed.scheme == '':
return Path(path_string)
elif parsed.scheme == 'file':
Expand All @@ -955,9 +955,9 @@ def _is_valid(url):
a URL is valid if it has a valid addressing scheme and network location.
"""
try:
result = urlparse(url)
result = urlsplit(url)
return all([result.scheme, result.netloc])
except:
except Exception:
return False


Expand Down
6 changes: 3 additions & 3 deletions web_monitoring/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import threading
import time
from typing import Generator, Iterable, TypeVar
from urllib.parse import ParseResult, urlparse
from urllib.parse import SplitResult, urlsplit

try:
from cchardet import detect as detect_charset
Expand Down Expand Up @@ -164,7 +164,7 @@ def hash_content(content_bytes):
return hashlib.sha256(content_bytes).hexdigest()


def normalize_netloc(url: ParseResult) -> str:
def normalize_netloc(url: SplitResult) -> str:
"""
Get a parsed URL's netloc in a normalized form.
"""
Expand Down Expand Up @@ -193,7 +193,7 @@ def normalize_url(url: str) -> str:
should always be handled by a server or HTTP library exactly the same as
the input would have been.
"""
parsed = urlparse(url)
parsed = urlsplit(url)
return parsed._replace(
netloc=normalize_netloc(parsed),
path=(parsed.path or '/'),
Expand Down