switch_db -> switch_database

aviau · aviau · commit c720f973265d · 2014-12-29T14:10:24.000-05:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -101,9 +101,9 @@ def __init__(self,
 
     # Change member variables
 
-    def switch_db(self, database):
+    def switch_database(self, database):
         """
-        switch_db()
+        switch_database()
 
         Change client database.
 
@@ -112,6 +112,18 @@ def switch_db(self, database):
         """
         self._database = database
 
+    def switch_db(self, database):
+        """
+        DEPRECATED. Change client database.
+
+        """
+        warnings.warn(
+            "switch_db is deprecated, and will be removed "
+            "in future versions. Please use "
+            "``InfluxDBClient.switch_database(database)`` instead.",
+            FutureWarning)
+        return self.switch_db(database)
+
     def switch_user(self, username, password):
         """
         switch_user()
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -85,7 +85,14 @@ def test_scheme(self):
         )
         assert cli._baseurl == 'https://host:8086'
 
-    def test_switch_db(self):
+    def test_switch_database(self):
+        cli = InfluxDBClient('host', 8086, 'username', 'password', 'database')
+        cli.switch_database('another_database')
+        assert cli._database == 'another_database'
+
+    @raises(FutureWarning)
+    def test_switch_db_deprecated(self):
+        warnings.simplefilter('error', FutureWarning)
         cli = InfluxDBClient('host', 8086, 'username', 'password', 'database')
         cli.switch_db('another_database')
         assert cli._database == 'another_database'
