rpms/pytz
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix pytz-zoneinfo.patch to apply.

Browse Source
This commit is contained in:
Matěj Cepl 2016-04-23 11:02:55 +02:00
parent 65cfcfae04
commit 4c8cb4d6a7
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pytz-zoneinfo.patch
View File

@ -1,6 +1,5 @@
diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py --- a/pytz/__init__.py
--- pytz-2015.7/pytz/__init__.py.zoneinfo 2015-10-26 00:30:26.000000000 -0600 +++ b/pytz/__init__.py
+++ pytz-2015.7/pytz/__init__.py 2015-10-26 09:55:20.891455592 -0600
@@ -75,24 +75,19 @@ else: # Python 2.x @@ -75,24 +75,19 @@ else: # Python 2.x
""" """
return s.encode('US-ASCII') return s.encode('US-ASCII')
@ -30,7 +29,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
return open(filename, 'rb') return open(filename, 'rb')
@@ -487,1027 +482,36 @@ def _test(): @@ -487,1037 +482,38 @@ def _test():
if __name__ == '__main__': if __name__ == '__main__':
_test() _test()
@ -279,6 +278,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Asia/Bahrain', - 'Asia/Bahrain',
- 'Asia/Baku', - 'Asia/Baku',
- 'Asia/Bangkok', - 'Asia/Bangkok',
- 'Asia/Barnaul',
- 'Asia/Beirut', - 'Asia/Beirut',
- 'Asia/Bishkek', - 'Asia/Bishkek',
- 'Asia/Brunei', - 'Asia/Brunei',
@ -350,6 +350,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Asia/Thimbu', - 'Asia/Thimbu',
- 'Asia/Thimphu', - 'Asia/Thimphu',
- 'Asia/Tokyo', - 'Asia/Tokyo',
- 'Asia/Tomsk',
- 'Asia/Ujung_Pandang', - 'Asia/Ujung_Pandang',
- 'Asia/Ulaanbaatar', - 'Asia/Ulaanbaatar',
- 'Asia/Ulan_Bator', - 'Asia/Ulan_Bator',
@ -455,6 +456,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Etc/Zulu', - 'Etc/Zulu',
- 'Europe/Amsterdam', - 'Europe/Amsterdam',
- 'Europe/Andorra', - 'Europe/Andorra',
- 'Europe/Astrakhan',
- 'Europe/Athens', - 'Europe/Athens',
- 'Europe/Belfast', - 'Europe/Belfast',
- 'Europe/Belgrade', - 'Europe/Belgrade',
@ -475,6 +477,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Europe/Jersey', - 'Europe/Jersey',
- 'Europe/Kaliningrad', - 'Europe/Kaliningrad',
- 'Europe/Kiev', - 'Europe/Kiev',
- 'Europe/Kirov',
- 'Europe/Lisbon', - 'Europe/Lisbon',
- 'Europe/Ljubljana', - 'Europe/Ljubljana',
- 'Europe/London', - 'Europe/London',
@ -502,6 +505,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Europe/Tallinn', - 'Europe/Tallinn',
- 'Europe/Tirane', - 'Europe/Tirane',
- 'Europe/Tiraspol', - 'Europe/Tiraspol',
- 'Europe/Ulyanovsk',
- 'Europe/Uzhgorod', - 'Europe/Uzhgorod',
- 'Europe/Vaduz', - 'Europe/Vaduz',
- 'Europe/Vatican', - 'Europe/Vatican',
@ -618,6 +622,9 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'W-SU', - 'W-SU',
- 'WET', - 'WET',
- 'Zulu'] - 'Zulu']
-all_timezones = LazyList(
- tz for tz in all_timezones if resource_exists(tz))
-
+all_timezones = [] +all_timezones = []
+for root, dirs, files in os.walk(_tzinfo_dir): +for root, dirs, files in os.walk(_tzinfo_dir):
+ for exclude in 'posix', 'right': + for exclude in 'posix', 'right':
@ -629,9 +636,10 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
+ if tz_file != 'README' and tz_file != 'Theory' + if tz_file != 'README' and tz_file != 'Theory'
+ and '.' not in tz_file) + and '.' not in tz_file)
+ +
all_timezones = LazyList( +
tz for tz in all_timezones if resource_exists(tz)) + all_timezones = LazyList(
+ tz for tz in all_timezones if resource_exists(tz))
+
all_timezones_set = LazySet(all_timezones) all_timezones_set = LazySet(all_timezones)
-common_timezones = \ -common_timezones = \
-['Africa/Abidjan', -['Africa/Abidjan',
@ -808,7 +816,6 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'America/Regina', - 'America/Regina',
- 'America/Resolute', - 'America/Resolute',
- 'America/Rio_Branco', - 'America/Rio_Branco',
- 'America/Santa_Isabel',
- 'America/Santarem', - 'America/Santarem',
- 'America/Santiago', - 'America/Santiago',
- 'America/Santo_Domingo', - 'America/Santo_Domingo',
@ -856,6 +863,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Asia/Bahrain', - 'Asia/Bahrain',
- 'Asia/Baku', - 'Asia/Baku',
- 'Asia/Bangkok', - 'Asia/Bangkok',
- 'Asia/Barnaul',
- 'Asia/Beirut', - 'Asia/Beirut',
- 'Asia/Bishkek', - 'Asia/Bishkek',
- 'Asia/Brunei', - 'Asia/Brunei',
@ -915,6 +923,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Asia/Tehran', - 'Asia/Tehran',
- 'Asia/Thimphu', - 'Asia/Thimphu',
- 'Asia/Tokyo', - 'Asia/Tokyo',
- 'Asia/Tomsk',
- 'Asia/Ulaanbaatar', - 'Asia/Ulaanbaatar',
- 'Asia/Urumqi', - 'Asia/Urumqi',
- 'Asia/Ust-Nera', - 'Asia/Ust-Nera',
@ -953,6 +962,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Canada/Pacific', - 'Canada/Pacific',
- 'Europe/Amsterdam', - 'Europe/Amsterdam',
- 'Europe/Andorra', - 'Europe/Andorra',
- 'Europe/Astrakhan',
- 'Europe/Athens', - 'Europe/Athens',
- 'Europe/Belgrade', - 'Europe/Belgrade',
- 'Europe/Berlin', - 'Europe/Berlin',
@ -972,6 +982,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Europe/Jersey', - 'Europe/Jersey',
- 'Europe/Kaliningrad', - 'Europe/Kaliningrad',
- 'Europe/Kiev', - 'Europe/Kiev',
- 'Europe/Kirov',
- 'Europe/Lisbon', - 'Europe/Lisbon',
- 'Europe/Ljubljana', - 'Europe/Ljubljana',
- 'Europe/London', - 'Europe/London',
@ -997,6 +1008,7 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
- 'Europe/Stockholm', - 'Europe/Stockholm',
- 'Europe/Tallinn', - 'Europe/Tallinn',
- 'Europe/Tirane', - 'Europe/Tirane',
- 'Europe/Ulyanovsk',
- 'Europe/Uzhgorod', - 'Europe/Uzhgorod',
- 'Europe/Vaduz', - 'Europe/Vaduz',
- 'Europe/Vatican', - 'Europe/Vatican',
@ -1083,4 +1095,6 @@ diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py
+ +
common_timezones = LazyList( common_timezones = LazyList(
tz for tz in common_timezones if tz in all_timezones) tz for tz in common_timezones if tz in all_timezones)
-
+
common_timezones_set = LazySet(common_timezones)