[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

benjamin.peterson python-checkins at python.org
Tue Sep 25 17:04:17 CEST 2012


http://hg.python.org/cpython/rev/856c12dd1deb
changeset:   79170:856c12dd1deb
parent:      79168:e4e7cca4dc39
parent:      79169:48b738bc1045
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:03:27 2012 -0400
summary:
  merge 3.2

files:
  Lib/test/test_import.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -591,7 +591,7 @@
         self.assertTrue(os.path.exists('__pycache__'))
         self.assertTrue(os.path.exists(os.path.join(
             '__pycache__', '{}.{}.py{}'.format(
-            TESTFN, self.tag, __debug__ and 'c' or 'o'))))
+            TESTFN, self.tag, 'c' if __debug__ else 'o'))))
 
     @unittest.skipUnless(os.name == 'posix',
                          "test meaningful only on posix systems")

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list