From d8cf09c21e2d6e3ece8a7e5c93d537596c3687d0 Mon Sep 17 00:00:00 2001
From: Ben Muthalaly <benmuthalaly@gmail.com>
Date: Tue, 5 Mar 2024 21:13:45 -0600
Subject: [PATCH] Remove unnecessary variable length args for dedupe
---
archivebox/extractors/archive_org.py | 2 +-
archivebox/extractors/favicon.py | 2 +-
archivebox/extractors/headers.py | 2 +-
archivebox/extractors/media.py | 2 +-
archivebox/extractors/singlefile.py | 2 +-
archivebox/extractors/title.py | 2 +-
archivebox/extractors/wget.py | 2 +-
archivebox/util.py | 4 ++--
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/archivebox/extractors/archive_org.py b/archivebox/extractors/archive_org.py
index 0d45534a..245315f1 100644
--- a/archivebox/extractors/archive_org.py
+++ b/archivebox/extractors/archive_org.py
@@ -57,7 +57,7 @@ def save_archive_dot_org(link: Link, out_dir: Optional[Path]=None, timeout: int=
]
cmd = [
CURL_BINARY,
- *dedupe(*options),
+ *dedupe(options),
submit_url,
]
status = 'succeeded'
diff --git a/archivebox/extractors/favicon.py b/archivebox/extractors/favicon.py
index fffa3d16..f793f8df 100644
--- a/archivebox/extractors/favicon.py
+++ b/archivebox/extractors/favicon.py
@@ -50,7 +50,7 @@ def save_favicon(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEOUT)
]
cmd = [
CURL_BINARY,
- *dedupe(*options),
+ *dedupe(options),
FAVICON_PROVIDER.format(domain(link.url)),
]
status = 'failed'
diff --git a/archivebox/extractors/headers.py b/archivebox/extractors/headers.py
index 9be14331..975787ad 100644
--- a/archivebox/extractors/headers.py
+++ b/archivebox/extractors/headers.py
@@ -53,7 +53,7 @@ def save_headers(link: Link, out_dir: Optional[str]=None, timeout: int=TIMEOUT)
]
cmd = [
CURL_BINARY,
- *dedupe(*options),
+ *dedupe(options),
link.url,
]
try:
diff --git a/archivebox/extractors/media.py b/archivebox/extractors/media.py
index a6d4e81f..ad4c9c4b 100644
--- a/archivebox/extractors/media.py
+++ b/archivebox/extractors/media.py
@@ -50,7 +50,7 @@ def save_media(link: Link, out_dir: Optional[Path]=None, timeout: int=MEDIA_TIME
]
cmd = [
YOUTUBEDL_BINARY,
- *dedupe(*options),
+ *dedupe(options),
link.url,
]
status = 'succeeded'
diff --git a/archivebox/extractors/singlefile.py b/archivebox/extractors/singlefile.py
index 5021a6cc..553c9f8d 100644
--- a/archivebox/extractors/singlefile.py
+++ b/archivebox/extractors/singlefile.py
@@ -57,7 +57,7 @@ def save_singlefile(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEO
]
cmd = [
DEPENDENCIES['SINGLEFILE_BINARY']['path'],
- *dedupe(*options),
+ *dedupe(options),
link.url,
output,
]
diff --git a/archivebox/extractors/title.py b/archivebox/extractors/title.py
index 4f34ca81..5decc52c 100644
--- a/archivebox/extractors/title.py
+++ b/archivebox/extractors/title.py
@@ -114,7 +114,7 @@ def save_title(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEOUT) -
]
cmd = [
CURL_BINARY,
- *dedupe(*options),
+ *dedupe(options),
link.url,
]
status = 'succeeded'
diff --git a/archivebox/extractors/wget.py b/archivebox/extractors/wget.py
index 885e31f5..07471e29 100644
--- a/archivebox/extractors/wget.py
+++ b/archivebox/extractors/wget.py
@@ -74,7 +74,7 @@ def save_wget(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEOUT) ->
]
cmd = [
WGET_BINARY,
- *dedupe(*options),
+ *dedupe(options),
link.url,
]
diff --git a/archivebox/util.py b/archivebox/util.py
index 10ceebd4..e1707049 100644
--- a/archivebox/util.py
+++ b/archivebox/util.py
@@ -287,7 +287,7 @@ def chrome_args(**options) -> List[str]:
cmd_args.append('--user-data-dir={}'.format(options['CHROME_USER_DATA_DIR']))
- return dedupe(*cmd_args)
+ return dedupe(cmd_args)
def chrome_cleanup():
"""
@@ -325,7 +325,7 @@ def ansi_to_html(text):
@enforce_types
-def dedupe(*options: str) -> List[str]:
+def dedupe(options: List[str]) -> List[str]:
"""
Deduplicates the given options. Options that come later clobber earlier
conflicting options.