← Back to branch summary

~ubuntu-branches/ubuntu/precise/python3.2/precise-proposed

« back to all changes in this revision

Viewing changes to Lib/multiprocessing/queues.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-03-09 18:40:39 UTC
  • mfrom: (30.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20120309184039-j3yk2emxr1plyo21
Tags: 3.2.3~rc1-1
http://bugs.debian.org/660146
* Python 3.2.3 release candidate 1.
* Update to 20120309 from the 3.2 branch.
* Fix libpython.a symlink. Closes: #660146.
* Build-depend on xauth.
* Run the gdb tests for the debug build only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/multiprocessing/queues.py
126
126
            if not self._rlock.acquire(block, timeout):
127
127
                raise Empty
128
128
            try:
129
 
                if not self._poll(block and (deadline-time.time()) or 0.0):
 
129
                if block:
 
130
                    timeout = deadline - time.time()
 
131
                    if timeout < 0 or not self._poll(timeout):
 
132
                        raise Empty
 
133
                elif not self._poll():
130
134
                    raise Empty
131
135
                res = self._recv()
132
136
                self._sem.release()