replace all deprecated endpoints with the new ones

jvshahid · jvshahid · commit 93e819a47e26 · 2013-12-06T11:42:55.000-05:00
diff --git a/examples/tutorial.py b/examples/tutorial.py
@@ -33,6 +33,12 @@ def main(host=None, port=None):
     print("Add database user: " + dbuser)
     client.add_database_user(dbuser, dbuser_password)
 
+    print("Make user a database admin")
+    client.set_database_admin(dbuser)
+
+    print("Remove admin privilege from user")
+    client.unset_database_admin(dbuser)
+
     dbusers = client.get_database_users()
     print("Get list of database users again: {0}".format(dbusers))
 
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -349,30 +349,24 @@ def set_database_admin(self, username):
         """
         Set user as database admin
         """
-        response = requests.post(
-            "{0}/db/{1}/admins/{2}?u={3}&p={4}".format(
-                self._baseurl,
-                self._database,
-                username,
-                self._username,
-                self._password))
-        if response.status_code == 200:
-            return True
-        else:
-            raise Exception(
-                "{0}: {1}".format(response.status_code, response.content))
+        return self.alter_database_admin(username, True)
 
     def unset_database_admin(self, username):
         """
         Unset user as database admin
         """
-        response = requests.delete(
-            "{0}/db/{1}/admins/{2}?u={3}&p={4}".format(
+        return self.alter_database_admin(username, False)
+
+    def alter_database_admin(self, username, is_admin):
+        response = requests.post(
+            "{0}/db/{1}/users/{2}?u={3}&p={4}".format(
                 self._baseurl,
                 self._database,
                 username,
                 self._username,
-                self._password))
+                self._password),
+            data=json.dumps({'admin': is_admin}),
+            headers=self._headers)
         if response.status_code == 200:
             return True
         else:
