4d9ec2ac59
contextlib2 linecache2 traceback2 unittest2 python-extras fixtures pyrsistent subunit testscenerios testtools
128 lines
5.9 KiB
Diff
128 lines
5.9 KiB
Diff
From 63d6945020f81d8e85aad7bafdb6bdd087d3ffbc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
|
Date: Mon, 29 May 2017 12:36:47 +0300
|
|
Subject: [PATCH] Python 3.6 invalid escape sequence deprecation fixes (#262)
|
|
|
|
https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
|
|
---
|
|
testtools/content.py | 2 +-
|
|
testtools/matchers/_warnings.py | 2 +-
|
|
testtools/tests/matchers/test_basic.py | 2 +-
|
|
testtools/tests/matchers/test_datastructures.py | 14 +++++++-------
|
|
testtools/tests/test_testcase.py | 4 ++--
|
|
5 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/testtools/content.py b/testtools/content.py
|
|
index 78c4e3fc..8ab902f7 100644
|
|
--- a/testtools/content.py
|
|
+++ b/testtools/content.py
|
|
@@ -102,7 +102,7 @@ def iter_text(self):
|
|
no charset parameter is present in the MIME type. (This is somewhat
|
|
arbitrary, but consistent with RFC2617 3.7.1).
|
|
|
|
- :raises ValueError: If the content type is not text/\*.
|
|
+ :raises ValueError: If the content type is not text/\\*.
|
|
"""
|
|
if self.content_type.type != "text":
|
|
raise ValueError("Not a text type %r" % self.content_type)
|
|
diff --git a/testtools/matchers/_warnings.py b/testtools/matchers/_warnings.py
|
|
index 2ac5b936..21cb0913 100644
|
|
--- a/testtools/matchers/_warnings.py
|
|
+++ b/testtools/matchers/_warnings.py
|
|
@@ -21,7 +21,7 @@
|
|
|
|
def WarningMessage(category_type, message=None, filename=None, lineno=None,
|
|
line=None):
|
|
- """
|
|
+ r"""
|
|
Create a matcher that will match `warnings.WarningMessage`\s.
|
|
|
|
For example, to match captured `DeprecationWarning`\s with a message about
|
|
diff --git a/testtools/tests/matchers/test_basic.py b/testtools/tests/matchers/test_basic.py
|
|
index 519cdd82..1251b262 100644
|
|
--- a/testtools/tests/matchers/test_basic.py
|
|
+++ b/testtools/tests/matchers/test_basic.py
|
|
@@ -395,7 +395,7 @@ class TestMatchesRegex(TestCase, TestMatchersInterface):
|
|
|
|
describe_examples = [
|
|
("'c' does not match /a|b/", 'c', MatchesRegex('a|b')),
|
|
- ("'c' does not match /a\d/", 'c', MatchesRegex(r'a\d')),
|
|
+ ("'c' does not match /a\\d/", 'c', MatchesRegex(r'a\d')),
|
|
("%r does not match /\\s+\\xa7/" % (_b('c'),),
|
|
_b('c'), MatchesRegex(_b("\\s+\xA7"))),
|
|
("%r does not match /\\s+\\xa7/" % (_u('c'),),
|
|
diff --git a/testtools/tests/matchers/test_datastructures.py b/testtools/tests/matchers/test_datastructures.py
|
|
index 6a403990..d5290e6d 100644
|
|
--- a/testtools/tests/matchers/test_datastructures.py
|
|
+++ b/testtools/tests/matchers/test_datastructures.py
|
|
@@ -150,27 +150,27 @@ def test_two_too_many_matchers(self):
|
|
self.assertMismatchWithDescriptionMatching(
|
|
[3], MatchesSetwise(Equals(1), Equals(2), Equals(3)),
|
|
MatchesRegex(
|
|
- 'There were 2 matchers left over: Equals\([12]\), '
|
|
- 'Equals\([12]\)'))
|
|
+ r'There were 2 matchers left over: Equals\([12]\), '
|
|
+ r'Equals\([12]\)'))
|
|
|
|
def test_two_too_many_values(self):
|
|
self.assertMismatchWithDescriptionMatching(
|
|
[1, 2, 3, 4], MatchesSetwise(Equals(1), Equals(2)),
|
|
MatchesRegex(
|
|
- 'There were 2 values left over: \[[34], [34]\]'))
|
|
+ r'There were 2 values left over: \[[34], [34]\]'))
|
|
|
|
def test_mismatch_and_too_many_matchers(self):
|
|
self.assertMismatchWithDescriptionMatching(
|
|
[2, 3], MatchesSetwise(Equals(0), Equals(1), Equals(2)),
|
|
MatchesRegex(
|
|
- '.*There was 1 mismatch and 1 extra matcher: Equals\([01]\)',
|
|
+ r'.*There was 1 mismatch and 1 extra matcher: Equals\([01]\)',
|
|
re.S))
|
|
|
|
def test_mismatch_and_too_many_values(self):
|
|
self.assertMismatchWithDescriptionMatching(
|
|
[2, 3, 4], MatchesSetwise(Equals(1), Equals(2)),
|
|
MatchesRegex(
|
|
- '.*There was 1 mismatch and 1 extra value: \[[34]\]',
|
|
+ r'.*There was 1 mismatch and 1 extra value: \[[34]\]',
|
|
re.S))
|
|
|
|
def test_mismatch_and_two_too_many_matchers(self):
|
|
@@ -179,13 +179,13 @@ def test_mismatch_and_two_too_many_matchers(self):
|
|
Equals(0), Equals(1), Equals(2), Equals(3)),
|
|
MatchesRegex(
|
|
'.*There was 1 mismatch and 2 extra matchers: '
|
|
- 'Equals\([012]\), Equals\([012]\)', re.S))
|
|
+ r'Equals\([012]\), Equals\([012]\)', re.S))
|
|
|
|
def test_mismatch_and_two_too_many_values(self):
|
|
self.assertMismatchWithDescriptionMatching(
|
|
[2, 3, 4, 5], MatchesSetwise(Equals(1), Equals(2)),
|
|
MatchesRegex(
|
|
- '.*There was 1 mismatch and 2 extra values: \[[145], [145]\]',
|
|
+ r'.*There was 1 mismatch and 2 extra values: \[[145], [145]\]',
|
|
re.S))
|
|
|
|
|
|
diff --git a/testtools/tests/test_testcase.py b/testtools/tests/test_testcase.py
|
|
index f0aa881d..1622cf8d 100644
|
|
--- a/testtools/tests/test_testcase.py
|
|
+++ b/testtools/tests/test_testcase.py
|
|
@@ -389,14 +389,14 @@ def foo():
|
|
def test_assertRaisesRegexp(self):
|
|
# assertRaisesRegexp asserts that function raises particular exception
|
|
# with particular message.
|
|
- self.assertRaisesRegexp(RuntimeError, "M\w*e", self.raiseError,
|
|
+ self.assertRaisesRegexp(RuntimeError, r"M\w*e", self.raiseError,
|
|
RuntimeError, "Message")
|
|
|
|
def test_assertRaisesRegexp_wrong_error_type(self):
|
|
# If function raises an exception of unexpected type,
|
|
# assertRaisesRegexp re-raises it.
|
|
self.assertRaises(ValueError, self.assertRaisesRegexp, RuntimeError,
|
|
- "M\w*e", self.raiseError, ValueError, "Message")
|
|
+ r"M\w*e", self.raiseError, ValueError, "Message")
|
|
|
|
def test_assertRaisesRegexp_wrong_message(self):
|
|
# If function raises an exception with unexpected message
|