From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Sep 2012 15:01:41 +0000 (-0400)
Subject: use modern conditional syntax
X-Git-Tag: v3.2.4rc1~495
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d388c4e02f824808c7d9d46d95fac4497fdd89b2;p=thirdparty%2FPython%2Fcpython.git

use modern conditional syntax
---

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index cfed14284588..0f8f1f584f56 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -575,7 +575,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")