Refactor if/elif chain for clarity and speed

rhettinger · rhettinger · commit ae138cbfbbfb · 2008-01-15T20:42:00.000Z
diff --git a/Lib/Queue.py b/Lib/Queue.py
@@ -102,18 +102,17 @@ def put(self, item, block=True, timeout=None):
 """
 self.not_full.acquire()
 try:
- if not block:
- if self.maxsize > 0 and self._qsize() == self.maxsize:
- raise Full
- elif timeout is None:
- if self.maxsize > 0:
+ if self.maxsize > 0:
+ if not block:
+ if self._qsize() == self.maxsize:
+ raise Full
+ elif timeout is None:
 while self._qsize() == self.maxsize:
 self.not_full.wait()
- else:
- if timeout < 0:
+ elif timeout < 0:
 raise ValueError("'timeout' must be a positive number")
- endtime = _time() + timeout
- if self.maxsize > 0:
+ else:
+ endtime = _time() + timeout
 while self._qsize() == self.maxsize:
 remaining = endtime - _time()
 if remaining <= 0.0:
@@ -152,9 +151,9 @@ def get(self, block=True, timeout=None):
 elif timeout is None:
 while not self._qsize():
 self.not_empty.wait()
+ elif timeout < 0:
+ raise ValueError("'timeout' must be a positive number")
 else:
- if timeout < 0:
- raise ValueError("'timeout' must be a positive number")
 endtime = _time() + timeout
 while not self._qsize():
 remaining = endtime - _time()

-Original file line number
+Diff line change
  """
 self.not_full.acquire()
 try:
 -ifnotblock:
 -ifself.maxsize>0andself._qsize() ==self.maxsize:
 -raiseFull
 -eliftimeoutisNone:
 -ifself.maxsize>0:
 +ifself.maxsize>0:
 +ifnotblock:
 +ifself._qsize() ==self.maxsize:
 +raiseFull
 +eliftimeoutisNone:
 whileself._qsize() ==self.maxsize:
 self.not_full.wait()
 -else:
 -iftimeout<0:
 +eliftimeout<0:
 raiseValueError("'timeout' must be a positive number")
 -endtime=_time() +timeout
 -ifself.maxsize>0:
 +else:
 +endtime=_time() +timeout
 whileself._qsize() ==self.maxsize:
 remaining=endtime-_time()
 ifremaining<=0.0:
 eliftimeoutisNone:
 whilenotself._qsize():
 self.not_empty.wait()
 +eliftimeout<0:
 +raiseValueError("'timeout' must be a positive number")
 else:
 -iftimeout<0:
 -raiseValueError("'timeout' must be a positive number")
 endtime=_time() +timeout
 whilenotself._qsize():
 remaining=endtime-_time()