[pypy-svn] r15315 - in pypy/dist/pypy: interpreter/pyparser interpreter/pyparser/test module/_codecs

pedronis at codespeak.net pedronis at codespeak.net
Fri Jul 29 02:56:42 CEST 2005


Author: pedronis
Date: Fri Jul 29 02:56:39 2005
New Revision: 15315

Modified:
   pypy/dist/pypy/interpreter/pyparser/parsestring.py
   pypy/dist/pypy/interpreter/pyparser/test/test_parsestring.py
   pypy/dist/pypy/module/_codecs/__init__.py
Log:
- fix in decode_utf8

- involved test to exercise it

- _codecs should export 'encode' and 'decode'



Modified: pypy/dist/pypy/interpreter/pyparser/parsestring.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/parsestring.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/parsestring.py	Fri Jul 29 02:56:39 2005
@@ -208,7 +208,7 @@
 PyUnicode_DecodeUnicodeEscape = app.interphook('PyUnicode_DecodeUnicodeEscape')
 PyUnicode_DecodeRawUnicodeEscape = app.interphook('PyUnicode_DecodeRawUnicodeEscape')
 PyUnicode_DecodeUTF8 = app.interphook('PyUnicode_DecodeUTF8')
-PyUnicode_AsEncodedString = app.interphook('PyUnicode_DecodeUTF8')
+PyUnicode_AsEncodedString = app.interphook('PyUnicode_AsEncodedString')
 
 def decode_utf8(space, s, ps, end, encoding):
     pt = ps

Modified: pypy/dist/pypy/interpreter/pyparser/test/test_parsestring.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/test/test_parsestring.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/test/test_parsestring.py	Fri Jul 29 02:56:39 2005
@@ -35,3 +35,8 @@
         ret = space.unwrap(w_ret)
         assert isinstance(ret, unicode)
         assert ret == u'hello\u0842 world'
+        s = "u'\x81'"
+        s = s.decode("koi8-u").encode("utf8")
+        w_ret = parsestring.parsestr(self.space, 'koi8-u', s)
+        ret = space.unwrap(w_ret)
+        assert ret == u'\u2502'

Modified: pypy/dist/pypy/module/_codecs/__init__.py
==============================================================================
--- pypy/dist/pypy/module/_codecs/__init__.py	(original)
+++ pypy/dist/pypy/module/_codecs/__init__.py	Fri Jul 29 02:56:39 2005
@@ -37,6 +37,8 @@
          'utf_7_encode' :  'app_codecs.utf_7_encode',
          'utf_8_decode' :  'app_codecs.utf_8_decode',
          'utf_8_encode' :  'app_codecs.utf_8_encode',
+         'encode': 'app_codecs.encode',
+         'decode': 'app_codecs.decode'
     }
     interpleveldefs = {
     }



More information about the Pypy-commit mailing list