fix handling tuple states

jh0ker · jh0ker · commit fa6b0ab9d434 · 2016-07-13T16:40:24.000+02:00
diff --git a/telegram/ext/conversationhandler.py b/telegram/ext/conversationhandler.py
@@ -143,7 +143,7 @@ def check_update(self, update):
         state = self.conversations.get(key)
 
         # Resolve promises
-        if isinstance(state, tuple):
+        if isinstance(state, tuple) and len(state) is 2 and isinstance(state[1], Promise):
             self.logger.debug('waiting for promise...')
 
             old_state, new_state = state
@@ -220,6 +220,3 @@ def update_state(self, new_state, key):
 
         elif new_state is not None:
             self.conversations[key] = new_state
-
-        elif isinstance(self.conversations[key], tuple):
-            self.conversations[key] = self.conversations[key][0]
