Merge branch 'master' into master

aviau · web-flow · commit d544faeb4365 · 2017-10-28T16:27:20.000-04:00
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
@@ -86,7 +86,7 @@ def write_points(self,
 
                 if protocol == 'line':
                     points = self._convert_dataframe_to_lines(
-                        dataframe.ix[start_index:end_index].copy(),
+                        dataframe.iloc[start_index:end_index].copy(),
                         measurement=measurement,
                         global_tags=tags,
                         time_precision=time_precision,
@@ -95,7 +95,7 @@ def write_points(self,
                         numeric_precision=numeric_precision)
                 else:
                     points = self._convert_dataframe_to_json(
-                        dataframe.ix[start_index:end_index].copy(),
+                        dataframe.iloc[start_index:end_index].copy(),
                         measurement=measurement,
                         tags=tags,
                         time_precision=time_precision,
diff --git a/influxdb/influxdb08/dataframe_client.py b/influxdb/influxdb08/dataframe_client.py
@@ -59,7 +59,7 @@ def write_points(self, data, *args, **kwargs):
                         self._convert_dataframe_to_json(
                             name=key,
                             dataframe=data_frame
-                            .ix[start_index:end_index].copy(),
+                            .iloc[start_index:end_index].copy(),
                             time_precision=time_precision)]
                     InfluxDBClient.write_points(self, outdata, *args, **kwargs)
             return True
