python-pytz/0001-Fix-tests-for-older-timezone-versions.patch

From ba0f4aa2cb32d3e0338c389a0ee32ae8ceb1f367 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Wed, 28 Jun 2017 12:28:31 +0200
Subject: [PATCH] Fix tests for older timezone versions

This improves the fix from commit c00dbe290b .
---
 src/pytz/tests/test_tzinfo.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py
index 3166322..0ecb8c0 100644
--- a/src/pytz/tests/test_tzinfo.py
+++ b/src/pytz/tests/test_tzinfo.py
@@ -249,13 +249,14 @@ class USEasternDSTStartTestCase(unittest.TestCase):
 
     def _test_tzname(self, utc_dt, wanted):
         tzname = wanted['tzname']
+        if not isinstance(tzname, list):
+            tzname = [tzname]
         dt = utc_dt.astimezone(self.tzinfo)
-        self.assertEqual(
-            dt.tzname(), tzname,
-            'Expected %s as tzname for %s. Got %s' % (
-                tzname, str(utc_dt), dt.tzname()
-            )
-        )
+        self.assertIn(dt.tzname(), tzname,
+                      'Expected %s as tzname for %s. Got %s' % (
+                          tzname, str(utc_dt), dt.tzname()
+                      )
+        )
 
     def _test_utcoffset(self, utc_dt, wanted):
         utcoffset = wanted['utcoffset']
@@ -512,7 +514,7 @@ class NoumeaHistoryStartTestCase(USEasternDSTStartTestCase):
         'dst': timedelta(0),
     }
     after = {
-        'tzname': '+11',  # pre-2017a, NCT
+        'tzname': ['+11', 'NCT'],  # pre-2017a, NCT
         'utcoffset': timedelta(hours=11),
         'dst': timedelta(0),
     }
@@ -523,12 +525,12 @@ class NoumeaDSTEndTestCase(USEasternDSTStartTestCase):
     tzinfo = pytz.timezone('Pacific/Noumea')
     transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC)
     before = {
-        'tzname': '+12',  # pre-2017a, NCST
+        'tzname': ['+12', 'NCST'],  # pre-2017a, NCST
         'utcoffset': timedelta(hours=12),
         'dst': timedelta(hours=1),
     }
     after = {
-        'tzname': '+11',  # pre-2017a, NCT
+        'tzname': ['+11', 'NCT'],  # pre-2017a, NCT
         'utcoffset': timedelta(hours=11),
         'dst': timedelta(0),
     }
@@ -552,7 +554,7 @@ class TahitiTestCase(USEasternDSTStartTestCase):
         'dst': timedelta(0),
     }
     after = {
-        'tzname': '-10',  # pre-2017a, TAHT
+        'tzname': ['-10', 'TAHT'],  # pre-2017a, TAHT
         'utcoffset': timedelta(hours=-10),
         'dst': timedelta(0),
     }
@@ -565,12 +567,12 @@ class SamoaInternationalDateLineChange(USEasternDSTStartTestCase):
     tzinfo = pytz.timezone('Pacific/Apia')
     transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC)
     before = {
-        'tzname': '-10',  # pre-2017a, SDT
+        'tzname': ['-10', 'SDT'],  # pre-2017a, SDT
         'utcoffset': timedelta(hours=-10),
         'dst': timedelta(hours=1),
     }
     after = {
-        'tzname': '+14',  # pre-2017a, WSDT
+        'tzname': ['+14', 'WSDT'],  # pre-2017a, WSDT
         'utcoffset': timedelta(hours=14),
         'dst': timedelta(hours=1),
     }
@@ -620,7 +622,7 @@ class LocalTestCase(unittest.TestCase):
 
         loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0))
         # pre-2017a, abbreviation was NCT
-        self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020')
+        self.assertIn(loc_time.strftime('%Z%z'), ['NET+0020', '+0020+0020'])
 
         loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0))
         self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
-- 
2.13.1