Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 84100 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r84100 | florent.xicluna | 2010-08-16 21:22:18 +0200 (lun., 16 août 2010) | 13 lines

  Merged revisions 84097,84099 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r84097 | florent.xicluna | 2010-08-16 20:41:19 +0200 (lun., 16 août 2010) | 1 line

    Use test.support and unittest features.  Fix duplicated test (bad merge in r79033).  Fix comment for issue #7902.
  ........
    r84099 | florent.xicluna | 2010-08-16 21:03:05 +0200 (lun., 16 août 2010) | 1 line

    I get it wrong in r84097: s/relative/absolute/
  ........
................
This commit is contained in:
Florent Xicluna 2010-08-16 19:26:54 +00:00
parent 0261d2e361
commit 29a66bdcb5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_import.py
View File

@ -417,8 +417,8 @@ class RelativeImport(unittest.TestCase):
self.assertRaises(ValueError, check_relative) self.assertRaises(ValueError, check_relative)
def test_absolute_import_without_future(self): def test_absolute_import_without_future(self):
# If absolute import syntax is used, then do not try to perform # If explicit relative import syntax is used, then do not try
# a relative import in the face of failure. # to perform an absolute import in the face of failure.
# Issue #7902. # Issue #7902.
try: try:
from .os import sep from .os import sep
@ -426,7 +426,7 @@ class RelativeImport(unittest.TestCase):
pass pass
else: else:
self.fail("explicit relative import triggered an " self.fail("explicit relative import triggered an "
"implicit relative import") "implicit absolute import")
def test_main(verbose=None): def test_main(verbose=None):