From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 16 Aug 2010 19:26:54 +0000 (+0000)
Subject: Merged revisions 84100 via svnmerge from
X-Git-Tag: v2.6.6rc2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29a66bdcb592173e5638c1b13439bad7beeeaaf7;p=thirdparty%2FPython%2Fcpython.git

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/
  ........
................
---

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