python-ipware 1.0.5__tar.gz → 2.0.1__tar.gz

{python-ipware-1.0.5 → python-ipware-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ipware
-Version: 1.0.5
+Version: 2.0.1
 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
@@ -71,7 +72,7 @@ pip3 install python-ipware
 Here's a basic example of how to use `python-ipware` in a view or middleware where the `request` object is available. This can be applied in Django, Flask, or other similar frameworks.
 
 ```python
-from ipware import IpWare
+from python_ipware import IpWare
 
 # Instantiate IpWare with default values
 ipw = IpWare()
@@ -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
@@ -216,7 +216,7 @@ You can customize the proxy count by providing your `proxy_count` during initial
 
 ```python
 # In the above scenario, the total number of proxies can be used as a way to filter out unwanted requests.
-from ipware import IpWare
+from python_ipware import IpWare
 
 # enforce proxy count
 ipw = IpWare(proxy_count=1)
@@ -249,7 +249,7 @@ In the following `example`, your public load balancer (LB) can be seen as the `o
 ```python
 # We make best attempt to return the first public IP address based on header precedence
 # Then we fall back on private, followed by loopback
-from ipware import IpWare
+from python_ipware import IpWare
 
 # no proxy enforce in this example
 ipw = IpWare()

{python-ipware-1.0.5 → python-ipware-2.0.1}/README.md

@@ -41,7 +41,7 @@ pip3 install python-ipware
 Here's a basic example of how to use `python-ipware` in a view or middleware where the `request` object is available. This can be applied in Django, Flask, or other similar frameworks.
 
 ```python
-from ipware import IpWare
+from python_ipware import IpWare
 
 # Instantiate IpWare with default values
 ipw = IpWare()
@@ -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
@@ -186,7 +185,7 @@ You can customize the proxy count by providing your `proxy_count` during initial
 
 ```python
 # In the above scenario, the total number of proxies can be used as a way to filter out unwanted requests.
-from ipware import IpWare
+from python_ipware import IpWare
 
 # enforce proxy count
 ipw = IpWare(proxy_count=1)
@@ -219,7 +218,7 @@ In the following `example`, your public load balancer (LB) can be seen as the `o
 ```python
 # We make best attempt to return the first public IP address based on header precedence
 # Then we fall back on private, followed by loopback
-from ipware import IpWare
+from python_ipware import IpWare
 
 # no proxy enforce in this example
 ipw = IpWare()

{python-ipware-1.0.5 → python-ipware-2.0.1}/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]
@@ -43,14 +44,14 @@ dev = [
 ]
 
 [tool.setuptools]
-packages = ["ipware"]
+packages = ["python_ipware"]
 
 [tool.setuptools.dynamic]
-version = {attr = "ipware.__version__"}
+version = {attr = "python_ipware.__version__"}
 readme = {file = ["README.md"], content-type = "text/markdown"}
 
 [tool.setuptools.package-data]
-"ipware" = ["py.typed"]
+"python_ipware" = ["py.typed"]
 
 [tool.ruff]
 select = [
@@ -85,5 +86,5 @@ max-complexity = 16
 
 [tool.coverage.run]
 omit = [
-    "ipware/__version__.py"
+    "python_ipware/__version__.py"
 ]

{python-ipware-1.0.5/ipware → python-ipware-2.0.1/python_ipware}/__init__.py

@@ -1,2 +1,2 @@
-from .ipware import IpWare  # noqa
+from .python_ipware import IpWare  # noqa
 from .__version__ import __version__  # noqa

python-ipware-2.0.1/python_ipware/__version__.py

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

python-ipware-1.0.5/ipware/ipware.py → python-ipware-2.0.1/python_ipware/python_ipware.py

@@ -26,7 +26,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 +105,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))
+                    logging.info("Invalid ip address. {0}".format(ip_str))
                     ip = None
         return ip
 

{python-ipware-1.0.5 → python-ipware-2.0.1}/python_ipware.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ipware
-Version: 1.0.5
+Version: 2.0.1
 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
@@ -71,7 +72,7 @@ pip3 install python-ipware
 Here's a basic example of how to use `python-ipware` in a view or middleware where the `request` object is available. This can be applied in Django, Flask, or other similar frameworks.
 
 ```python
-from ipware import IpWare
+from python_ipware import IpWare
 
 # Instantiate IpWare with default values
 ipw = IpWare()
@@ -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
@@ -216,7 +216,7 @@ You can customize the proxy count by providing your `proxy_count` during initial
 
 ```python
 # In the above scenario, the total number of proxies can be used as a way to filter out unwanted requests.
-from ipware import IpWare
+from python_ipware import IpWare
 
 # enforce proxy count
 ipw = IpWare(proxy_count=1)
@@ -249,7 +249,7 @@ In the following `example`, your public load balancer (LB) can be seen as the `o
 ```python
 # We make best attempt to return the first public IP address based on header precedence
 # Then we fall back on private, followed by loopback
-from ipware import IpWare
+from python_ipware import IpWare
 
 # no proxy enforce in this example
 ipw = IpWare()

{python-ipware-1.0.5 → python-ipware-2.0.1}/python_ipware.egg-info/SOURCES.txt

@@ -1,10 +1,10 @@
 LICENSE
 README.md
 pyproject.toml
-ipware/__init__.py
-ipware/__version__.py
-ipware/ipware.py
-ipware/py.typed
+python_ipware/__init__.py
+python_ipware/__version__.py
+python_ipware/py.typed
+python_ipware/python_ipware.py
 python_ipware.egg-info/PKG-INFO
 python_ipware.egg-info/SOURCES.txt
 python_ipware.egg-info/dependency_links.txt

python-ipware-2.0.1/python_ipware.egg-info/top_level.txt

@@ -0,0 +1 @@
+python_ipware

{python-ipware-1.0.5 → python-ipware-2.0.1}/tests/tests_ipv4.py

@@ -1,7 +1,7 @@
 import unittest
 import logging
 from ipaddress import IPv4Address
-from ipware import IpWare
+from python_ipware import IpWare
 
 logging.disable(logging.CRITICAL)  # Disable logging for the entire file
 
@@ -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-1.0.5 → python-ipware-2.0.1}/tests/tests_ipv6.py

@@ -2,7 +2,7 @@ import unittest
 import logging
 from ipaddress import IPv4Address, IPv6Address
 
-from ipware import IpWare
+from python_ipware import IpWare
 
 logging.disable(logging.CRITICAL)  # Disable logging for the entire file
 

python-ipware-1.0.5/ipware/__version__.py

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

python-ipware-1.0.5/python_ipware.egg-info/top_level.txt

@@ -1 +0,0 @@
-ipware