bugfixes on error in answer_shipping_query and answer_precheckout_query

jeffffc · jeffffc · commit a68e0ad04468 · 2017-06-11T03:45:48.000+08:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -1975,7 +1975,7 @@ def answer_shipping_query(self,
         data = {'shipping_query_id': shipping_query_id, 'ok': ok}
 
         if ok is True:
-            data['shipping_options'] = shipping_options
+            data['shipping_options'] = [option.to_dict() for option in shipping_options]
         if error_message is not None:
             data['error_message'] = error_message
 
@@ -2009,7 +2009,7 @@ def answer_pre_checkout_query(self, pre_checkout_query_id, ok,
 
         """
 
-        if not (ok ^ (error_message is None)):
+        if not (ok ^ (error_message is not None)):
             raise TelegramError(
                 'answerPreCheckoutQuery: If ok is True, there should '
                 'not be error_message; if ok is False, error_message '
