datamarket 0.8.1__tar.gz → 0.8.2__tar.gz

{datamarket-0.8.1 → datamarket-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.8.1
+Version: 0.8.2
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.8.1 → datamarket-0.8.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.8.1"
+version = "0.8.2"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

{datamarket-0.8.1 → datamarket-0.8.2}/src/datamarket/interfaces/proxy.py

@@ -2,8 +2,8 @@
 # IMPORTS
 
 import logging
-import time
 import random
+import time
 
 import requests
 from stem import Signal
@@ -45,7 +45,7 @@ class ProxyInterface:
             proxy_url = self.get_proxy_url("127.0.0.1", 9050)
         else:
             current_host, current_port = self.get_random_host_port() if randomize else self.get_current_host_port()
-            
+
             user = self.config.get("user")
             password = self.config.get("password")
             use_socks = self.config.get("socks", "false").lower() == "true"
@@ -67,14 +67,12 @@ class ProxyInterface:
     def get_random_host_port(self):
         hosts = self.config["hosts"].split(",") if isinstance(self.config["hosts"], str) else self.config["hosts"]
         host_port_pairs = [hp.split(":") for hp in hosts]
-        self.current_index = random.randint(0, len(host_port_pairs) - 1)
+        self.current_index = random.randint(0, len(host_port_pairs) - 1)  # noqa: S311
         return host_port_pairs[self.current_index]
 
     def check_current_ip(self):
         try:
-            return requests.get(self.CHECK_IP_URL, proxies=self.proxies).json()[
-                "YourFuckingIPAddress"
-            ]
+            return requests.get(self.CHECK_IP_URL, proxies=self.proxies, timeout=30).json()["YourFuckingIPAddress",]
         except Exception as ex:
             logger.error(ex)
 

{datamarket-0.8.1 → datamarket-0.8.2}/src/datamarket/utils/main.py

@@ -63,7 +63,7 @@ def read_converter(path_str: str):
 
 
 def get_config(config_file: Path, tz: str = "Europe/Madrid"):
-    if Path(config_file).suffix == "ini":
+    if Path(config_file).suffix == ".ini":
         logger.warning("Using legacy INI config reader. Please migrate to TOML")
         cfg = configparser.RawConfigParser()
         return cfg.read(config_file)