merge 3.2

d79ac0fa · Benjamin Peterson · 296b21a4 · d388c4e0 · d79ac0fa
Commit d79ac0fa authored Sep 25, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/test/test_import.py Lib/test/test_import.py +1 -1

No files found.
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -591,7 +591,7 @@ class PycacheTests(unittest.TestCase):
        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")