p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix module name reuse in execnet 

--HG--
branch : trunk
This commit is contained in:
Ronny Pfannschmidt 2009-08-30 15:00:26 +02:00
parent 04dd0810c3
commit 318a935b89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/execnet/channel.py
View File

@ -39,7 +39,7 @@ class Channel(object):
self._remoteerrors = [] self._remoteerrors = []
def setcallback(self, callback, endmarker=NO_ENDMARKER_WANTED): def setcallback(self, callback, endmarker=NO_ENDMARKER_WANTED):
queue = self._items items = self._items
lock = self.gateway._channelfactory._receivelock lock = self.gateway._channelfactory._receivelock
lock.acquire() lock.acquire()
try: try:
@ -50,12 +50,12 @@ class Channel(object):
self._items = None self._items = None
while 1: while 1:
try: try:
olditem = queue.get(block=False) olditem = items.get(block=False)
except queue.Empty: except queue.Empty:
break break
else: else:
if olditem is ENDMARKER: if olditem is ENDMARKER:
queue.put(olditem) items.put(olditem)
break break
else: else:
callback(olditem) callback(olditem)