Fix influxdb08 dataframe client flake8 errors.

geodimm · geodimm · commit 6d60f44977fa · 2015-06-25T22:31:19.000+01:00
diff --git a/influxdb/influxdb08/dataframe_client.py b/influxdb/influxdb08/dataframe_client.py
@@ -7,6 +7,17 @@
 
 from .client import InfluxDBClient
 
+try:
+    import pandas as pd
+except ImportError as ex:
+    raise ImportError('DataFrameClient requires Pandas, '
+                      '"{ex}" problem importing'.format(ex=str(ex)))
+try:
+    import numpy as np
+except ImportError as ex:
+    raise ImportError('DataFrameClient requires Numpy, '
+                      '"{ex}" problem importing'.format(ex=str(ex)))
+
 
 class DataFrameClient(InfluxDBClient):
     """
@@ -17,22 +28,6 @@ class DataFrameClient(InfluxDBClient):
 
     def __init__(self, ignore_nan=True, *args, **kwargs):
         super(DataFrameClient, self).__init__(*args, **kwargs)
-        try:
-            global pd
-            import pandas as pd
-        except ImportError as ex:
-            raise ImportError(
-                'DataFrameClient requires Pandas, "{ex}" problem importing'
-                .format(ex=str(ex))
-            )
-        try:
-            global np
-            import numpy as np
-        except ImportError as ex:
-            raise ImportError(
-                'DataFrameClient requires Numpy, "{ex}" problem importing'
-                .format(ex=str(ex))
-            )
 
         self.EPOCH = pd.Timestamp('1970-01-01 00:00:00.000+00:00')
         self.ignore_nan = ignore_nan
@@ -149,7 +144,8 @@ def _convert_dataframe_to_json(self, dataframe, name, time_precision='s'):
 
     def _convert_array(self, array):
         if self.ignore_nan:
-            condition = (all(isinstance(el, (int, float, np.number)) for el in array) and
+            number_types = (int, float, np.number)
+            condition = (all(isinstance(el, number_types) for el in array) and
                          np.isnan(array))
             return list(np.where(condition, None, array))
         else:
