Merge pull request #264 from marmida/master

Fix #263: provide missing format calls for exception messages. Thanks @marmida

arrow/arrow.py

@@ -839,7 +839,8 @@ def _get_tzinfo(tz_expr):
             try:
                 return parser.TzinfoParser.parse(tz_expr)
             except parser.ParserError:
-                raise ValueError('\'{0}\' not recognized as a timezone')
+                raise ValueError('\'{0}\' not recognized as a timezone'.format(
+                    tz_expr))
 
     @classmethod
     def _get_datetime(cls, expr):
@@ -854,7 +855,8 @@ def _get_datetime(cls, expr):
             expr = float(expr)
             return cls.utcfromtimestamp(expr).datetime
         except:
-            raise ValueError('\'{0}\' not recognized as a timestamp or datetime')
+            raise ValueError(
+                '\'{0}\' not recognized as a timestamp or datetime'.format(expr))
 
     @classmethod
     def _get_frames(cls, name):

tests/arrow_tests.py

@@ -1108,15 +1108,17 @@ def test_get_datetime(self):
         assertEqual(get_datetime(dt), dt)
         assertEqual(get_datetime(timestamp), arrow.Arrow.utcfromtimestamp(timestamp).datetime)
 
-        with assertRaises(ValueError):
+        with assertRaises(ValueError) as raise_ctx:
             get_datetime('abc')
+        assertFalse('{0}' in raise_ctx.exception.message)
 
     def test_get_tzinfo(self):
 
         get_tzinfo = arrow.Arrow._get_tzinfo
 
-        with assertRaises(ValueError):
+        with assertRaises(ValueError) as raise_ctx:
             get_tzinfo('abc')
+        assertFalse('{0}' in raise_ctx.exception.message)
 
     def test_get_timestamp_from_input(self):