diff --git a/telebot/__init__.py b/telebot/__init__.py index ca6de4c..cc26a28 100644 --- a/telebot/__init__.py +++ b/telebot/__init__.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- +from __future__ import print_function import json import time import threading -import apihelper -import types +from telebot import apihelper, types """ Module : telebot @@ -73,15 +73,15 @@ class TeleBot: self.polling_thread.start() def __polling(self): - print 'telegram bot start polling' + print('telegram bot start polling') while not self.__stop_polling: try: self.get_update() except Exception as e: - print e + print(e) time.sleep(self.interval) - print 'telegram bot stop polling' + print('telegram bot stop polling') def stop_polling(self): self.__stop_polling = True diff --git a/telebot/apihelper.py b/telebot/apihelper.py index 72476ed..3e3a01d 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -133,12 +133,14 @@ def check_result(func_name, result): raise ApiError(func_name + r' error.', result) return result_json + def convert_markup(markup): if isinstance(markup, types.ReplyKeyboardMarkup): return markup.to_json() else: return markup + class ApiError(Exception): def __init__(self, message, result): super(ApiError, self).__init__(message)