From e7c1efefe27378ddbefab353d1d09a481d01e8e7 Mon Sep 17 00:00:00 2001 From: drymer Date: Sun, 8 May 2016 23:59:47 +0200 Subject: [PATCH] Take out logging. Also, add a exit option --- jabbergram.py | 14 +++++++------- setup.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jabbergram.py b/jabbergram.py index e286572..6bc1e96 100644 --- a/jabbergram.py +++ b/jabbergram.py @@ -10,6 +10,7 @@ from queue import Queue from telegram.error import NetworkError, Unauthorized from time import sleep from sys import argv +from sys import exit class EchoBot(sleekxmpp.ClientXMPP): @@ -30,13 +31,12 @@ class EchoBot(sleekxmpp.ClientXMPP): t = Thread(target=self.read_tg) t.daemon = True t.start() - - # activar logueo basico - logging.basicConfig( - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', - level=logging.INFO) - - logger = logging.getLogger(__name__) + print('Please wait a couple of minutes until it\'s correctly connected' + ' to telegram.') + while True: + out = input('Enter "quit" if you want to stop the program.\n') + if out == 'quit': + exit() def read_tg(self): update_id = 0 diff --git a/setup.py b/setup.py index 5ef310c..3b92cdb 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup -VERSION = '0.1.2' +VERSION = '0.1.3' setup(name='jabbergram', version=VERSION,