[pypy-svn] r58643 - pypy/branch/2.5-merge/lib-python/modified-2.5.1/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Oct  6 14:52:44 2008
New Revision: 58643

Added:
   pypy/branch/2.5-merge/lib-python/modified-2.5.1/test/test_codecs.py
      - copied, changed from r58628, pypy/branch/2.5-merge/lib-python/2.5.1/test/test_codecs.py
Log:
port a cpython bug that is failing on pypy


Copied: pypy/branch/2.5-merge/lib-python/modified-2.5.1/test/test_codecs.py (from r58628, pypy/branch/2.5-merge/lib-python/2.5.1/test/test_codecs.py)
==============================================================================
--- pypy/branch/2.5-merge/lib-python/2.5.1/test/test_codecs.py	(original)
+++ pypy/branch/2.5-merge/lib-python/modified-2.5.1/test/test_codecs.py	Mon Oct  6 14:52:44 2008
@@ -2,7 +2,7 @@
 from test import test_support
 import unittest
 import codecs
-import sys, StringIO, _testcapi
+import sys, StringIO
 
 class Queue(object):
     """
@@ -1120,6 +1120,7 @@
             if encoding not in broken_incremental_coders:
                 # check incremental decoder/encoder (fetched via the Python
                 # and C API) and iterencode()/iterdecode()
+                import _testcapi
                 try:
                     encoder = codecs.getincrementalencoder(encoding)()
                     cencoder = _testcapi.codec_incrementalencoder(encoding)