For #46997, fix connect false (shotgunsoftware#168)

jfboismenu · web-flow · commit 1aea8b9ab51a · 2018-03-20T08:10:04.000-04:00
Implemented lazy-loading of records_per_page so we can honor the `connect=False` flag in the `__init__`.
diff --git a/shotgun_api3/lib/mockgun/mockgun.py b/shotgun_api3/lib/mockgun/mockgun.py
@@ -190,7 +190,7 @@ def __init__(self,
         # these settings won't make sense for mockgun, but
         # having them present means code and get and set them
         # they way they would expect to in the real API.
-        self.config = _Config()
+        self.config = _Config(self)
 
         # load in the shotgun schema to associate with this Shotgun
         (schema_path, schema_entity_path) = self.get_schema_paths()
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -331,7 +331,11 @@ class _Config(object):
     Container for the client configuration.
     """
 
-    def __init__(self):
+    def __init__(self, sg):
+        """
+        :param sg: Shotgun connection.
+        """
+        self._sg = sg
         self.max_rpc_attempts = 3
         # From http://docs.python.org/2.6/library/httplib.html:
         # If the optional timeout parameter is given, blocking operations
@@ -340,7 +344,7 @@ def __init__(self):
         self.timeout_secs = None
         self.api_ver = 'api3'
         self.convert_datetimes_to_utc = True
-        self.records_per_page = 500
+        self._records_per_page = None
         self.api_key = None
         self.script_name = None
         self.user_login = None
@@ -371,6 +375,17 @@ def __init__(self):
         self.authorization = None
         self.no_ssl_validation = False
 
+    @property
+    def records_per_page(self):
+        """
+        The records per page value from the server.
+        """
+        if self._records_per_page is None:
+            # Check for api_max_entities_per_page in the server info and change the record per page
+            # value if it is supplied.
+            self._records_per_page = self._sg.server_info.get('api_max_entities_per_page') or 500
+        return self._records_per_page
+
 
 class Shotgun(object):
     """
@@ -519,7 +534,7 @@ def __init__(self,
             if connect:
                 raise ValueError("must provide login/password, session_token or script_name/api_key")
 
-        self.config = _Config()
+        self.config = _Config(self)
         self.config.api_key = api_key
         self.config.script_name = script_name
         self.config.user_login = login
@@ -597,9 +612,6 @@ def __init__(self,
         if connect:
             self.server_caps
 
-        # Check for api_max_entities_per_page in the server info and change the record per page value if it is supplied.
-        self.config.records_per_page = self.server_info.get('api_max_entities_per_page') or self.config.records_per_page
-
         # When using auth_token in a 2FA scenario we need to switch to session-based
         # authentication because the auth token will no longer be valid after a first use.
         if self.config.auth_token is not None:
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -132,11 +132,6 @@ def auth_args():
         self.assertRaises(api.Fault, self.sg.delete, "FakeType", 1)
         self.assertEqual(my_uuid, auth_args()["session_uuid"])
 
-    def test_config(self):
-        """Client config can be created"""
-        x = api.shotgun._Config()
-        self.assertTrue(x is not None)
-
     def test_url(self):
         """Server url is parsed correctly"""
         login    = self.human_user['login']
diff --git a/tests/tests_unit.py b/tests/tests_unit.py
