components/python/pytz/patches/zones.patch
branchs11u2-sru
changeset 4156 4b1def16fe9b
parent 2884 9ad800ee0577
equal deleted inserted replaced
4146:097063f324c0 4156:4b1def16fe9b
     1 At the time of the integration of pytz 2013d, Solaris ships version 2012j
     1 Remove 'ROC' from all_timezones.  See
     2 of the Olson database.  While there are other changes in the database, a
     2 https://mm.icann.org/pipermail/tz/2001-March/011492.html for details
     3 few zoneinfo files have been introduced since the version we ship, so we
       
     4 remove those from the hard-coded list in pytz.
       
     5 
     3 
     6 --- pytz-2013d/pytz/__init__.py	Tue Oct 22 14:37:28 2013
     4 --- pytz-2014.10/pytz/__init__.py.~2~	2015-02-25 11:06:24.380394269 -0800
     7 +++ pytz-2013d/pytz/__init__.py	Tue Oct 22 14:39:58 2013
     5 +++ pytz-2014.10/pytz/__init__.py	2015-02-25 11:06:24.386963566 -0800
     8 @@ -762,7 +762,6 @@
     6 @@ -1050,7 +1050,6 @@ all_timezones = \
     9   'Asia/Kashgar',
       
    10   'Asia/Kathmandu',
       
    11   'Asia/Katmandu',
       
    12 - 'Asia/Khandyga',
       
    13   'Asia/Kolkata',
       
    14   'Asia/Krasnoyarsk',
       
    15   'Asia/Kuala_Lumpur',
       
    16 @@ -804,7 +803,6 @@
       
    17   'Asia/Ulaanbaatar',
       
    18   'Asia/Ulan_Bator',
       
    19   'Asia/Urumqi',
       
    20 - 'Asia/Ust-Nera',
       
    21   'Asia/Vientiane',
       
    22   'Asia/Vladivostok',
       
    23   'Asia/Yakutsk',
       
    24 @@ -913,7 +911,6 @@
       
    25   'Europe/Brussels',
       
    26   'Europe/Bucharest',
       
    27   'Europe/Budapest',
       
    28 - 'Europe/Busingen',
       
    29   'Europe/Chisinau',
       
    30   'Europe/Copenhagen',
       
    31   'Europe/Dublin',
       
    32 @@ -1044,7 +1041,6 @@
       
    33   'Pacific/Yap',
     7   'Pacific/Yap',
    34   'Poland',
     8   'Poland',
    35   'Portugal',
     9   'Portugal',
    36 - 'ROC',
    10 - 'ROC',
    37   'ROK',
    11   'ROK',
    38   'Singapore',
    12   'Singapore',
    39   'Turkey',
    13   'Turkey',
    40 @@ -1321,7 +1317,6 @@
       
    41   'Asia/Karachi',
       
    42   'Asia/Kashgar',
       
    43   'Asia/Kathmandu',
       
    44 - 'Asia/Khandyga',
       
    45   'Asia/Kolkata',
       
    46   'Asia/Krasnoyarsk',
       
    47   'Asia/Kuala_Lumpur',
       
    48 @@ -1357,7 +1352,6 @@
       
    49   'Asia/Tokyo',
       
    50   'Asia/Ulaanbaatar',
       
    51   'Asia/Urumqi',
       
    52 - 'Asia/Ust-Nera',
       
    53   'Asia/Vientiane',
       
    54   'Asia/Vladivostok',
       
    55   'Asia/Yakutsk',
       
    56 @@ -1400,7 +1394,6 @@
       
    57   'Europe/Brussels',
       
    58   'Europe/Bucharest',
       
    59   'Europe/Budapest',
       
    60 - 'Europe/Busingen',
       
    61   'Europe/Chisinau',
       
    62   'Europe/Copenhagen',
       
    63   'Europe/Dublin',