Import pandas in __init__()

aviau · aviau · commit 65ddc0f55cd7 · 2014-12-13T12:02:03.000-05:00
diff --git a/influxdb/__init__.py b/influxdb/__init__.py
@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 from .client import InfluxDBClient
+from .dataframe_client import DataFrameClient
 
 
-__all__ = ['InfluxDBClient']
+__all__ = [
+    'InfluxDBClient',
+    'DataFrameClient',
+]
 
-try:
-    import pandas
-    from .dataframe_client import DataFrameClient
-    __all__ += 'DataFrameClient'
-except ImportError:
-    pass
 
 __version__ = '0.1.13'
diff --git a/influxdb/dataframe_client.py b/influxdb/dataframe_client.py
@@ -4,7 +4,6 @@
 """
 import math
 import warnings
-import pandas as pd
 
 from .client import InfluxDBClient
 
@@ -16,7 +15,18 @@ class DataFrameClient(InfluxDBClient):
     The client reads and writes from pandas DataFrames.
     """
 
-    EPOCH = pd.Timestamp('1970-01-01 00:00:00.000+00:00')
+    def __init__(self, *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))
+            )
+
+        self.EPOCH = pd.Timestamp('1970-01-01 00:00:00.000+00:00')
 
     def write_points(self, data, *args, **kwargs):
         """
@@ -122,7 +132,7 @@ def _convert_dataframe_to_json(self, dataframe, name, time_precision='s'):
         return data
 
     def _datetime_to_epoch(self, datetime, time_precision='s'):
-        seconds = (datetime - DataFrameClient.EPOCH).total_seconds()
+        seconds = (datetime - self.EPOCH).total_seconds()
         if time_precision == 's':
             return seconds
         elif time_precision == 'm':
diff --git a/tests/influxdb/dataframe_client_test.py b/tests/influxdb/dataframe_client_test.py
diff --git a/tox.ini b/tox.ini
@@ -29,6 +29,6 @@ deps = -r{toxinidir}/requirements.txt
 commands = sphinx-build -b html docs/source docs/build
 
 [flake8]
-ignore = N802,F401
+ignore = N802,F821
 # N802: nosetests's setUp function
-# F401: False positive in intluxdb/__init__.py
+# F821: False positive in intluxdb/dataframe_client.py
