From 318a935b89b75ed047d5fd60f7dc3959828609b8 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Sun, 30 Aug 2009 15:00:26 +0200
Subject: [PATCH] fix module name reuse in execnet

--HG--
branch : trunk
---
 py/execnet/channel.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/execnet/channel.py b/py/execnet/channel.py
index f9981fbd8..5cb94d695 100644
--- a/py/execnet/channel.py
+++ b/py/execnet/channel.py
@@ -39,7 +39,7 @@ class Channel(object):
         self._remoteerrors = []
 
     def setcallback(self, callback, endmarker=NO_ENDMARKER_WANTED):
-        queue = self._items
+        items = self._items
         lock = self.gateway._channelfactory._receivelock
         lock.acquire()
         try:
@@ -50,12 +50,12 @@ class Channel(object):
             self._items = None
             while 1:
                 try:
-                    olditem = queue.get(block=False)
+                    olditem = items.get(block=False)
                 except queue.Empty:
                     break
                 else:
                     if olditem is ENDMARKER:
-                        queue.put(olditem)
+                        items.put(olditem)
                         break
                     else:
                         callback(olditem)