Upgrade pytz to 2014.10

awx/lib/site-packages/pytz/__init__.py

@@ -9,8 +9,8 @@ on how to use these modules.
 '''
 
 # The Olson database is updated several times a year.
-OLSON_VERSION = '2014d'
+OLSON_VERSION = '2014j'
-VERSION = '2014.4'  # Switching to pip compatible version numbering.
+VERSION = '2014.10'  # Switching to pip compatible version numbering.
 __version__ = VERSION
 
 OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
@@ -735,6 +735,7 @@ all_timezones = \
  'Asia/Bishkek',
  'Asia/Brunei',
  'Asia/Calcutta',
+ 'Asia/Chita',
  'Asia/Choibalsan',
  'Asia/Chongqing',
  'Asia/Chungking',
@@ -792,6 +793,7 @@ all_timezones = \
  'Asia/Seoul',
  'Asia/Shanghai',
  'Asia/Singapore',
+ 'Asia/Srednekolymsk',
  'Asia/Taipei',
  'Asia/Tashkent',
  'Asia/Tbilisi',
@@ -1002,6 +1004,7 @@ all_timezones = \
  'PST8PDT',
  'Pacific/Apia',
  'Pacific/Auckland',
+ 'Pacific/Bougainville',
  'Pacific/Chatham',
  'Pacific/Chuuk',
  'Pacific/Easter',
@@ -1297,8 +1300,8 @@ common_timezones = \
  'Asia/Beirut',
  'Asia/Bishkek',
  'Asia/Brunei',
+ 'Asia/Chita',
  'Asia/Choibalsan',
- 'Asia/Chongqing',
  'Asia/Colombo',
  'Asia/Damascus',
  'Asia/Dhaka',
@@ -1306,7 +1309,6 @@ common_timezones = \
  'Asia/Dubai',
  'Asia/Dushanbe',
  'Asia/Gaza',
- 'Asia/Harbin',
  'Asia/Hebron',
  'Asia/Ho_Chi_Minh',
  'Asia/Hong_Kong',
@@ -1318,7 +1320,6 @@ common_timezones = \
  'Asia/Kabul',
  'Asia/Kamchatka',
  'Asia/Karachi',
- 'Asia/Kashgar',
  'Asia/Kathmandu',
  'Asia/Khandyga',
  'Asia/Kolkata',
@@ -1348,6 +1349,7 @@ common_timezones = \
  'Asia/Seoul',
  'Asia/Shanghai',
  'Asia/Singapore',
+ 'Asia/Srednekolymsk',
  'Asia/Taipei',
  'Asia/Tashkent',
  'Asia/Tbilisi',
@@ -1460,6 +1462,7 @@ common_timezones = \
  'Indian/Reunion',
  'Pacific/Apia',
  'Pacific/Auckland',
+ 'Pacific/Bougainville',
  'Pacific/Chatham',
  'Pacific/Chuuk',
  'Pacific/Easter',

awx/lib/site-packages/pytz/tzinfo.py

@@ -142,7 +142,7 @@ class StaticTzInfo(BaseTzInfo):
 
     def __reduce__(self):
         # Special pickle to zone remains a singleton and to cope with
-        # database changes. 
+        # database changes.
         return pytz._p, (self.zone,)
 
 
@@ -369,13 +369,15 @@ class DstTzInfo(BaseTzInfo):
         # hints to be passed in (such as the UTC offset or abbreviation),
         # but that is just getting silly.
         #
-        # Choose the earliest (by UTC) applicable timezone.
+        # Choose the earliest (by UTC) applicable timezone if is_dst=True
-        sorting_keys = {}
+        # Choose the latest (by UTC) applicable timezone if is_dst=False
+        # i.e., behave like end-of-DST transition
+        dates = {} # utc -> local
         for local_dt in filtered_possible_loc_dt:
-            key = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
+            utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
-            sorting_keys[key] = local_dt
+            assert utc_time not in dates
-        first_key = sorted(sorting_keys)[0]
+            dates[utc_time] = local_dt
-        return sorting_keys[first_key]
+        return dates[[min, max][not is_dst](dates)]
 
     def utcoffset(self, dt, is_dst=None):
         '''See datetime.tzinfo.utcoffset
@@ -560,4 +562,3 @@ def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     inf = (utcoffset, dstoffset, tzname)
     tz._tzinfos[inf] = tz.__class__(inf, tz._tzinfos)
     return tz._tzinfos[inf]
-