Merge pull request influxdata#83 from jonashaag/refactor

aviau · aviau · commit 319f10c2c99e · 2014-11-05T10:34:46.000-05:00
Refactor: Better name (Thanks @jonashaag!)
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -124,7 +124,7 @@ def switch_user(self, username, password):
         self._password = password
 
     def request(self, url, method='GET', params=None, data=None,
-                status_code=200):
+                expected_response_code=200):
         """
         Make a http request to API
         """
@@ -153,7 +153,7 @@ def request(self, url, method='GET', params=None, data=None,
             timeout=self._timeout
         )
 
-        if response.status_code == status_code:
+        if response.status_code == expected_response_code:
             return response
         else:
             raise InfluxDBClientError(response.content, response.status_code)
@@ -231,7 +231,7 @@ def write_points_with_precision(self, data, time_precision='s'):
                 method='POST',
                 params=params,
                 data=data,
-                status_code=200
+                expected_response_code=200
             )
 
         return True
@@ -247,7 +247,7 @@ def delete_points(self, name):
         self.request(
             url=url,
             method='DELETE',
-            status_code=204
+            expected_response_code=204
         )
 
         return True
@@ -319,7 +319,7 @@ def query(self, query, time_precision='s', chunked=False):
             url=url,
             method='GET',
             params=params,
-            status_code=200
+            expected_response_code=200
         )
 
         return response.json()
@@ -350,7 +350,7 @@ def create_database(self, database):
             url=url,
             method='POST',
             data=data,
-            status_code=201
+            expected_response_code=201
         )
 
         return True
@@ -370,7 +370,7 @@ def delete_database(self, database):
         self.request(
             url=url,
             method='DELETE',
-            status_code=204
+            expected_response_code=204
         )
 
         return True
@@ -387,7 +387,7 @@ def get_database_list(self):
         response = self.request(
             url=url,
             method='GET',
-            status_code=200
+            expected_response_code=200
         )
 
         return response.json()
@@ -410,7 +410,7 @@ def delete_series(self, series):
         self.request(
             url=url,
             method='DELETE',
-            status_code=204
+            expected_response_code=204
         )
 
         return True
@@ -478,7 +478,7 @@ def get_list_cluster_admins(self):
         response = self.request(
             url="cluster_admins",
             method='GET',
-            status_code=200
+            expected_response_code=200
         )
 
         return response.json()
@@ -496,7 +496,7 @@ def add_cluster_admin(self, new_username, new_password):
             url="cluster_admins",
             method='POST',
             data=data,
-            status_code=200
+            expected_response_code=200
         )
 
         return True
@@ -515,7 +515,7 @@ def update_cluster_admin_password(self, username, new_password):
             url=url,
             method='POST',
             data=data,
-            status_code=200
+            expected_response_code=200
         )
 
         return True
@@ -529,7 +529,7 @@ def delete_cluster_admin(self, username):
         self.request(
             url=url,
             method='DELETE',
-            status_code=200
+            expected_response_code=200
         )
 
         return True
@@ -555,7 +555,7 @@ def alter_database_admin(self, username, is_admin):
             url=url,
             method='POST',
             data=data,
-            status_code=200
+            expected_response_code=200
         )
 
         return True
@@ -627,7 +627,7 @@ def get_database_users(self):
         response = self.request(
             url=url,
             method='GET',
-            status_code=200
+            expected_response_code=200
         )
 
         return response.json()
@@ -657,7 +657,7 @@ def add_database_user(self, new_username, new_password, permissions=None):
             url=url,
             method='POST',
             data=data,
-            status_code=200
+            expected_response_code=200
         )
 
         return True
@@ -676,7 +676,7 @@ def update_database_user_password(self, username, new_password):
             url=url,
             method='POST',
             data=data,
-            status_code=200
+            expected_response_code=200
         )
 
         if username == self._username:
@@ -693,7 +693,7 @@ def delete_database_user(self, username):
         self.request(
             url=url,
             method='DELETE',
-            status_code=200
+            expected_response_code=200
         )
 
         return True
