Author: Carl Friedrich Bolz <[email protected]>
Branch: space-newtext
Changeset: r88108:641b37bc9cd5
Date: 2016-11-03 08:37 +0100
http://bitbucket.org/pypy/pypy/changeset/641b37bc9cd5/
Log: various
diff --git a/pypy/module/_multibytecodec/interp_incremental.py
b/pypy/module/_multibytecodec/interp_incremental.py
--- a/pypy/module/_multibytecodec/interp_incremental.py
+++ b/pypy/module/_multibytecodec/interp_incremental.py
@@ -15,7 +15,7 @@
errors = 'strict'
self.space = space
self.errors = errors
- w_codec = space.getattr(space.wrap(self), space.wrap("codec"))
+ w_codec = space.getattr(self, space.newtext("codec"))
codec = space.interp_w(MultibyteCodec, w_codec)
self.codec = codec.codec
self.name = codec.name
@@ -30,7 +30,7 @@
self._initialize()
def fget_errors(self, space):
- return space.wrap(self.errors)
+ return space.newtext(self.errors)
def fset_errors(self, space, w_errors):
self.errors = space.str_w(w_errors)
@@ -65,14 +65,14 @@
pos = c_codecs.pypy_cjk_dec_inbuf_consumed(self.decodebuf)
assert 0 <= pos <= len(object)
self.pending = object[pos:]
- return space.wrap(output)
+ return space.newunicode(output)
@unwrap_spec(errors="str_or_None")
def mbidecoder_new(space, w_subtype, errors=None):
r = space.allocate_instance(MultibyteIncrementalDecoder, w_subtype)
r.__init__(space, errors)
- return space.wrap(r)
+ return r
MultibyteIncrementalDecoder.typedef = TypeDef(
'MultibyteIncrementalDecoder',
@@ -120,7 +120,7 @@
def mbiencoder_new(space, w_subtype, errors=None):
r = space.allocate_instance(MultibyteIncrementalEncoder, w_subtype)
r.__init__(space, errors)
- return space.wrap(r)
+ return r
MultibyteIncrementalEncoder.typedef = TypeDef(
'MultibyteIncrementalEncoder',
diff --git a/pypy/module/marshal/__init__.py b/pypy/module/marshal/__init__.py
--- a/pypy/module/marshal/__init__.py
+++ b/pypy/module/marshal/__init__.py
@@ -14,5 +14,5 @@
'dumps' : 'interp_marshal.dumps',
'load' : 'interp_marshal.load',
'loads' : 'interp_marshal.loads',
- 'version' : 'space.wrap(interp_marshal.Py_MARSHAL_VERSION)',
+ 'version' : 'space.newint(interp_marshal.Py_MARSHAL_VERSION)',
}
diff --git a/pypy/module/posix/interp_posix.py
b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -1213,7 +1213,7 @@
@unwrap_spec(fd=c_int)
def ttyname(space, fd):
try:
- return space.wrap(os.ttyname(fd))
+ return space.newtext(os.ttyname(fd))
except OSError as e:
raise wrap_oserror(space, e)
diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -209,7 +209,7 @@
accept2dyear = 0
else:
accept2dyear = 1
- _set_module_object(space, "accept2dyear", space.newtext(accept2dyear))
+ _set_module_object(space, "accept2dyear", space.newint(accept2dyear))
def _init_timezone(space):
timezone = daylight = altzone = 0
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
