[pypy-commit] pypy merge-2.7.2: Fix method used to find cjkencodings data files

amauryfa noreply at buildbot.pypy.org
Sun Jan 22 12:38:02 CET 2012


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: merge-2.7.2
Changeset: r51644:70241d66bf5f
Date: 2012-01-22 12:36 +0100
http://bitbucket.org/pypy/pypy/changeset/70241d66bf5f/

Log:	Fix method used to find cjkencodings data files

diff --git a/lib-python/modified-2.7/test/test_multibytecodec_support.py b/lib-python/modified-2.7/test/test_multibytecodec_support.py
--- a/lib-python/modified-2.7/test/test_multibytecodec_support.py
+++ b/lib-python/modified-2.7/test/test_multibytecodec_support.py
@@ -330,7 +330,7 @@
                             repr(csetch), repr(unich), exc.reason))
 
 def load_teststring(name):
-    dir = os.path.join(os.path.dirname(__file__), 'cjkencodings')
+    dir = test_support.findfile('cjkencodings')
     with open(os.path.join(dir, name + '.txt'), 'rb') as f:
         encoded = f.read()
     with open(os.path.join(dir, name + '-utf8.txt'), 'rb') as f:


More information about the pypy-commit mailing list