Index: Lib/multiprocessing/queues.py =================================================================== --- Lib/multiprocessing/queues.py (revision 88368) +++ Lib/multiprocessing/queues.py (working copy) @@ -96,7 +96,7 @@ self._recv = self._reader.recv self._poll = self._reader.poll - def put(self, obj, block=True, timeout=None): + def put(self, item, block=True, timeout=None): assert not self._closed if not self._sem.acquire(block, timeout): raise Full @@ -105,7 +105,7 @@ try: if self._thread is None: self._start_thread() - self._buffer.append(obj) + self._buffer.append(item) self._notempty.notify() finally: self._notempty.release() @@ -147,8 +147,8 @@ def get_nowait(self): return self.get(False) - def put_nowait(self, obj): - return self.put(obj, False) + def put_nowait(self, item): + return self.put(item, False) def close(self): self._closed = True @@ -254,18 +254,18 @@ nrelease() try: while 1: - obj = bpopleft() - if obj is sentinel: + item = bpopleft() + if item is sentinel: debug('feeder thread got sentinel -- exiting') close() return if wacquire is None: - send(obj) + send(item) else: wacquire() try: - send(obj) + send(item) finally: wrelease() except IndexError: @@ -308,7 +308,7 @@ Queue.__setstate__(self, state[:-2]) self._cond, self._unfinished_tasks = state[-2:] - def put(self, obj, block=True, timeout=None): + def put(self, item, block=True, timeout=None): assert not self._closed if not self._sem.acquire(block, timeout): raise Full @@ -318,7 +318,7 @@ try: if self._thread is None: self._start_thread() - self._buffer.append(obj) + self._buffer.append(item) self._unfinished_tasks.release() self._notempty.notify() finally: @@ -386,10 +386,10 @@ else: send = self._writer.send wacquire, wrelease = self._wlock.acquire, self._wlock.release - def put(obj): + def put(item): wacquire() try: - return send(obj) + return send(item) finally: wrelease() self.put = put