Merge influxdata#92 (Thanks @timtroendle!)

aviau · aviau · commit cd28c3614119 · 2014-11-26T15:33:52.000-05:00
Marked write_points_with_precision deprecated
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -5,6 +5,7 @@
 import json
 import socket
 import requests
+import warnings
 
 from influxdb import chunked_json
 
@@ -166,7 +167,7 @@ def request(self, url, method='GET', params=None, data=None,
     # by doing a POST to /db/foo_production/series?u=some_user&p=some_password
     # with a JSON body of points.
 
-    def write_points(self, data, *args, **kwargs):
+    def write_points(self, data, time_precision='s', *args, **kwargs):
         """
         write_points()
 
@@ -198,19 +199,27 @@ def list_chunks(l, n):
                         "name": name,
                         "columns": columns
                     }]
-                    time_precision = kwargs.get('time_precision', 's')
-                    self.write_points_with_precision(
+                    self._write_points(
                         data=item,
                         time_precision=time_precision)
 
                 return True
 
-        return self.write_points_with_precision(data, *args, **kwargs)
+        return self._write_points(data=data, time_precision=time_precision)
 
     def write_points_with_precision(self, data, time_precision='s'):
         """
-        Write to multiple time series names
+        DEPRECATED. Write to multiple time series names
+
         """
+        warnings.warn(
+            "write_points_with_precision is deprecated, and will be removed "
+            "in future versions. Please use "
+            "``InfluxDBClient.write_points(time_precision='..')`` instead.",
+            FutureWarning)
+        return self._write_points(data=data, time_precision=time_precision)
+
+    def _write_points(self, data, time_precision):
         if time_precision not in ['s', 'm', 'ms', 'u']:
             raise Exception(
                 "Invalid time precision is given. (use 's', 'm', 'ms' or 'u')")
diff --git a/influxdb/misc.py b/influxdb/misc.py
@@ -3,6 +3,7 @@
 Miscellaneous
 """
 import math
+import warnings
 
 from .client import InfluxDBClient
 
@@ -54,8 +55,14 @@ def write_points(self, data, *args, **kwargs):
 
     def write_points_with_precision(self, data, time_precision='s'):
         """
-        Write to multiple time series names
+        DEPRECATED. Write to multiple time series names
+
         """
+        warnings.warn(
+            "write_points_with_precision is deprecated, and will be removed "
+            "in future versions. Please use "
+            "``DataFrameClient.write_points(time_precision='..')`` instead.",
+            FutureWarning)
         return self.write_points(data, time_precision='s')
 
     def query(self, query, time_precision='s', chunked=False):
