[Python-checkins] cpython (merge default -> default): Merge.
stefan.krah
python-checkins at python.org
Tue Sep 25 17:17:42 CEST 2012
http://hg.python.org/cpython/rev/9b83fac9a0cb
changeset: 79172:9b83fac9a0cb
parent: 79171:78061bb4f9c1
parent: 79170:856c12dd1deb
user: Stefan Krah <skrah at bytereef.org>
date: Tue Sep 25 17:10:02 2012 +0200
summary:
Merge.
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