tests: Use pytest.raises() decorator where applicable

diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index e3d925e5d053c8ffb4802ce53ac14b1495c3f309..47fe3060359ae22494b2732ebbeade4d0eb70c6d 100644 (file)
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -15,6 +15,8 @@ import sys
 import unittest
 from io import BytesIO, StringIO
 
+import pytest
+
 from babel.messages import extract
 
 
@@ -380,8 +382,8 @@ msg = _('Bonjour à tous')
 # NOTE: hello
 msg = _('Bonjour à tous')
 """.encode('utf-8'))
-        self.assertRaises(SyntaxError, list,
-                          extract.extract_python(buf, ('_',), ['NOTE:'], {}))
+        with pytest.raises(SyntaxError):
+            list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
 
     def test_utf8_raw_strings_match_unicode_strings(self):
         buf = BytesIO(codecs.BOM_UTF8 + u"""
@@ -466,7 +468,8 @@ msg10 = dngettext(domain, 'Page', 'Pages', 3)
 
     def test_invalid_extract_method(self):
         buf = BytesIO(b'')
-        self.assertRaises(ValueError, list, extract.extract('spam', buf))
+        with pytest.raises(ValueError):
+            list(extract.extract('spam', buf))
 
     def test_different_signatures(self):
         buf = BytesIO(b"""

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 227813b235b693dcb26e34b13aa9b5566adbe978..b62f542cdd07c705a6fa59ac49488bc573a75bc6 100644 (file)
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -252,13 +252,12 @@ class DateTimeFormatTestCase(unittest.TestCase):
 class FormatDateTestCase(unittest.TestCase):
 
     def test_with_time_fields_in_pattern(self):
-        self.assertRaises(AttributeError, dates.format_date, date(2007, 4, 1),
-                          "yyyy-MM-dd HH:mm", locale='en_US')
+        with pytest.raises(AttributeError):
+            dates.format_date(date(2007, 4, 1), "yyyy-MM-dd HH:mm", locale='en_US')
 
     def test_with_time_fields_in_pattern_and_datetime_param(self):
-        self.assertRaises(AttributeError, dates.format_date,
-                          datetime(2007, 4, 1, 15, 30),
-                          "yyyy-MM-dd HH:mm", locale='en_US')
+        with pytest.raises(AttributeError):
+            dates.format_date(datetime(2007, 4, 1, 15, 30), "yyyy-MM-dd HH:mm", locale='en_US')
 
     def test_with_day_of_year_in_pattern_and_datetime_param(self):
         # format_date should work on datetimes just as well (see #282)
@@ -362,13 +361,12 @@ class FormatTimeTestCase(unittest.TestCase):
         assert dates.format_time(epoch, format='long', locale='en_US') == u'3:30:29 PM UTC'
 
     def test_with_date_fields_in_pattern(self):
-        self.assertRaises(AttributeError, dates.format_time, date(2007, 4, 1),
-                          "yyyy-MM-dd HH:mm", locale='en_US')
+        with pytest.raises(AttributeError):
+            dates.format_time(datetime(2007, 4, 1), 'yyyy-MM-dd HH:mm', locale='en')
 
     def test_with_date_fields_in_pattern_and_datetime_param(self):
-        self.assertRaises(AttributeError, dates.format_time,
-                          datetime(2007, 4, 1, 15, 30),
-                          "yyyy-MM-dd HH:mm", locale='en_US')
+        with pytest.raises(AttributeError):
+            dates.format_time(datetime(2007, 4, 1, 15, 30), "yyyy-MM-dd HH:mm", locale='en_US')
 
 
 class FormatTimedeltaTestCase(unittest.TestCase):
@@ -395,12 +393,9 @@ class FormatTimedeltaTestCase(unittest.TestCase):
         assert dates.format_timedelta(timedelta(hours=-2), locale='en', format='narrow') == '2h'
 
     def test_format_invalid(self):
-        self.assertRaises(TypeError, dates.format_timedelta,
-                          timedelta(hours=1), format='')
-        self.assertRaises(TypeError, dates.format_timedelta,
-                          timedelta(hours=1), format='bold italic')
-        self.assertRaises(TypeError, dates.format_timedelta,
-                          timedelta(hours=1), format=None)
+        for format in (None, '', 'bold italic'):
+            with pytest.raises(TypeError):
+                dates.format_timedelta(timedelta(hours=1), format=format)
 
 
 class TimeZoneAdjustTestCase(unittest.TestCase):