Skip to content

Clean up else clause on conversation handler check_update for loop #1236 #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jitsusama wants to merge 2 commits into from
Closed

Clean up else clause on conversation handler check_update for loop #1236 #1240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b61d6e1
Remove spurious else statement on for loop
Jitsusama Oct 1, 2018
6f37e85
Make promise success conditional self documenting
Jitsusama Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions telegram/ext/conversationhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@ def check_update(self, update):
self.logger.debug('waiting for promise...')

old_state, new_state = state
if new_state.done.wait(timeout=self.run_async_timeout):
promise_completed = new_state.done.wait(timeout=self.run_async_timeout)

if promise_completed:
try:
res = new_state.result(timeout=0)
res = res if res is not None else old_state
Expand All @@ -266,9 +268,7 @@ def check_update(self, update):
self.current_handler = candidate

return True

else:
return False
return False

self.logger.debug('selecting conversation %s with state %s' % (str(key), str(state)))

Expand Down