Merge lp:~summer-is-gone/duplicity/tz-incremental-fix into lp:duplicity/0.6

[Ivan Gromov]

This branch fixes tzdata issues on incremental backups and tests in dup_timtest.py.

=== modified file 'duplicity/dup_time.py'
--- duplicity/dup_time.py	2011-03-29 17:00:36 +0000
+++ duplicity/dup_time.py	2011-11-03 13:29:47 +0000
@@ -21,8 +21,7 @@
 
 """Provide time related exceptions and functions"""
 
-import time, types, re
-
+import time, types, re, calendar
 from duplicity import globals
 
 
@@ -119,12 +118,20 @@
         # works in terms of the current timezone and we have a
         # timezone offset in the string.
         timetuple = (year, month, day, hour, minute, second, -1, -1, 0)
-        local_in_secs = time.mktime(timetuple)
-        # mktime assumed that the tuple was a local time. Compensate
-        # by subtracting the value for the current timezone.
-        # We don't need to worry about DST here because we turned it
-        # off in the tuple
-        utc_in_secs = local_in_secs - time.timezone
+        
+        if len(timestring) == 16:
+            # as said in documentation, time.gmtime() and timegm() are each others' inverse.
+            # As far as UTC format is used in new file format,
+            # do not rely on system's python DST and tzdata settings
+            # and use functions that working with UTC 
+            utc_in_secs = calendar.timegm(timetuple)
+        else:
+            # mktime assumed that the tuple was a local time. Compensate
+            # by subtracting the value for the current timezone.
+            # We don't need to worry about DST here because we turned it
+            # off in the tuple
+            local_in_secs = time.mktime(timetuple)
+            utc_in_secs = local_in_secs - time.timezone
         # Now apply the offset that we were given in the time string
         # This gives the correct number of seconds from the epoch
         # even when we're not in the same timezone that wrote the

=== modified file 'testing/dup_timetest.py'
--- testing/dup_timetest.py	2009-09-17 16:13:40 +0000
+++ testing/dup_timetest.py	2011-11-03 13:29:47 +0000
@@ -21,7 +21,7 @@
 
 import config
 import sys, unittest, time, types
-
+from copy import copy
 from duplicity import globals
 from duplicity import dup_time
 
@@ -41,9 +41,12 @@
 
     def testConversion_separator(self):
         """Same as testConversion, but change time Separator"""
-        globals.time_separator = "_"
-        self.testConversion()
-        globals.time_separator = ":"
+        prev_sep = copy(globals.time_separator)
+        try:
+            globals.time_separator = "_"
+            self.testConversion()
+        finally:
+            globals.time_separator = prev_sep
 
     def testCmp(self):
         """Test time comparisons"""
@@ -61,16 +64,19 @@
 
     def testCmp_separator(self):
         """Like testCmp but with new separator"""
-        globals.time_separator = "_"
-        cmp = dup_time.cmp
-        assert cmp(1,2) == -1
-        assert cmp(2,2) == 0
-        assert cmp(5,1) == 1
-        assert cmp("2001-09-01T21_49_04Z", "2001-08-01T21_49_04Z") == 1
-        assert cmp("2001-09-01T04_49_04+03_23", "2001-09-01T21_49_04Z") == -1
-        assert cmp("2001-09-01T12_00_00Z", "2001-09-01T04_00_00-08_00") == 0
-        assert cmp("2001-09-01T12_00_00-08_00", "2001-09-01T12_00_00-07_00") == 1
-        globals.time_separator = ":"
+        prev_sep = copy(globals.time_separator)
+        try:
+            globals.time_separator = "_"
+            cmp = dup_time.cmp
+            assert cmp(1,2) == -1
+            assert cmp(2,2) == 0
+            assert cmp(5,1) == 1
+            assert cmp("2001-09-01T21_49_04Z", "2001-08-01T21_49_04Z") == 1
+            assert cmp("2001-09-01T04_49_04+03_23", "2001-09-01T21_49_04Z") == -1
+            assert cmp("2001-09-01T12_00_00Z", "2001-09-01T04_00_00-08_00") == 0
+            assert cmp("2001-09-01T12_00_00-08_00", "2001-09-01T12_00_00-07_00") == 1
+        finally:
+            globals.time_separator = prev_sep
 
     def testStringtotime(self):
         """Test converting string to time"""
@@ -133,12 +139,20 @@
         self.assertRaises(dup_time.TimeException, g2t, "hello")
         self.assertRaises(dup_time.TimeException, g2t, "")
         self.assertRaises(dup_time.TimeException, g2t, "3q")
+    
+    def testConvertion(self):
+        t = int(time.time())
+        assert dup_time.stringtotime(dup_time.timetostring(t)) == t
 
 class TimeTest1(TimeTest, unittest.TestCase):
-    globals.old_filenames = False
+    
+    def setUp(self):
+        globals.old_filenames = False
 
 class TimeTest2(TimeTest, unittest.TestCase):
-    globals.old_filenames = True
+    
+    def setUp(self):
+        globals.old_filenames = True
 
 if __name__ == '__main__':
     unittest.main()