Timezone fix for date strings: #6

Author: nickmaccarthy

datemath/helpers.py

@@ -40,6 +40,7 @@
 
 import arrow
 import re
+from dateutil import tz
 
 debug = False 
 
@@ -127,21 +128,22 @@ def parse(expression, now=None, tz='UTC', type=None, roundDown=True):
 
     if not math or math == '':
         rettime = time
-
     rettime = evaluate(math, time, tz, roundDown)
+
     if type:
         return getattr(rettime, type)
     else:
         return rettime
 
 
-def parseTime(timestamp, tz='UTC'):
+def parseTime(timestamp, timezone='UTC'):
     '''
         parses a date/time stamp and returns and arrow object
     '''
-    #if timestamp and len(timestamp) >= 4 and (timestamp >= 0 or timestamp < 0): 
     if timestamp and len(timestamp) >= 4: 
-        return arrow.get(timestamp)
+        ts = arrow.get(timestamp)
+        ts = ts.replace(tzinfo=tz.gettz(timezone))
+        return ts
 
 
 def roundDate(now, unit, tz='UTC', roundDown=True):
@@ -236,3 +238,5 @@ def evaluate(expression, now, timeZone='UTC', roundDown=True):
     #print(type(parse('now', type='datetime')))
     #print(parse('now-2.5h'))
     #print(parse('2016-01-01||-3.2h'))
+    #print(parse('now', tz='US/Pacific'))
+    #print(parse('2017-09-22T10:20:00', tz='US/Eastern'))

requirements.txt

@@ -11,5 +11,5 @@ requests==2.13.0
 requests-toolbelt==0.7.1
 six==1.10.0
 traceback2==1.4.0
-twine==1.8.1
+twine>=1.8.1
 unittest2==1.1.0

setup.py

@@ -16,7 +16,7 @@
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-version = '1.4.6'
+version = '1.4.7'
 
 setup(
     name='python-datemath',

tests.py

@@ -1,7 +1,9 @@
 import unittest2 as unittest
 import arrow
+from datetime import datetime as pydatetime
 from datemath import dm 
 from datemath import datemath
+from dateutil import tz
 
 iso8601 = 'YYYY-MM-DDTHH:mm:ssZZ'
 class TestDM(unittest.TestCase):
@@ -27,6 +29,13 @@ def testParse(self):
         self.assertEqual(dm('2016-01-01||/d', roundDown=False).format('YYYY-MM-DDTHH:mm:ssZZ'), '2016-01-01T23:59:59-00:00')
         self.assertEqual(dm('2014-11-18||/y', roundDown=False).format('YYYY-MM-DDTHH:mm:ssZZ'), '2014-12-31T23:59:59-00:00')
 
+        # Timezone Tests
+        self.assertEqual(dm('now', tz='US/Pacific').format(iso8601), arrow.utcnow().to('US/Pacific').format(iso8601))
+        self.assertEqual(dm('2017-09-22 10:20:00', tz='US/Pacific').datetime, pydatetime(2017, 9, 22, 10, 20, 00, tzinfo=tz.gettz('US/Pacific')))
+        self.assertEqual(dm('2016-01-01', tz='UTC'), arrow.get('2016-01-01').to('UTC'))
+        self.assertEqual(dm('2016-01-01', tz='US/Eastern'), pydatetime(2016, 1, 1, tzinfo=tz.gettz('US/Eastern')))
+        self.assertEqual(datemath('2016-01-01T01:00:00', tz='US/Central'), pydatetime(2016, 1, 1, 1, 0, 0, tzinfo=tz.gettz('US/Central')))
+
         # relitive formats
         # addition
         self.assertEqual(dm('+1s').format(iso8601), arrow.utcnow().replace(seconds=+1).format(iso8601))