summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-09-25 15:10:02 (GMT)
committerStefan Krah <skrah@bytereef.org>2012-09-25 15:10:02 (GMT)
commitee830e06ff09c281c5bb78d3744e95dfb2c6ce6c (patch)
tree414c2ee3bb0b752205bfe4507e1c56615b8cc974
parent6b6a1df9960b9f2bb1834ae81290fe04d2f259a6 (diff)
parentd79ac0fad7d125d081194981e8bd17b1528a8bfc (diff)
downloadcpython-ee830e06ff09c281c5bb78d3744e95dfb2c6ce6c.zip
cpython-ee830e06ff09c281c5bb78d3744e95dfb2c6ce6c.tar.gz
cpython-ee830e06ff09c281c5bb78d3744e95dfb2c6ce6c.tar.bz2
Merge.
-rw-r--r--Lib/test/test_import.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index 19863b9..0746411 100644
--- 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")