Remove user_id support

Author: oschwald

geoip2/webservice.py

@@ -93,21 +93,11 @@ def __init__(
         host="geoip.maxmind.com",
         locales=None,
         timeout=None,
-        # This is deprecated and not documented for that reason.
-        # It can be removed if we do a major release in the future.
-        user_id=None,
     ):
         """Construct a Client."""
         # pylint: disable=too-many-arguments
         if locales is None:
             locales = ["en"]
-        if account_id is None:
-            account_id = user_id
-
-        if account_id is None:
-            raise TypeError("The account_id is a required parameter")
-        if license_key is None:
-            raise TypeError("The license_key is a required parameter")
 
         self._locales = locales
         # requests 2.12.2 requires that the username passed to auth be bytes

tests/webservice_test.py

@@ -339,12 +339,9 @@ def test_insights_ok(self, mock):
     def test_named_constructor_args(self):
         id = "47"
         key = "1234567890ab"
-        for client in (
-            Client(account_id=id, license_key=key),
-            Client(user_id=id, license_key=key),
-        ):
-            self.assertEqual(client._account_id, id)
-            self.assertEqual(client._license_key, key)
+        client = Client(account_id=id, license_key=key)
+        self.assertEqual(client._account_id, id)
+        self.assertEqual(client._license_key, key)
 
     def test_missing_constructor_args(self):
         with self.assertRaises(TypeError):