traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use "regexp" consistently.

This commit is contained in:
Georg Brandl 2010-02-07 11:34:15 +00:00
parent 9341ad2200
commit b0eb4d3eb1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/unittest/case.py
View File

@ -88,7 +88,7 @@ class _AssertRaisesContext(object):
def __init__(self, expected, test_case, expected_regexp=None): def __init__(self, expected, test_case, expected_regexp=None):
self.expected = expected self.expected = expected
self.failureException = test_case.failureException self.failureException = test_case.failureException
self.expected_regex = expected_regexp self.expected_regexp = expected_regexp
def __enter__(self): def __enter__(self):
pass pass
@ -105,10 +105,10 @@ class _AssertRaisesContext(object):
# let unexpected exceptions pass through # let unexpected exceptions pass through
return False return False
self.exc_value = exc_value #store for later retrieval self.exc_value = exc_value #store for later retrieval
if self.expected_regex is None: if self.expected_regexp is None:
return True return True
expected_regexp = self.expected_regex expected_regexp = self.expected_regexp
if isinstance(expected_regexp, basestring): if isinstance(expected_regexp, basestring):
expected_regexp = re.compile(expected_regexp) expected_regexp = re.compile(expected_regexp)
if not expected_regexp.search(str(exc_value)): if not expected_regexp.search(str(exc_value)):
@ -853,12 +853,12 @@ class TestCase(object):
with context: with context:
callable_obj(*args, **kwargs) callable_obj(*args, **kwargs)
def assertRegexpMatches(self, text, expected_regex, msg=None): def assertRegexpMatches(self, text, expected_regexp, msg=None):
if isinstance(expected_regex, basestring): if isinstance(expected_regexp, basestring):
expected_regex = re.compile(expected_regex) expected_regexp = re.compile(expected_regexp)
if not expected_regex.search(text): if not expected_regexp.search(text):
msg = msg or "Regexp didn't match" msg = msg or "Regexp didn't match"
msg = '%s: %r not found in %r' % (msg, expected_regex.pattern, text) msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text)
raise self.failureException(msg) raise self.failureException(msg)