merge 3.2

This commit is contained in:
Benjamin Peterson 2012-09-25 11:03:27 -04:00
commit d79ac0fad7

View file

@ -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")