Use HTML Formatter as default formatter for telegram handler

Author: sashgorokhov

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+1.1.1 (2016-04-20)
+++++++++++++++++++
+
+* Use HTML Formatter as default formatter for telegram handler
+
 1.1.0 (2016-04-20)
 ++++++++++++++++++
 

setup.py

@@ -7,7 +7,7 @@
 setup(
     requires=['requests'],
     name='python-telegram-handler',
-    version='1.1',
+    version='1.1.1',
     packages=['telegram_handler'],
     url='https://github.com/sashgorokhov/python-telegram-handler',
     download_url='https://github.com/sashgorokhov/python-telegram-handler/archive/master.zip',

telegram_handler/handlers.py

@@ -7,7 +7,7 @@
 except ImportError:
     import urlparse as parse
 
-from telegram_handler.formatters import MarkdownFormatter
+from telegram_handler.formatters import HtmlFormatter
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ def __init__(self, token, chat_id, disable_notification=False, disable_web_page_
 
         super(TelegramHandler, self).__init__(level=level)
 
-        self.formatter = MarkdownFormatter()
+        self.formatter = HtmlFormatter()
 
     @classmethod
     def formatUrl(cls, token, method):
@@ -40,7 +40,7 @@ def make_request(self, url, data):
         """
         logger.debug(str(data))
         try:
-            response = requests.post(self.url, data=data)
+            response = requests.post(self.url, data=data, timeout=self.timeout)
         except:
             logger.exception('Error while making POST %s', url)
             return None