[pypy-commit] pypy signal-and-thread: Move 'signals_enabled' from __pypy__ to thread.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: signal-and-thread
Changeset: r61275:627eb4502c26
Date: 2013-02-15 18:12 +0100
http://bitbucket.org/pypy/pypy/changeset/627eb4502c26/

Log:	Move 'signals_enabled' from __pypy__ to thread.

diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -28,7 +28,6 @@
 
 class Module(MixedModule):
     appleveldefs = {
-        'signals_enabled'           : 'app_signal.signals_enabled',
     }
 
     interpleveldefs = {
@@ -48,8 +47,6 @@
         'newlist_hint'              : 'interp_magic.newlist_hint',
         'newdict'                   : 'interp_dict.newdict',
         'dictstrategy'              : 'interp_dict.dictstrategy',
-        '_signals_enter'            : 'interp_signal.signals_enter',
-        '_signals_exit'             : 'interp_signal.signals_exit',
     }
     if sys.platform == 'win32':
         interpleveldefs['get_console_cp'] = 'interp_magic.get_console_cp'
diff --git a/pypy/module/thread/__init__.py b/pypy/module/thread/__init__.py
--- a/pypy/module/thread/__init__.py
+++ b/pypy/module/thread/__init__.py
@@ -4,6 +4,7 @@
 
 class Module(MixedModule):
     appleveldefs = {
+        'signals_enabled':        'app_signal.signals_enabled',
     }
 
     interpleveldefs = {
@@ -20,6 +21,8 @@
         'LockType':               'os_lock.Lock',
         '_local':                 'os_local.Local',
         'error':                  'space.fromcache(error.Cache).w_error',
+        '_signals_enter':         'interp_signal.signals_enter',
+        '_signals_exit':          'interp_signal.signals_exit',
     }
 
     def __init__(self, space, *args):
diff --git a/pypy/module/__pypy__/app_signal.py b/pypy/module/thread/app_signal.py
rename from pypy/module/__pypy__/app_signal.py
rename to pypy/module/thread/app_signal.py
diff --git a/pypy/module/__pypy__/interp_signal.py b/pypy/module/thread/interp_signal.py
rename from pypy/module/__pypy__/interp_signal.py
rename to pypy/module/thread/interp_signal.py