Moved listeners to separate file

Removed WorkerThread/ThreadPool. Please use concurrent.futures.ThreadPoolExecutor and friends.
Simplified request executor mechanism

Author: pevdh

.travis.yml

@@ -9,4 +9,4 @@ python:
 install: "pip install -r requirements.txt"
 script:
     - python setup.py install
-    - cd tests && py.test
+    - py.test

requirements.txt

@@ -1,6 +1,7 @@
-py==1.4.29
-pytest==2.7.2
-requests==2.7.0
-six==1.9.0
-wheel==0.24.0
-mock==2.0.0
+py>=1.4.29
+pytest>=2.7.2
+requests>=2.7.0
+six>=1.9.0
+wheel>=0.24.0
+mock>=2.0.0
+futures>=2.1.3

setup.py

@@ -2,28 +2,31 @@
 from setuptools import setup
 from io import open
 
+
 def readme():
     with open('README.rst', encoding='utf-8') as f:
         return f.read()
 
-setup(name='pyTelegramBotAPI',
-      version='2.1.2',
-      description='Python Telegram bot api. ',
-      long_description=readme(),
-      author='eternnoir',
-      author_email='[email protected]',
-      url='https://github.com/eternnoir/pyTelegramBotAPI',
-      packages=['telebot'],
-      license='GPL2',
-      keywords='telegram bot api tools',
-      install_requires=['requests', 'six'],
-      classifiers=[
-          'Development Status :: 5 - Production/Stable',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3',
-          'Environment :: Console',
-          'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
-      ]
-      )
+
+setup(
+    name='pyTelegramBotAPI',
+    version='2.1.2',
+    description='Python Telegram Bot API',
+    long_description=readme(),
+    author='eternnoir',
+    author_email='[email protected]',
+    url='https://github.com/eternnoir/pyTelegramBotAPI',
+    packages=['telebot'],
+    license='GPL2',
+    keywords='telegram bot api tools',
+    install_requires=['requests', 'six'],
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Environment :: Console',
+        'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
+    ]
+)

telebot/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+from telebot import types
 from telebot.util import logger
-from telebot.telebot_class import TeleBot
+from telebot.telebot_class import *
 
 """
 Module : telebot

telebot/apihelper.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import requests
-import six
 
 from telebot import util
 from telebot import logger
@@ -11,12 +10,7 @@
 FILE_URL = "https://api.telegram.org/file/bot{0}/{1}"
 
 
-class RequestExecutor:
-    def make_request(self, url, method='get', params=None, files=None, response_type='text'):
-        raise NotImplementedError()
-
-
-class RequestExecutorImpl(RequestExecutor):
+class RequestExecutorImpl:
     DEFAULT_CONNECT_TIMEOUT = 3.5
     DEFAULT_READ_TIMEOUT = 9999
 
@@ -36,6 +30,9 @@ def make_request(self, url, method='get', params=None, files=None, response_type
             return response.json()
         raise ValueError('Invalid response_type "{0}"'.format(response_type))
 
+    def __call__(self, *args, **kwargs):
+        return self.make_request(*args, **kwargs)
+
 
 class TelegramApiInterface:
     def __init__(self, token, request_executor, api_url=API_URL, file_url=FILE_URL):
@@ -61,7 +58,8 @@ def convert_inline_results(results):
     def make_request(self, method_name, params=None, files=None, method='get', response_type='json'):
         request_url = self.api_url.format(self.token, method_name)
         try:
-            response = self.request_executor.make_request(request_url, method, params, files, response_type)
+            response = self.request_executor(request_url,
+                                             method=method, params=params, files=files, response_type=response_type)
             return response
         except Exception as e:
             raise ApiException(repr(e), method_name)

telebot/listeners.py

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+import re
+
+from telebot import util
+
+
+class MessageHandler:
+
+    def __init__(self, handler, commands=None, regexp=None, func=None, content_types=None):
+        self.handler = handler
+        self.tests = []
+        if content_types is not None:
+            self.tests.append(lambda m: m.content_type in content_types)
+
+        if commands is not None:
+            self.tests.append(lambda m: m.content_type == 'text' and util.extract_command(m.text) in commands)
+
+        if regexp is not None:
+            self.tests.append(lambda m: m.content_type == 'text' and re.search(regexp, m.text))
+
+        if func is not None:
+            self.tests.append(func)
+
+    def test_message(self, message):
+        return all([test(message) for test in self.tests])
+
+    def __call__(self, update):
+        if update.message is None:
+            return
+
+        if self.test_message(update.message):
+            self.handler(update.message)
+
+
+class NextStepHandler:
+
+    def __init__(self, handler, message):
+        self.chat_id = message.chat.id
+        self.handler = handler
+
+    def __call__(self, update):
+        if update.message is None:
+            return
+
+        if update.message.chat.id == self.chat_id:
+            self.handler(update.message)
+
+
+class InlineHandler:
+
+    def __init__(self, handler, func):
+        self.handler = handler
+        self.func = func
+
+    def __call__(self, update):
+        if update.inline_query is None:
+            return
+
+        if self.func(update.inline_query):
+            self.handler(update.inline_query)
+
+
+class ChosenInlineResultHandler:
+
+    def __init__(self, handler, func):
+        self.handler = handler
+        self.func = func
+
+    def __call__(self, update):
+        if update.chosen_inline_result is None:
+            return
+
+        if self.func(update.chosen_inline_result):
+            self.handler(update.chosen_inline_result)
+
+
+class CallbackQueryHandler:
+
+    def __init__(self, handler, func):
+        self.handler = handler
+        self.func = func
+
+    def __call__(self, update):
+        if update.callback_query is None:
+            return
+
+        if self.func(update.callback_query):
+            self.handler(update.callback_query)