Merge branch 'master' of https://github.com/asakul/mds-tools

hap_csv_upload.py

@@ -10,7 +10,7 @@ import datetime
 import struct
 import re
 
-from pytz import timezone
+import dateutil.tz
 
 def sec_from_period(period):
     if period == "M1":
@@ -49,11 +49,11 @@ def main():
 
     period = args.timeframe
 
-    utc_tz = timezone('UTC')
+    utc_tz = dateutil.tz.gettz('UTC')
     if args.timezone is None:
         tz = utc_tz
     else:
-        tz = timezone(args.timezone)
+        tz = dateutil.tz.gettz(args.timezone)
 
     out_symbol = args.hap_symbol
 
@@ -95,7 +95,7 @@ def main():
             minute = int(time[2:4])
             second = int(time[4:6])
 
-            dt = datetime.datetime(year, month, day, hour, minute, second, 0, utc_tz).astimezone(tz) - time_delta
+            dt = datetime.datetime(year, month, day, hour, minute, second, 0, tzinfo=tz) - time_delta
 
             dt = dt.astimezone(utc_tz)
             serialized_bars.write(struct.pack("<qddddQ", int(dt.timestamp()), float(open_), float(high), float(low), float(close), int(volume)))

qhp-download-futures.py

@@ -8,7 +8,7 @@ import json
 import csv
 import datetime
 import struct
-from pytz import timezone
+import dateutil.tz
 
 def timeframe_to_seconds(tf):
     if tf == 'M1':
@@ -177,7 +177,7 @@ def main():
     print("Tickers: {}".format(tickers))
     for ticker in tickers:
         print("Requesting data: {}".format(ticker))
-        bars = get_data(s, ticker, start_time, end_time, period, timezone('UTC'), timedelta)
+        bars = get_data(s, ticker, start_time, end_time, period, dateutil.tz.gettz('UTC'), timedelta)
 
         if len(bars) > 0:
             data[ticker] = { 'bars' : bars }

qhp-hap-transfer.py

@@ -9,7 +9,7 @@ import csv
 import datetime
 import struct
 import re
-from pytz import timezone
+import dateutil.tz
 
 def sec_from_period(period):
     if period == "M1":
@@ -190,9 +190,9 @@ def main():
 
     tickers = request_ticker_list(qhp)
 
-    tz = timezone('UTC')
+    tz = dateutil.tz.gettz('UTC')
     if args.timezone is not None:
-        tz = timezone(args.timezone)
+        tz = dateutil.tz.gettz(args.timezone)
 
     timedelta = datetime.timedelta(seconds=0)
     if args.time_delta is not None: