mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 79268 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79268 | michael.foord | 2010-03-21 20:41:11 -0500 (Sun, 21 Mar 2010) | 1 line

  Removing Python 2.3 compatibility code from unittest.
........
This commit is contained in:
Benjamin Peterson 2010-03-22 01:46:47 +00:00
parent 8769fd8a17
commit 434ae7703d
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/unittest/loader.py
View file

@ -19,11 +19,7 @@ VALID_MODULE_NAME = re.compile(r'[_a-z]\w*\.py$', re.IGNORECASE)
def _make_failed_import_test(name, suiteClass):
message = 'Failed to import test module: %s' % name
if hasattr(traceback, 'format_exc'):
# Python 2.3 compatibility
# format_exc returns two frames of discover.py as well
message += '\n%s' % traceback.format_exc()
message = 'Failed to import test module: %s\n%s' % (name, traceback.format_exc())
return _make_failed_test('ModuleImportFailure', name, ImportError(message),
suiteClass)

3
Lib/unittest/main.py
View file

@ -159,10 +159,9 @@ class TestProgram(object):
for name, value in zip(('start', 'pattern', 'top'), args):
setattr(options, name, value)
self.failfast = options.failfast
if options.verbose:
self.verbosity = 2
if options.failfast:
self.failfast = True
start_dir = options.start
pattern = options.pattern