commit f0f51ff72f6bf348a78fddd7064ff0f1a3f48aef
author Javi Merino <javi.merino@arm.com> Thu Apr 10 12:34:53 2014 +0100
committer Javi Merino <javi.merino@arm.com> Wed Aug 12 14:49:49 2015 +0100
tree ea06319e58b0db75e1d04f18630751af5543db96
parent ee8e1f53f7207264e53aa4ab421297aaf0903181

convert to pandas 0.13.1

cr2/thermal.py

diff --git a/cr2/thermal.py b/cr2/thermal.py
index 8b108de..75f24dd 100644
--- a/cr2/thermal.py
+++ b/cr2/thermal.py
@@ -92,13 +92,11 @@
         if not self.data_csv:
             self.parse_into_csv()
 
-        try:
-            unordered_df = pd.read_csv(StringIO(self.data_csv))
-            self.data_frame = unordered_df.set_index("time")
-        except StopIteration:
-            if not self.data_frame:
-                return pd.DataFrame()
-            raise
+        if self.data_csv is "":
+            return pd.DataFrame()
+
+        unordered_df = pd.read_csv(StringIO(self.data_csv))
+        self.data_frame = unordered_df.set_index("time")
 
         return self.data_frame