remove admin_sig_version in the admin client and only use sig_version

Author: jpringle03

duo_client/admin.py

@@ -216,40 +216,16 @@
 
 class Admin(client.Client):
     account_id = None
-    admin_sig_version = 5
+    sig_version = 5
 
-    def api_call(self, method, path, params, sig_version=admin_sig_version):
+    def api_call(self, method, path, params, sig_version=sig_version):
         if self.account_id is not None:
             params['account_id'] = self.account_id
-        return super(Admin, self).api_call(
-            method,
-            path,
-            params,
-            sig_version=sig_version
-        )
 
-    def json_api_call(self, method, path, params, sig_version=admin_sig_version):
-        return super(Admin, self).json_api_call(
-            method,
-            path,
-            params,
-            sig_version=sig_version
-        )
-
-    def json_paging_api_call(self, method, path, params, sig_version=admin_sig_version):
-        return super(Admin, self).json_paging_api_call(
-            method,
-            path,
-            params,
-            sig_version=sig_version
-        )
-
-    def json_cursor_api_call(self, method, path, params, get_records_func, sig_version=admin_sig_version):
-        return super(Admin, self).json_cursor_api_call(
+        return super(Admin, self).api_call(
             method,
             path,
             params,
-            get_records_func,
             sig_version=sig_version
         )
 

duo_client/client.py

@@ -462,16 +462,16 @@ def normalize_paging_args(self, limit=None, offset=0):
 
         return (limit, offset)
 
-    def json_api_call(self, method, path, params, sig_version=None):
+    def json_api_call(self, method, path, params):
         """
         Call a Duo API method which is expected to return a JSON body
         with a 200 status. Return the response data structure or raise
         RuntimeError.
         """
-        (response, data) = self.api_call(method, path, params, sig_version=sig_version)
+        (response, data) = self.api_call(method, path, params)
         return self.parse_json_response(response, data)
 
-    def json_paging_api_call(self, method, path, params, sig_version=None):
+    def json_paging_api_call(self, method, path, params):
         """
         Call a Duo API method which is expected to return a JSON body
         with a 200 status. Return a generator that can be used to get
@@ -485,13 +485,13 @@ def json_paging_api_call(self, method, path, params, sig_version=None):
 
         while next_offset is not None:
             params['offset'] = str(next_offset)
-            (response, data) = self.api_call(method, path, params, sig_version=sig_version)
+            (response, data) = self.api_call(method, path, params)
             (objects, metadata) = self.parse_json_response_and_metadata(response, data)
             next_offset = metadata.get('next_offset', None)
             for obj in objects:
                 yield obj
 
-    def json_cursor_api_call(self, method, path, params, get_records_func, sig_version=None):
+    def json_cursor_api_call(self, method, path, params, get_records_func):
         """
         Call a Duo API endpoint which utilizes a cursor in some responses to
         page through a set of data. This cursor is supplied through the optional
@@ -520,7 +520,7 @@ def json_cursor_api_call(self, method, path, params, get_records_func, sig_versi
         while True:
             if next_offset is not None:
                 params['offset'] = str(next_offset)
-            (http_resp, http_resp_data) = self.api_call(method, path, params, sig_version=sig_version)
+            (http_resp, http_resp_data) = self.api_call(method, path, params)
             (response, metadata) = self.parse_json_response_and_metadata(
                 http_resp,
                 http_resp_data,

tests/admin/test_settings.py

@@ -65,6 +65,7 @@ def test_update_settings(self):
                 'telephony_warning_min': '50',
                 'caller_id': '+15035551000',
                 'user_telephony_cost_max': '10',
+                'pending_deletion_days': '5',
                 'minimum_password_length': '12',
                 'password_requires_upper_alpha': '1',
                 'password_requires_lower_alpha': '1',