Merge branch 'master' into filter_buttons

dav_events/tests/test_converters.py

@@ -51,7 +51,7 @@ class Iso8601SerializerTestCase(TestCase):
         for value in invalid_values:
             emsg = ('Expected datetime.datetime, datetime.date or datetime.time,'
                     ' not {}'.format(value.__class__.__name__))
-            with self.assertRaisesRegexp(ValueError, emsg):
+            with self.assertRaisesRegex(ValueError, emsg):
                 Iso8601Serializer.serialize(value)
             serialized = Iso8601Serializer.serialize(value, ignore_unsupported_input=True)
             self.assertEqual(serialized, value)