Author: Carl Friedrich Bolz <[email protected]>
Branch: space-newtext
Changeset: r88070:0e81f92dc7cb
Date: 2016-11-02 13:06 +0100
http://bitbucket.org/pypy/pypy/changeset/0e81f92dc7cb/
Log: exceptions
diff --git a/pypy/module/exceptions/interp_exceptions.py
b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -106,12 +106,12 @@
if len(args_w) == 1:
self.w_message = args_w[0]
else:
- self.w_message = space.wrap("")
+ self.w_message = space.newtext("")
def descr_str(self, space):
lgt = len(self.args_w)
if lgt == 0:
- return space.wrap('')
+ return space.newtext('')
elif lgt == 1:
return space.str(self.args_w[0])
else:
@@ -122,11 +122,11 @@
w_base_type = space.gettypeobject(W_BaseException.typedef)
w_base_str = w_base_type.dict_w["__str__"]
if not space.is_w(w_str, w_base_str):
- w_as_str = space.get_and_call_function(w_str, space.wrap(self))
+ w_as_str = space.get_and_call_function(w_str, self)
return space.call_function(space.w_unicode, w_as_str)
lgt = len(self.args_w)
if lgt == 0:
- return space.wrap(u"")
+ return space.newunicode(u"")
if lgt == 1:
return space.call_function(space.w_unicode, self.args_w[0])
else:
@@ -139,7 +139,7 @@
else:
args_repr = "()"
clsname = self.getclass(space).getname(space)
- return space.wrap(clsname + args_repr)
+ return space.newtext(clsname + args_repr)
def descr_getargs(self, space):
return space.newtuple(self.args_w)
@@ -174,23 +174,23 @@
def descr_message_get(self, space):
w_dict = self.w_dict
if w_dict is not None:
- w_msg = space.finditem(w_dict, space.wrap("message"))
+ w_msg = space.finditem(w_dict, space.newtext("message"))
if w_msg is not None:
return w_msg
if self.w_message is None:
raise oefmt(space.w_AttributeError, "message was deleted")
msg = "BaseException.message has been deprecated as of Python 2.6"
- space.warn(space.wrap(msg), space.w_DeprecationWarning)
+ space.warn(space.newtext(msg), space.w_DeprecationWarning)
return self.w_message
def descr_message_set(self, space, w_new):
- space.setitem(self.getdict(space), space.wrap("message"), w_new)
+ space.setitem(self.getdict(space), space.newtext("message"), w_new)
def descr_message_del(self, space):
w_dict = self.w_dict
if w_dict is not None:
try:
- space.delitem(w_dict, space.wrap("message"))
+ space.delitem(w_dict, space.newtext("message"))
except OperationError as e:
if not e.match(space, space.w_KeyError):
raise
@@ -202,7 +202,7 @@
def descr_new_base_exception(space, w_subtype, __args__):
exc = space.allocate_instance(cls, w_subtype)
basecls.__init__(exc, space)
- return space.wrap(exc)
+ return exc
descr_new_base_exception.func_name = 'descr_new_' + cls.__name__
return interp2app(descr_new_base_exception)
@@ -298,7 +298,7 @@
w_end, w_reason])
def descr_str(self, space):
- return space.appexec([space.wrap(self)], r"""(self):
+ return space.appexec([self], r"""(self):
if self.object is None:
return ""
if self.end == self.start + 1:
@@ -329,7 +329,7 @@
def key_error_str(self, space):
if len(self.args_w) == 0:
- return space.wrap('')
+ return space.newtext('')
elif len(self.args_w) == 1:
return space.repr(self.args_w[0])
else:
@@ -384,11 +384,11 @@
errno = space.str_w(space.str(self.w_errno))
strerror = space.str_w(space.str(self.w_strerror))
if not space.is_w(self.w_filename, space.w_None):
- return space.wrap("[Errno %s] %s: %s" % (
+ return space.newtext("[Errno %s] %s: %s" % (
errno,
strerror,
space.str_w(space.repr(self.w_filename))))
- return space.wrap("[Errno %s] %s" % (
+ return space.newtext("[Errno %s] %s" % (
errno,
strerror,
))
@@ -428,18 +428,18 @@
else:
errno = self._winerror_to_errno.get(errno, self._default_errno)
self.w_winerror = self.w_errno
- self.w_errno = space.wrap(errno)
+ self.w_errno = space.newint(errno)
def descr_str(self, space):
if (not space.is_w(self.w_winerror, space.w_None) and
not space.is_w(self.w_strerror, space.w_None)):
if not space.is_w(self.w_filename, space.w_None):
- return space.wrap("[Error %d] %s: %s" % (
+ return space.newtext("[Error %d] %s: %s" % (
space.int_w(self.w_winerror),
space.str_w(self.w_strerror),
space.str_w(self.w_filename)))
- return space.wrap("[Error %d] %s" % (space.int_w(self.w_winerror),
- space.str_w(self.w_strerror)))
+ return space.newtext("[Error %d] %s" %
(space.int_w(self.w_winerror),
+
space.str_w(self.w_strerror)))
return W_BaseException.descr_str(self, space)
if hasattr(rwin32, 'build_winerror_to_errno'):
@@ -549,7 +549,7 @@
args_w = [self.args_w[0], w_tuple]
args_repr = space.str_w(space.repr(space.newtuple(args_w)))
clsname = self.getclass(space).getname(space)
- return space.wrap(clsname + args_repr)
+ return space.newtext(clsname + args_repr)
else:
return W_StandardError.descr_repr(self, space)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
