diff options
author | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2018-06-16 18:05:57 +0200 |
---|---|---|
committer | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2018-06-16 18:05:57 +0200 |
commit | 4db1b2fa84041bd7ff89c0909db0bd43327e9bee (patch) | |
tree | 9289328281acf872e7f9e43f2e919673792ff315 | |
parent | 46aa2267136763ecae8d4997b0f9bfc0e04b5176 (diff) | |
download | cherrypy-git-4db1b2fa84041bd7ff89c0909db0bd43327e9bee.tar.gz |
Revert "Fix suggested by Andrew Stromnov to let psyco play nice with CherryPy 3.1."
This reverts commit e8e77404c7e753105e225a13a56411eb4e07624a.
(It effectively removes dead code)
From the Psyco website:
> 12 March 2012
>
> Psyco is unmaintained and dead. Please look at PyPy for the
> state-of-the-art in JIT compilers for Python.
http://psyco.sourceforge.net/
-rw-r--r-- | cherrypy/process/wspbus.py | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/cherrypy/process/wspbus.py b/cherrypy/process/wspbus.py index 459e4b0c..80eeaf5b 100644 --- a/cherrypy/process/wspbus.py +++ b/cherrypy/process/wspbus.py @@ -375,23 +375,9 @@ class Bus(object): else: states = [state] - def _wait(): - while self.state not in states: - time.sleep(interval) - self.publish(channel) - - # From http://psyco.sourceforge.net/psycoguide/bugs.html: - # "The compiled machine code does not include the regular polling - # done by Python, meaning that a KeyboardInterrupt will not be - # detected before execution comes back to the regular Python - # interpreter. Your program cannot be interrupted if caught - # into an infinite Psyco-compiled loop." - try: - sys.modules['psyco'].cannotcompile(_wait) - except (KeyError, AttributeError): - pass - - _wait() + while self.state not in states: + time.sleep(interval) + self.publish(channel) def _do_execv(self): """Re-execute the current process. |