fixed issues with python2

This commit is contained in:
Jannes Höke 2015-11-16 20:35:27 +01:00
parent 396dc6cd3c
commit 0b8fd24771
5 changed files with 16 additions and 14 deletions

View file

@ -131,9 +131,9 @@ def main():
# Start CLI-Loop
while True:
if sys.version_info.major is 2:
try:
text = raw_input()
elif sys.version_info.major is 3:
except NameError:
text = input()
# Gracefully stop the event handler

View file

@ -66,9 +66,9 @@ def main():
# Start CLI-Loop
while True:
if sys.version_info.major is 2:
try:
text = raw_input()
elif sys.version_info.major is 3:
except NameError:
text = input()
# Gracefully stop the event handler

View file

@ -7,10 +7,11 @@ Telegram Bots intuitive!
import logging
import ssl
from threading import Thread
from time import sleep
from telegram import (Bot, TelegramError, broadcaster, Broadcaster,
NullHandler)
from telegram.utils.webhookhandler import (WebhookServer, WebhookHandler)
from time import sleep
# Adjust for differences in Python versions
try:
@ -188,7 +189,7 @@ class BotEventHandler:
keyfile=key,
server_side=True)
self.httpd.serve_forever()
self.httpd.serve_forever(poll_interval=1)
self.logger.info('Event Handler thread stopped')
def stop(self):
@ -200,8 +201,10 @@ class BotEventHandler:
if self.httpd:
self.logger.info(
'BETA: Webhook Server will stop after next message')
'Waiting for current webhook connection to be closed... '
'Send a Telegram message to the bot to exit immediately.')
self.httpd.shutdown()
self.httpd = None
self.broadcaster.stop()
while broadcaster.running_async > 0:

View file

@ -90,7 +90,7 @@ class Broadcaster:
else:
self.logger.info("Semaphore already initialized, skipping.")
class _Stop:
class _Stop(object):
"""
A class which objects can be passed into the update queue to stop the
thread

View file

@ -13,10 +13,10 @@ H = NullHandler()
logging.getLogger(__name__).addHandler(H)
class WebhookServer(BaseHTTPServer.HTTPServer):
class WebhookServer(BaseHTTPServer.HTTPServer, object):
def __init__(self, server_address, RequestHandlerClass, update_queue,
webhook_path):
super().__init__(server_address, RequestHandlerClass)
super(WebhookServer, self).__init__(server_address, RequestHandlerClass)
self.update_queue = update_queue
self.webhook_path = webhook_path
@ -24,12 +24,11 @@ class WebhookServer(BaseHTTPServer.HTTPServer):
# WebhookHandler, process webhook calls
# Based on: https://github.com/eternnoir/pyTelegramBotAPI/blob/master/
# examples/webhook_examples/webhook_cpython_echo_bot.py
class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler):
class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler, object):
server_version = "WebhookHandler/1.0"
def __init__(self, request, client_address, server):
super().__init__(request, client_address, server)
self.logger = logging.getLogger(__name__)
super(WebhookHandler, self).__init__(request, client_address, server)
def do_HEAD(self):
self.send_response(200)
@ -55,4 +54,4 @@ class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler):
else:
self.send_error(403)
self.end_headers()
self.end_headers()