Made requested changes

Author: oree-xx

scripts/1-fetch/wikipedia_fetch.py

@@ -19,13 +19,12 @@
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
-# First-party/Local
-import shared  # noqa: E402
-from shared import STATUS_FORCELIST, USER_AGENT
-
 # Add parent directory so shared can be imported
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
+# First-party/Local
+import shared  # noqa: E402
+
 # Setup
 LOGGER, PATHS = shared.setup(__file__)
 FILE_LANGUAGES = os.path.join(
@@ -63,11 +62,11 @@ def get_requests_session():
     max_retries = Retry(
         total=5,
         backoff_factor=10,
-        status_forcelist=STATUS_FORCELIST,
+        status_forcelist=shared.STATUS_FORCELIST,
     )
     session = requests.Session()
     session.mount("https://", HTTPAdapter(max_retries=max_retries))
-    session.headers.update({"User-Agent": USER_AGENT})
+    session.headers.update({"User-Agent": shared.USER_AGENT})
     return session
 
 

scripts/shared.py

@@ -7,10 +7,6 @@
 from git import InvalidGitRepositoryError, NoSuchPathError, Repo
 from pandas import PeriodIndex
 
-USER_AGENT = (
-    "QuantifyingTheCommons/1.0 "
-    "(https://github.com/creativecommons/quantifying)"
-)
 STATUS_FORCELIST = [
     408,  # Request Timeout
     422,  # Unprocessable Content (Validation failed, or endpoint spammed)
@@ -21,6 +17,11 @@
     504,  # Gateway Timeout
 ]
 
+USER_AGENT = (
+    "QuantifyingTheCommons/1.0 "
+    "(https://github.com/creativecommons/quantifying)"
+)
+
 
 class QuantifyingException(Exception):
     def __init__(self, message, exit_code=None):