From 2d84c04add032b96092c3e578584a7ab9e503580 Mon Sep 17 00:00:00 2001 From: derwinlu Date: Tue, 20 Oct 2015 10:26:32 +0200 Subject: [PATCH] Make ReaderTest py2 and py3 compatible --- pelican/tests/test_readers.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py index 5fabc470..6aa777c0 100644 --- a/pelican/tests/test_readers.py +++ b/pelican/tests/test_readers.py @@ -3,6 +3,8 @@ from __future__ import print_function, unicode_literals import os +import six + from pelican import readers from pelican.tests.support import get_settings, unittest from pelican.utils import SafeDatetime @@ -55,7 +57,8 @@ class TestAssertDictHasSubset(ReaderTest): self.assertDictHasSubset(self.dictionary, self.dictionary) def test_fail_not_set(self): - self.assertRaisesRegexp( + six.assertRaisesRegex( + self, AssertionError, 'Expected.*key-c.*to have value.*val-c.*but was not in Dict', self.assertDictHasSubset, @@ -63,7 +66,8 @@ class TestAssertDictHasSubset(ReaderTest): {'key-c': 'val-c'}) def test_fail_wrong_val(self): - self.assertRaisesRegexp( + six.assertRaisesRegex( + self, AssertionError, 'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*', self.assertDictHasSubset,