tests: Replace references to now deprecated local_zone in tasklib

This was also independently noted by Nikolaos Kakouros
@nkakouros in #271

Author: tbabej

tests/test_selected.py

@@ -1,7 +1,6 @@
 import re
 
 from datetime import datetime
-from tasklib import local_zone
 from tests.base import IntegrationTest
 
 
@@ -578,7 +577,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -621,7 +620,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -659,7 +658,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -696,7 +695,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -744,7 +743,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -782,7 +781,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -820,7 +819,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -899,7 +898,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "pending"
@@ -1056,8 +1055,7 @@ class TestModVisibleAction(IntegrationTest):
     ]
 
     def execute(self):
-        today = local_zone.localize(
-            datetime.now().replace(hour=0,minute=0,second=0,microsecond=0))
+        today = datetime.now().astimezone().replace(hour=0,minute=0,second=0,microsecond=0)
 
         self.command(
             "TaskWikiMod due:today",
@@ -1164,7 +1162,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "completed"
         assert self.tasks[1]['status'] == "pending"
@@ -1231,7 +1229,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "pending"
         assert self.tasks[1]['status'] == "completed"
@@ -1268,7 +1266,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "completed"
         assert self.tasks[1]['status'] == "completed"
@@ -1315,7 +1313,7 @@ def execute(self):
         for task in self.tasks:
             task.refresh()
 
-        now = local_zone.localize(datetime.now())
+        now = datetime.now().astimezone()
 
         assert self.tasks[0]['status'] == "completed"
         assert self.tasks[1]['status'] == "completed"

tests/test_splits.py

@@ -1,16 +1,15 @@
 import re
 
 from tests.base import IntegrationTest
-from tasklib import local_zone
 from datetime import datetime
 
 
 def current_year():
-    return local_zone.localize(datetime.now()).year
+    return datetime.now().astimezone().year
 
 
 def current_month():
-    current_month_number = local_zone.localize(datetime.now()).month
+    current_month_number = datetime.now().astimezone().month
     months = ["January", "February", "March", "April",
               "May", "June", "July", "August",
               "September", "October", "November", "December"]

tests/test_vwtask.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
-from tasklib import local_zone
 from tests.base import IntegrationTest, MultipleSourceTest
 
 
@@ -292,7 +291,7 @@ def execute(self):
         task = self.tw.tasks.pending()[0]
         assert task['description'] == 'This is a test task'
         assert task['status'] == 'pending'
-        assert task['due'] == local_zone.localize(due)
+        assert task['due'] == due.astimezone()
 
 
 class TestSimpleTaskWithFlawedDueDatetimeCreation(IntegrationTest):
@@ -338,7 +337,7 @@ def execute(self):
         task = self.tw.tasks.pending()[0]
         assert task['description'] == 'This is a test task'
         assert task['status'] == 'pending'
-        assert task['due'] == local_zone.localize(due)
+        assert task['due'] == due.astimezone()
 
 
 class TestSimpleTaskWithDueDatetimeModification(IntegrationTest):
@@ -373,7 +372,7 @@ def execute(self):
         task = self.tw.tasks.pending()[0]
         assert task['description'] == 'This is a test task'
         assert task['status'] == 'pending'
-        assert task['due'] == local_zone.localize(due)
+        assert task['due'] == due.astimezone()
 
 
 class TestSimpleTaskWithPriorityCreation(IntegrationTest):

tests/test_vwtask_parsing.py

@@ -3,7 +3,6 @@
 from tests.base import MockVim, MockCache
 import sys
 
-from tasklib import local_zone
 
 class TestParsingVimwikiTask(object):
     def setup(self):
@@ -41,7 +40,7 @@ def test_due_full(self):
         vwtask = self.VimwikiTask.from_line(self.cache, 0)
 
         assert vwtask['description'] == u"Random task"
-        assert vwtask['due'] == local_zone.localize(datetime(2015,8,8,15,15))
+        assert vwtask['due'] == datetime(2015,8,8,15,15).astimezone()
         assert vwtask['uuid'] == None
         assert vwtask['priority'] == None
         assert vwtask['indent'] == ''
@@ -51,7 +50,7 @@ def test_due_short(self):
         vwtask = self.VimwikiTask.from_line(self.cache, 0)
 
         assert vwtask['description'] == u"Random task"
-        assert vwtask['due'] == local_zone.localize(datetime(2015,8,8,0,0))
+        assert vwtask['due'] == datetime(2015,8,8,0,0).astimezone()
         assert vwtask['uuid'] == None
         assert vwtask['priority'] == None
         assert vwtask['indent'] == ''
@@ -87,7 +86,7 @@ def test_priority_and_due(self):
 
         assert vwtask['description'] == u"Due today"
         assert vwtask['priority'] == 'H'
-        assert vwtask['due'] == local_zone.localize(datetime(2015,8,8))
+        assert vwtask['due'] == datetime(2015,8,8,0,0).astimezone()
         assert vwtask['uuid'] == None
 
     def test_added_modstring(self):