Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r71367:e7f570769ca1
Date: 2014-05-07 12:54 +0200
http://bitbucket.org/pypy/pypy/changeset/e7f570769ca1/
Log: Avoid importing cycle
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
@@ -31,7 +31,6 @@
'signals_enabled': 'app_signal.signals_enabled',
'atomic': 'app_atomic.atomic',
'exclusive_atomic': 'app_atomic.exclusive_atomic',
- 'error': 'app_atomic.error',
}
interpleveldefs = {
'_signals_enter': 'interp_signal.signals_enter',
@@ -42,6 +41,7 @@
'longest_abort_info': 'interp_atomic.longest_abort_info',
'reset_longest_abort_info':'interp_atomic.reset_longest_abort_info',
'getsegmentlimit': 'interp_atomic.getsegmentlimit',
+ 'error': 'space.fromcache(pypy.module.thread.error.Cache).w_error',
}
def activate(self, space):
return self.space.config.objspace.usemodules.thread
diff --git a/pypy/module/__pypy__/app_atomic.py
b/pypy/module/__pypy__/app_atomic.py
--- a/pypy/module/__pypy__/app_atomic.py
+++ b/pypy/module/__pypy__/app_atomic.py
@@ -1,4 +1,3 @@
-from thread import error # re-exported
from __pypy__ import thread
class Atomic(object):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
