[pypy-commit] pypy default: fix cpyext

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: 
Changeset: r80485:e92c8d8e17e1
Date: 2015-10-30 09:20 +0100
http://bitbucket.org/pypy/pypy/changeset/e92c8d8e17e1/

Log:	fix cpyext

diff --git a/pypy/module/cpyext/stringobject.py b/pypy/module/cpyext/stringobject.py
--- a/pypy/module/cpyext/stringobject.py
+++ b/pypy/module/cpyext/stringobject.py
@@ -287,7 +287,7 @@
     if not PyString_Check(space, w_str):
         PyErr_BadArgument(space)
 
-    w_encoding = w_errors = space.w_None
+    w_encoding = w_errors = None
     if encoding:
         w_encoding = space.wrap(rffi.charp2str(encoding))
     if errors:
@@ -307,7 +307,7 @@
     if not PyString_Check(space, w_str):
         PyErr_BadArgument(space)
 
-    w_encoding = w_errors = space.w_None
+    w_encoding = w_errors = None
     if encoding:
         w_encoding = space.wrap(rffi.charp2str(encoding))
     if errors:
diff --git a/pypy/module/cpyext/unicodeobject.py b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -360,7 +360,7 @@
     if errors:
         w_errors = space.wrap(rffi.charp2str(errors))
     else:
-        w_errors = space.w_None
+        w_errors = None
     return space.call_method(w_str, 'decode', w_encoding, w_errors)
 
 @cpython_api([PyObject], PyObject)
@@ -391,7 +391,7 @@
     if errors:
         w_errors = space.wrap(rffi.charp2str(errors))
     else:
-        w_errors = space.w_None
+        w_errors = None
 
     # - unicode is disallowed
     # - raise TypeError for non-string types
@@ -484,7 +484,7 @@
         if errors:
             w_errors = space.wrap(rffi.charp2str(errors))
         else:
-            w_errors = space.w_None
+            w_errors = None
         return space.call_method(w_s, 'decode', space.wrap(encoding), w_errors)
     globals()['PyUnicode_Decode%s' % suffix] = PyUnicode_DecodeXXX
 
@@ -498,7 +498,7 @@
         if errors:
             w_errors = space.wrap(rffi.charp2str(errors))
         else:
-            w_errors = space.w_None
+            w_errors = None
         return space.call_method(w_u, 'encode', space.wrap(encoding), w_errors)
     globals()['PyUnicode_Encode%s' % suffix] = PyUnicode_EncodeXXX