fixes #157

Author: timkpaine

pyEX/common.py

@@ -138,51 +138,53 @@
 ]
 
 _STANDARD_DATE_FIELDS = [
+    "consensusEndDate",
+    "consensusStartDate",
+    "DailyListTimestamp",
     "date",
+    "datetime",
+    "declaredDate",
     "EPSReportDate",
-    "fiscalEndDate",
+    "endDate",
     "exDate",
-    "declaredDate",
-    "paymentDate",
-    "recordDate",
-    "reportDate",
-    "datetime",
     "expectedDate",
+    "expirationDate",
+    "fiscalEndDate",
     "latestTime",
-    "DailyListTimestamp",
-    "RecordUpdateTime",
-    "settlementDate",
+    "lastTradeDate",
     "lastUpdated",
+    "paymentDate",
     "processedTime",
-    "expirationDate",
+    "recordDate",
+    "RecordUpdateTime",
+    "reportDate",
+    "settlementDate",
     "startDate",
-    "endDate",
-    "consensusEndDate",
-    "consensusStartDate",
 ]
 
 _STANDARD_TIME_FIELDS = [
     "closeTime",
     "close.time",
     "delayedPriceTime",
     "extendedPriceTime",
+    "highTime",
+    "iexCloseTime",
     "iexLastUpdated",
+    "iexOpenTime",
+    "lastTradeTime",
+    "lastUpdated",
     "latestTime",
+    "latestUpdate",
+    "lowTime",
+    "oddLotDelayedPriceTime",
     "openTime",
     "open.time",
     "processedTime",
+    "report_date",
+    "reportDate",
     "time",
     "timestamp",
-    "lastUpdated",
-    "reportDate",
-    "report_date",
-    "iexOpenTime",
-    "iexCloseTime",
-    "lastTradeTime",
-    "highTime",
-    "lowTime",
-    "latestUpdate",
-    "oddLotDelayedPriceTime",
+    "updated",
 ]
 
 _INDICATORS = [
@@ -794,8 +796,15 @@ def _reindex(df, col):
 
 def _toDatetime(df, cols=None, tcols=None):
     """internal"""
-    cols = cols if cols is not None else _STANDARD_DATE_FIELDS
-    tcols = tcols if tcols is not None else _STANDARD_TIME_FIELDS
+    if not isinstance(cols, list):
+        cols = [cols]
+    if not isinstance(tcols, list):
+        tcols = [tcols]
+
+    cols = cols + _STANDARD_DATE_FIELDS if cols is not None else _STANDARD_DATE_FIELDS
+    tcols = (
+        tcols + _STANDARD_TIME_FIELDS if tcols is not None else _STANDARD_TIME_FIELDS
+    )
 
     for col in cols:
         if col in df.columns:

pyEX/options/options.py

@@ -64,5 +64,5 @@ def options(symbol, expiration, side="", token="", version="", filter=""):
 def optionsDF(symbol, expiration, side="", token="", version="", filter=""):
     p = options(symbol, expiration, side, token, version, filter)
     df = pd.DataFrame(p)
-    _toDatetime(df)
+    _toDatetime(df, tcols=["date"])
     return df