Allow user_id to be used as a keyword argument for account_id

Author: oschwald

geoip2/webservice.py

@@ -82,16 +82,29 @@ class Client(object):
 
     """
 
-    def __init__(self,
-                 account_id,
-                 license_key,
-                 host='geoip.maxmind.com',
-                 locales=None,
-                 timeout=None):
+    def __init__(
+            self,
+            account_id=None,
+            license_key=None,
+            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
         # or a string, with the former being preferred.

tests/webservice_test.py

@@ -293,6 +293,21 @@ def test_insights_ok(self, mock):
             type(insights), geoip2.models.Insights,
             'return value of client.insights')
 
+    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)
+
+    def test_missing_constructor_args(self):
+        with self.assertRaises(TypeError):
+            Client(license_key='1234567890ab')
+
+        with self.assertRaises(TypeError):
+            Client('47')
+
 
 if __name__ == '__main__':
     unittest.main()