Merge pull request influxdata#118 from areski/fix-pandas-import

aviau · aviau · commit d7e37d64c97d · 2015-03-09T15:15:13.000-07:00
handle error nicely when trying to import pandas
diff --git a/examples/tutorial_pandas.py b/examples/tutorial_pandas.py
@@ -20,7 +20,7 @@ def main(host='localhost', port=8086):
     client.create_database(dbname)
 
     print("Write DataFrame")
-    client.write_points({'demo':df})
+    client.write_points({'demo': df})
 
     print("Read DataFrame")
     client.query("select * from demo")
diff --git a/influxdb/dataframe_client.py b/influxdb/dataframe_client.py
@@ -7,6 +7,11 @@
 
 from .client import InfluxDBClient
 
+try:
+    import pandas as pd
+except ImportError:
+    pd = None
+
 
 class DataFrameClient(InfluxDBClient):
     """
@@ -17,13 +22,9 @@ class DataFrameClient(InfluxDBClient):
 
     def __init__(self, *args, **kwargs):
         super(DataFrameClient, self).__init__(*args, **kwargs)
-        try:
-            global pd
-            import pandas as pd
-        except ImportError as ex:
+        if not pd:
             raise ImportError(
-                'DataFrameClient requires Pandas, "{ex}" problem importing'
-                .format(ex=str(ex))
+                'DataFrameClient requires Pandas'
             )
 
         self.EPOCH = pd.Timestamp('1970-01-01 00:00:00.000+00:00')
