Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r63617:edd3db2a1a15
Date: 2013-04-25 12:37 -0700
http://bitbucket.org/pypy/pypy/changeset/edd3db2a1a15/
Log: kill basestring
diff --git a/lib_pypy/_ctypes/primitive.py b/lib_pypy/_ctypes/primitive.py
--- a/lib_pypy/_ctypes/primitive.py
+++ b/lib_pypy/_ctypes/primitive.py
@@ -230,8 +230,8 @@
return _rawffi.wcharp2rawunicode(addr, size)
def _setvalue(self, value):
- if isinstance(value, basestring):
- if isinstance(value, str):
+ if isinstance(value, (str, bytes)):
+ if isinstance(value, bytes):
value = value.decode(ConvMode.encoding,
ConvMode.errors)
array = _rawffi.Array('u')(len(value)+1, value)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
