diff --git a/CHANGELOG.md b/CHANGELOG.md index a1346c7..0880f0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 7.0.0 + +Enhance: +- Up version python-ipware (minimal possible api / compatibility change) + # 6.0.5 Enhance: diff --git a/ipware/__version__.py b/ipware/__version__.py index 18cf66e..7bb5f1e 100644 --- a/ipware/__version__.py +++ b/ipware/__version__.py @@ -5,4 +5,4 @@ __url__ = 'https://github.com/un33k/django-ipware' __license__ = 'MIT' __copyright__ = 'Copyright 2023 Val Neekman @ Neekware Inc.' -__version__ = '6.0.5' +__version__ = '7.0.0' diff --git a/ipware/ip.py b/ipware/ip.py index c64a3bd..641956b 100644 --- a/ipware/ip.py +++ b/ipware/ip.py @@ -13,15 +13,13 @@ def get_client_ip( request_header_order: Optional[Iterable[str]] = None, ) -> Tuple[str, bool]: leftmost = proxy_order == 'left-most' - proxy_count = proxy_count if proxy_count is not None else getattr(settings, 'IPWARE_META_PROXY_COUNT', 0) - proxy_list = proxy_trusted_ips if proxy_trusted_ips is not None else [] request_header_order = getattr(settings, 'IPWARE_META_PRECEDENCE_ORDER', request_header_order) # Instantiate IpWare with values from the function arguments ipw = IpWare(precedence=request_header_order, leftmost=leftmost, proxy_count=proxy_count, - proxy_list=proxy_list) + proxy_list=proxy_trusted_ips) ip, _ = ipw.get_client_ip(request.META, True)