|
@@ -97,27 +97,13 @@ class RequestHandler(object):
|
|
# Silence pylint's warning about catching Exception.
|
|
# Silence pylint's warning about catching Exception.
|
|
# pylint: disable=I0011,W0703
|
|
# pylint: disable=I0011,W0703
|
|
try:
|
|
try:
|
|
- """
|
|
|
|
- if self.has_pending_requests():
|
|
|
|
- try:
|
|
|
|
- # Try to pop a request for the modelverse state.
|
|
|
|
- return self.pop_requests()
|
|
|
|
- except KnownRequestHandled:
|
|
|
|
- # Carry on.
|
|
|
|
- pass
|
|
|
|
-
|
|
|
|
- if not self.has_pending_requests():
|
|
|
|
- # Perform a single generator step.
|
|
|
|
|
|
+ while self.generator_stack[-1].finished_requests:
|
|
self.generator_stack[-1].step()
|
|
self.generator_stack[-1].step()
|
|
- """
|
|
|
|
- if self.has_pending_requests():
|
|
|
|
- try:
|
|
|
|
- return self.pop_requests()
|
|
|
|
- except KnownRequestHandled:
|
|
|
|
- pass
|
|
|
|
else:
|
|
else:
|
|
- self.generator_stack[-1].step()
|
|
|
|
|
|
+ return self.pop_requests()
|
|
|
|
|
|
|
|
+ except KnownRequestHandled:
|
|
|
|
+ pass
|
|
except StopIteration:
|
|
except StopIteration:
|
|
# Done, so remove the generator
|
|
# Done, so remove the generator
|
|
self.pop_generator()
|
|
self.pop_generator()
|