fix tzinfo in PJM

WattTime · Apr 14, 2014 · 19d8223 · 19d8223
1 parent 3b7ceec
commit 19d8223
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pyiso/pjm.py b/pyiso/pjm.py
@@ -40,7 +40,11 @@ def _get_edata(self, data_type, key):
     def _utcify(self, ts_str):
         naive_local_time = dateutil_parse(ts_str)
         is_dst = 'EDT' in ts_str
-        aware_local_time = pytz.timezone('America/New_York').localize(naive_local_time, is_dst=is_dst)
+        if naive_local_time.tzinfo is None:
+            aware_local_time = pytz.timezone('America/New_York').localize(naive_local_time, is_dst=is_dst)
+        else:
+            aware_local_time = naive_local_time
+
         aware_utc_time = aware_local_time.astimezone(pytz.utc)
         return aware_utc_time
 

diff --git a/tests/test_genmix.py b/tests/test_genmix.py
@@ -289,3 +289,13 @@ def test_pjm_latest(self):
         expected_fuels = ['wind', 'nonwind']
         for expfuel in expected_fuels:
             self.assertIn(expfuel, fuels)
+
+    def test_utcify(self):
+        ts_str = '04/13/14 21:45 EDT'
+        ts = client_factory('PJM')._utcify(ts_str)
+        self.assertEqual(ts.year, 2014)
+        self.assertEqual(ts.month, 4)
+        self.assertEqual(ts.day, 13+1)
+        self.assertEqual(ts.hour, 21-20)
+        self.assertEqual(ts.minute, 45)
+        self.assertEqual(ts.tzinfo, pytz.utc)