merge 3.2

benjaminp · benjaminp · commit d79ac0fad7d1 · 2012-09-25T11:03:27.000-04:00
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
@@ -591,7 +591,7 @@ def test_import_pyc_path(self):
         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")
