Ticket #2099: dateformat_win32.patch

tests/regressiontests/dateformat/tests.py

@@ -21 +21 @@
 '7'
 >>> format(my_birthday, 'N')
 'July'
->>> format(my_birthday, 'O')
-'+0100'
+>>> format(my_birthday, 'O') == '+0100' or no_tz
+True
 >>> format(my_birthday, 'P')
 '10 p.m.'
->>> format(my_birthday, 'r')
-'Sun, 8 Jul 1979 22:00:00 +0100'
+>>> format(my_birthday, 'r') == 'Sun, 8 Jul 1979 22:00:00 +0100' or no_tz
+True
 >>> format(my_birthday, 's')
 '00'
 >>> format(my_birthday, 'S')
 'th'
 >>> format(my_birthday, 't')
 '31'
->>> format(my_birthday, 'T')
-'CET'
->>> format(my_birthday, 'U')
-'300531600'
+>>> format(my_birthday, 'T') == 'CET' or no_tz
+True
+>>> format(my_birthday, 'U') == '300531600' or no_tz
+True
 >>> format(my_birthday, 'w')
 '0'
 >>> format(my_birthday, 'W')
@@ -47 +47 @@
 '1979'
 >>> format(my_birthday, 'z')
 '189'
->>> format(my_birthday, 'Z')
-'3600'
+>>> format(my_birthday, 'Z') == '3600' or no_tz
+True
 
->>> format(summertime, 'I')
-'1'
->>> format(summertime, 'O')
-'+0200'
->>> format(wintertime, 'I')
-'0'
->>> format(wintertime, 'O')
-'+0100'
+>>> format(summertime, 'I') == '1' or no_tz
+True
+>>> format(summertime, 'O') == '+0200' or no_tz
+True
+>>> format(wintertime, 'I') == '0' or no_tz
+True
+>>> format(wintertime, 'O') == '+0100' or no_tz
+True
 
 >>> format(my_birthday, r'Y z \C\E\T')
 '1979 189 CET'
@@ -73 +73 @@
 os.environ['TZ'] = 'Europe/Copenhagen'
 translation.activate('en-us')
 
-time.tzset()
+no_tz = False
+try:
+    time.tzset()
+except AttributeError:
+    no_tz = True
 
 my_birthday = datetime.datetime(1979, 7, 8, 22, 00)
 summertime = datetime.datetime(2005, 10, 30, 1, 00)