Fix issue2551128 - Impossible to validate a user with unknown timezone

Raise KeyError when an unrecognized timezones is passed to
pytz. (patch Cedric Krier, test John Rouillard)

Author: rouilj

CHANGES.txt

@@ -85,6 +85,9 @@ Fixed:
   this now requires that setuptools be installed. (Patch by John
   Kristensen (jerrykan); additional doc changes (upgrade.txt,
   RELEASE.txt) John Rouillard)
+- issue2551128 - Impossible to validate a user with unknown timezone
+  Raise KeyError when an unrecognized timezones is passed to
+  pytz. (patch Cedric Krier, test John Rouillard)
 
 Features:
 - issue2550522 - Add 'filter' command to command-line

roundup/date.py

@@ -146,8 +146,12 @@ def get_timezone(tz):
             return SimpleTimezone(utcoffset)
     # tz is a timezone name
     if pytz:
-        return pytz.timezone(tz)
-    elif tz == "UTC":
+        try:
+            return pytz.timezone(tz)
+        except pytz.exceptions.UnknownTimeZoneError:
+            pass
+
+    if tz == "UTC":
         return UTC
     elif tz in _tzoffsets:
         return SimpleTimezone(_tzoffsets[tz], tz)

test/test_dates.py

@@ -495,6 +495,16 @@ def testTZ(self):
         date = Date(date, tz)
         ae(str(date), '2006-01-01.11:00:00')
 
+    def testUnrecognizedTimezone(self):
+        '''Unrecognize timezone should raise key error'''
+
+        # unrecognized timezone
+        tz = 'Zoot'
+
+        with self.assertRaises(KeyError) as cm:
+            date = Date('2006-04-04.12:00:00', tz)
+
+        self.assertEqual(cm.exception.args, ('Zoot',))
 
 class RangeTestCase(unittest.TestCase):