python-ipware 2.0.0__tar.gz → 2.0.2__tar.gz

{python-ipware-2.0.0/python_ipware.egg-info → python-ipware-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ipware
-Version: 2.0.0
+Version: 2.0.2
 Summary: A Python package to retrieve user's IP address
 Author-email: Val Neekman <info@neekware.com>
 License: MIT
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -133,7 +134,6 @@ request_headers_precedence_order = (
     "HTTP_X_CLUSTER_CLIENT_IP",  # Rackspace LB and Riverbed Stingray
     "HTTP_FORWARDED_FOR",  # RFC 7239
     "HTTP_FORWARDED",  # RFC 7239
-    "HTTP_VIA",  # Squid and others
     "X-CLIENT-IP",  # Microsoft Azure
     "X-REAL-IP",  # NGINX
     "X-CLUSTER-CLIENT-IP",  # Rackspace Cloud Load Balancers

{python-ipware-2.0.0 → python-ipware-2.0.2}/README.md

@@ -103,7 +103,6 @@ request_headers_precedence_order = (
     "HTTP_X_CLUSTER_CLIENT_IP",  # Rackspace LB and Riverbed Stingray
     "HTTP_FORWARDED_FOR",  # RFC 7239
     "HTTP_FORWARDED",  # RFC 7239
-    "HTTP_VIA",  # Squid and others
     "X-CLIENT-IP",  # Microsoft Azure
     "X-REAL-IP",  # NGINX
     "X-CLUSTER-CLIENT-IP",  # Rackspace Cloud Load Balancers

{python-ipware-2.0.0 → python-ipware-2.0.2}/pyproject.toml

@@ -26,6 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 
 [project.urls]

python-ipware-2.0.2/python_ipware/__version__.py

@@ -0,0 +1 @@
+__version__ = "2.0.2"

{python-ipware-2.0.0 → python-ipware-2.0.2}/python_ipware/python_ipware.py

@@ -6,6 +6,8 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 IpAddressType = Union[ipaddress.IPv4Address, ipaddress.IPv6Address]
 OptionalIpAddressType = Optional[IpAddressType]
 
+logger = logging.getLogger(__name__)
+
 
 class IpWareMeta:
     """
@@ -26,7 +28,6 @@ class IpWareMeta:
             "HTTP_X_CLUSTER_CLIENT_IP",  # Rackspace LB and Riverbed Stingray
             "HTTP_FORWARDED_FOR",  # RFC 7239
             "HTTP_FORWARDED",  # RFC 7239
-            "HTTP_VIA",  # Squid and others
             "X-CLIENT-IP",  # Microsoft Azure
             "X-REAL-IP",  # NGINX
             "X-CLUSTER-CLIENT-IP",  # Rackspace Cloud Load Balancers
@@ -106,7 +107,7 @@ class IpWareIpAddress:
                     ip = ipaddress.IPv4Address(ipv4)
                 except ipaddress.AddressValueError:
                     # not a valid IP address, return None
-                    logging.exception("Invalid ip address. {0}".format(ip_str))
+                    logger.info("Invalid ip address. {0}".format(ip_str))
                     ip = None
         return ip
 
@@ -325,7 +326,7 @@ class IpWare(IpWareMeta, IpWareProxy, IpWareIpAddress):
         """
 
         if not ip_list:
-            logging.warning("Invalid ip list provided.")
+            logger.warning("Invalid ip list provided.")
             return None, False
 
         # the incoming ips match our trusted proxy list

{python-ipware-2.0.0 → python-ipware-2.0.2/python_ipware.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ipware
-Version: 2.0.0
+Version: 2.0.2
 Summary: A Python package to retrieve user's IP address
 Author-email: Val Neekman <info@neekware.com>
 License: MIT
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -133,7 +134,6 @@ request_headers_precedence_order = (
     "HTTP_X_CLUSTER_CLIENT_IP",  # Rackspace LB and Riverbed Stingray
     "HTTP_FORWARDED_FOR",  # RFC 7239
     "HTTP_FORWARDED",  # RFC 7239
-    "HTTP_VIA",  # Squid and others
     "X-CLIENT-IP",  # Microsoft Azure
     "X-REAL-IP",  # NGINX
     "X-CLUSTER-CLIENT-IP",  # Rackspace Cloud Load Balancers

{python-ipware-2.0.0 → python-ipware-2.0.2}/tests/tests_ipv4.py

@@ -364,13 +364,6 @@ class TestIPv4Headers(unittest.TestCase):
         r = self.ipware.get_client_ip(meta)
         self.assertEqual(r, (IPv4Address("177.139.233.139"), False))
 
-    def test_ipv4_http_via(self):
-        meta = {
-            "HTTP_VIA": "177.139.233.139",
-        }
-        r = self.ipware.get_client_ip(meta)
-        self.assertEqual(r, (IPv4Address("177.139.233.139"), False))
-
     def test_ipv4_x_client_ip(self):
         meta = {
             "X-CLIENT-IP": "177.139.233.139",

python-ipware-2.0.0/python_ipware/__version__.py

@@ -1 +0,0 @@
-__version__ = "2.0.0"