Merge pull request maxmind#165 from maxmind/greg/revert-mocket-hack

faktas2 · web-flow · commit c2a7d7443626 · 2024-01-21T01:14:40.000-05:00
Test with HTTPS again
diff --git a/geoip2/webservice.py b/geoip2/webservice.py
@@ -56,10 +56,6 @@
     f"GeoIP2-Python-Client/{geoip2.__version__} {requests.utils.default_user_agent()}"
 )
 
-# We have this so that we can avoid a mocket issue:
-# https://github.com/mindflayer/python-mocket/issues/209
-_SCHEME = "https"
-
 
 class BaseClient:  # pylint: disable=missing-class-docstring, too-few-public-methods
     _account_id: str
@@ -88,7 +84,7 @@ def __init__(
             account_id if isinstance(account_id, bytes) else str(account_id)
         )
         self._license_key = license_key
-        self._base_uri = f"{_SCHEME}://{host}/geoip/v2.1"
+        self._base_uri = f"https://{host}/geoip/v2.1"
         self._timeout = timeout
 
     def _uri(self, path: str, ip_address: IPAddress) -> str:
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,7 +37,7 @@ classifiers = [
 
 [project.optional-dependencies]
 test = [
-    "mocket>=3.11.1",
+    "mocket>=3.12.3",
 ]
 
 [tool.setuptools.package-data]
diff --git a/tests/webservice_test.py b/tests/webservice_test.py
@@ -25,16 +25,11 @@
     OutOfQueriesError,
     PermissionRequiredError,
 )
-import geoip2.webservice
 from geoip2.webservice import AsyncClient, Client
 
-# We have this so that we can avoid a mocket issue:
-# https://github.com/mindflayer/python-mocket/issues/209
-geoip2.webservice._SCHEME = "http"
-
 
 class TestBaseClient(unittest.TestCase):
-    base_uri = "http://geoip.maxmind.com/geoip/v2.1/"
+    base_uri = "https://geoip.maxmind.com/geoip/v2.1/"
     country = {
         "continent": {"code": "NA", "geoname_id": 42, "names": {"en": "North America"}},
         "country": {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ classifiers = [`
`37`	`37`
`38`	`38`	`[project.optional-dependencies]`
`39`	`39`	`test = [`
`40`		`- "mocket>=3.11.1",`
	`40`	`+ "mocket>=3.12.3",`
`41`	`41`	`]`
`42`	`42`
`43`	`43`	`[tool.setuptools.package-data]`