1818from .backends import TaskWarrior
1919from .task import Task , ReadOnlyDictView
2020from .lazy import LazyUUIDTask , LazyUUIDTaskSet
21- from .serializing import DATE_FORMAT , local_zone
21+ from .serializing import DATE_FORMAT
2222
2323# http://taskwarrior.org/docs/design/task.html , Section: The Attributes
2424TASK_STANDARD_ATTRS = (
@@ -1134,10 +1134,9 @@ class TimezoneAwareDatetimeTest(TasklibTest):
11341134
11351135 def setUp (self ):
11361136 super (TimezoneAwareDatetimeTest , self ).setUp ()
1137- self .zone = local_zone
11381137 self .localdate_naive = datetime .datetime (2015 , 2 , 2 )
11391138 self .localtime_naive = datetime .datetime (2015 , 2 , 2 , 0 , 0 , 0 )
1140- self .localtime_aware = self .localtime_naive .replace ( tzinfo = self . zone )
1139+ self .localtime_aware = self .localtime_naive .astimezone ( )
11411140 self .utctime_aware = self .localtime_aware .astimezone (ZoneInfo ('UTC' ))
11421141
11431142 def test_timezone_naive_datetime_setitem (self ):
@@ -1219,7 +1218,7 @@ def test_simple_now_conversion(self):
12191218 return
12201219
12211220 t = Task (self .tw , description = 'test task' , due = 'now' )
1222- now = datetime .datetime .now ().replace ( tzinfo = local_zone )
1221+ now = datetime .datetime .now ().astimezone ( )
12231222
12241223 # Assert that both times are not more than 5 seconds apart
12251224 if sys .version_info < (2 , 7 ):
@@ -1239,16 +1238,15 @@ def test_simple_eoy_conversion(self):
12391238 return
12401239
12411240 t = Task (self .tw , description = 'test task' , due = 'eoy' )
1242- now = datetime .datetime .now ().replace ( tzinfo = local_zone )
1241+ now = datetime .datetime .now ().astimezone ( )
12431242 eoy = datetime .datetime (
12441243 year = now .year ,
12451244 month = 12 ,
12461245 day = 31 ,
12471246 hour = 23 ,
12481247 minute = 59 ,
12491248 second = 59 ,
1250- tzinfo = local_zone
1251- )
1249+ ).astimezone ()
12521250 if self .tw .version >= '2.5.2' and self .tw .version < '2.6.0' :
12531251 eoy = datetime .datetime (
12541252 year = now .year + 1 ,
@@ -1257,8 +1255,7 @@ def test_simple_eoy_conversion(self):
12571255 hour = 0 ,
12581256 minute = 0 ,
12591257 second = 0 ,
1260- tzinfo = local_zone
1261- )
1258+ ).astimezone ()
12621259 self .assertEqual (eoy , t ['due' ])
12631260
12641261 def test_complex_eoy_conversion (self ):
@@ -1271,16 +1268,15 @@ def test_complex_eoy_conversion(self):
12711268 return
12721269
12731270 t = Task (self .tw , description = 'test task' , due = 'eoy - 2 months' )
1274- now = datetime .datetime .now ().replace ( tzinfo = local_zone )
1271+ now = datetime .datetime .now ().astimezone ( )
12751272 due_date = datetime .datetime (
12761273 year = now .year ,
12771274 month = 12 ,
12781275 day = 31 ,
12791276 hour = 23 ,
12801277 minute = 59 ,
12811278 second = 59 ,
1282- tzinfo = local_zone
1283- ) - datetime .timedelta (0 , 2 * 30 * 86400 )
1279+ ).astimezone () - datetime .timedelta (0 , 2 * 30 * 86400 )
12841280 if self .tw .version >= '2.5.2' and self .tw .version < '2.6.0' :
12851281 due_date = datetime .datetime (
12861282 year = now .year + 1 ,
@@ -1289,8 +1285,7 @@ def test_complex_eoy_conversion(self):
12891285 hour = 0 ,
12901286 minute = 0 ,
12911287 second = 0 ,
1292- tzinfo = local_zone
1293- ) - datetime .timedelta (0 , 2 * 30 * 86400 )
1288+ ).astimezone () - datetime .timedelta (0 , 2 * 30 * 86400 )
12941289 self .assertEqual (due_date , t ['due' ])
12951290
12961291 def test_filtering_with_string_datetime (self ):
0 commit comments