[Python-checkins] cpython (3.4): Make this change a little more robust for up-merging.

barry.warsaw python-checkins at python.org
Tue Dec 2 00:17:54 CET 2014


https://hg.python.org/cpython/rev/8e18c049fb2f
changeset:   93693:8e18c049fb2f
branch:      3.4
parent:      93691:3b3ba38d503a
user:        Barry Warsaw <barry at python.org>
date:        Mon Dec 01 18:15:26 2014 -0500
summary:
  Make this change a little more robust for up-merging.

files:
  Lib/test/test_py_compile.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
--- a/Lib/test/test_py_compile.py
+++ b/Lib/test/test_py_compile.py
@@ -3,6 +3,7 @@
 import py_compile
 import shutil
 import stat
+import sys
 import tempfile
 import unittest
 
@@ -107,7 +108,7 @@
         pyc_path = weird_path + 'c'
         self.assertEqual(
             '/'.join(cache_path.split('/')[-2:]),
-            '__pycache__/foo.bar.cpython-34.pyc')
+            '__pycache__/foo.bar.{}.pyc'.format(sys.implementation.cache_tag))
         with open(weird_path, 'w') as file:
             file.write('x = 123\n')
         py_compile.compile(weird_path)

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list