[pypy-svn] r61394 - in pypy/trunk/pypy: interpreter/test module/signal module/thread

arigo at codespeak.net arigo at codespeak.net
Tue Jan 27 16:14:12 CET 2009


Author: arigo
Date: Tue Jan 27 16:14:11 2009
New Revision: 61394

Modified:
   pypy/trunk/pypy/interpreter/test/test_executioncontext.py
   pypy/trunk/pypy/module/signal/interp_signal.py
   pypy/trunk/pypy/module/thread/gil.py
Log:
(antocuni, arigo)
Forgot to add the extra argument to these classes.


Modified: pypy/trunk/pypy/interpreter/test/test_executioncontext.py
==============================================================================
--- pypy/trunk/pypy/interpreter/test/test_executioncontext.py	(original)
+++ pypy/trunk/pypy/interpreter/test/test_executioncontext.py	Tue Jan 27 16:14:11 2009
@@ -12,7 +12,7 @@
 
         class DemoAction(executioncontext.AsyncAction):
             counter = 0
-            def perform(self, ec):
+            def perform(self, ec, frame):
                 self.counter += 1
                 if self.counter == 10:
                     raise Finished
@@ -42,7 +42,7 @@
 
         class DemoAction(executioncontext.PeriodicAsyncAction):
             counter = 0
-            def perform(self, ec):
+            def perform(self, ec, frame):
                 self.counter += 1
                 print '->', self.counter
                 if self.counter == 3:

Modified: pypy/trunk/pypy/module/signal/interp_signal.py
==============================================================================
--- pypy/trunk/pypy/module/signal/interp_signal.py	(original)
+++ pypy/trunk/pypy/module/signal/interp_signal.py	Tue Jan 27 16:14:11 2009
@@ -67,7 +67,7 @@
         else:
             self.reissue_signal_action = None
 
-    def perform(self, executioncontext):
+    def perform(self, executioncontext, frame):
         while True:
             n = pypysig_poll()
             if n < 0:
@@ -125,7 +125,7 @@
     thread switch until we land in the main thread.
     """
 
-    def perform(self, executioncontext):
+    def perform(self, executioncontext, frame):
         main_ec = self.space.threadlocals.getmainthreadvalue()
         if executioncontext is main_ec:
             # now running in the main thread: we can really report the signals

Modified: pypy/trunk/pypy/module/thread/gil.py
==============================================================================
--- pypy/trunk/pypy/module/thread/gil.py	(original)
+++ pypy/trunk/pypy/module/thread/gil.py	Tue Jan 27 16:14:11 2009
@@ -57,7 +57,7 @@
     the GIL to give some other thread a chance to run.
     """
 
-    def perform(self, executioncontext):
+    def perform(self, executioncontext, frame):
         # Other threads can run between the release() and the acquire()
         # implicit in the following external function call (which has
         # otherwise no effect).



More information about the Pypy-commit mailing list