Author: Carl Friedrich Bolz <[email protected]>
Branch: space-newtext
Changeset: r88545:511d80a64542
Date: 2016-11-21 13:07 +0100
http://bitbucket.org/pypy/pypy/changeset/511d80a64542/
Log: some rnadom wraps
diff --git a/pypy/module/_hashlib/__init__.py b/pypy/module/_hashlib/__init__.py
--- a/pypy/module/_hashlib/__init__.py
+++ b/pypy/module/_hashlib/__init__.py
@@ -19,4 +19,4 @@
def startup(self, space):
w_meth_names = fetch_names(space)
- space.setattr(self, space.wrap('openssl_md_meth_names'), w_meth_names)
+ space.setattr(self, space.newtext('openssl_md_meth_names'),
w_meth_names)
diff --git a/pypy/module/_md5/interp_md5.py b/pypy/module/_md5/interp_md5.py
--- a/pypy/module/_md5/interp_md5.py
+++ b/pypy/module/_md5/interp_md5.py
@@ -23,7 +23,7 @@
return self.space.newbytes(self.digest())
def hexdigest_w(self):
- return self.space.wrap(self.hexdigest())
+ return self.space.newtext(self.hexdigest())
def copy_w(self):
clone = W_MD5(self.space)
diff --git a/pypy/module/pypyjit/__init__.py b/pypy/module/pypyjit/__init__.py
--- a/pypy/module/pypyjit/__init__.py
+++ b/pypy/module/pypyjit/__init__.py
@@ -39,5 +39,5 @@
space = self.space
pypyjitdriver.space = space
w_obj = space.wrap(PARAMETERS)
- space.setattr(space.wrap(self), space.wrap('defaults'), w_obj)
+ space.setattr(self, space.newtext('defaults'), w_obj)
pypy_hooks.space = space
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
@@ -300,11 +300,11 @@
daylight = int(janzone != julyzone)
tzname = [janname, julyname]
- _set_module_object(space, "timezone", space.wrap(timezone))
- _set_module_object(space, 'daylight', space.wrap(daylight))
- tzname_w = [space.wrap(tzname[0]), space.wrap(tzname[1])]
+ _set_module_object(space, "timezone", space.newint(timezone))
+ _set_module_object(space, 'daylight', space.newint(daylight))
+ tzname_w = [space.newtext(tzname[0]), space.newtext(tzname[1])]
_set_module_object(space, 'tzname', space.newtuple(tzname_w))
- _set_module_object(space, 'altzone', space.wrap(altzone))
+ _set_module_object(space, 'altzone', space.newint(altzone))
def _get_error_msg():
errno = rposix.get_saved_errno()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit