Author: Ronan Lamy <[email protected]>
Branch: py3k
Changeset: r83774:4d87b3d82dc2
Date: 2016-04-19 17:38 +0100
http://bitbucket.org/pypy/pypy/changeset/4d87b3d82dc2/
Log: winreg must be a builtin module on Windows
fixes issue #2276
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -398,7 +398,7 @@
self.check_signal_action = None # changed by the signal module
self.user_del_action = UserDelAction(self)
self._code_of_sys_exc_info = None
-
+
# can be overridden to a subclass
self.initialize()
@@ -582,6 +582,9 @@
# lives in pypy/module/exceptions, we rename it below for
# sys.builtin_module_names
bootstrap_modules = set(('sys', 'imp', 'builtins', 'exceptions'))
+ if sys.platform.startswith("win"):
+ self.setbuiltinmodule('_winreg')
+ bootstrap_modules.add('winreg')
installed_builtin_modules = list(bootstrap_modules)
exception_types_w = self.export_builtin_exceptions()
@@ -1534,7 +1537,7 @@
"""
if w_obj is unicode, call identifier_w() (i.e., return the UTF-8
encoded string). Else, call bytes_w().
-
+
Maybe we should kill str_w completely and manually substitute it with
identifier_w/bytes_w at all call sites?
"""
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
