Merge pull request python-telegram-bot#213 from python-telegram-bot/prep34

leandrotoledo · leandrotoledo · commit 4f26bdd18fb9 · 2016-03-21T23:15:38.000-03:00
Prepare Release of v3.4
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,13 @@
+**2016-03-22**
+
+*Released 3.4*
+
+- Move ``Updater``, ``Dispatcher`` and ``JobQueue`` to new ``telegram.ext`` submodule (thanks to @rahiel)
+- Add ``disable_notification`` parameter (thanks to @aidarbiktimirov)
+- Fix bug where commands sent by Telegram Web would not be recognized (thanks to @shelomentsevd)
+- Add option to skip old updates on bot startup
+- Send files from ``BufferedReader``
+
 **2016-02-28**
 
 *Released 3.3*
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.3'
+version = '3.4'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.0'
+release = '3.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def requirements():
 
 setup(
     name='python-telegram-bot',
-    version='3.3',
+    version='3.4',
     author='Leandro Toledo',
     author_email='devs@python-telegram-bot.org',
     license='LGPLv3',
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -52,16 +52,40 @@
 
 
 def Updater(*args, **kwargs):
-    """Load the updater module on invocation and return an Updater instance."""
+    """
+    Load the updater module on invocation and return an Updater instance.
+    """
     import warnings
     warnings.warn("telegram.Updater is being deprecated, please use "
                   "telegram.ext.Updater from now on.")
     from .ext.updater import Updater as Up
     return Up(*args, **kwargs)
 
 
+def Dispatcher(*args, **kwargs):
+    """
+    Load the dispatcher module on invocation and return an Dispatcher instance.
+    """
+    import warnings
+    warnings.warn("telegram.Dispatcher is being deprecated, please use "
+                  "telegram.ext.Dispatcher from now on.")
+    from .ext.dispatcher import Dispatcher as Dis
+    return Dis(*args, **kwargs)
+
+
+def JobQueue(*args, **kwargs):
+    """
+    Load the jobqueue module on invocation and return a JobQueue instance.
+    """
+    import warnings
+    warnings.warn("telegram.JobQueue is being deprecated, please use "
+                  "telegram.ext.JobQueue from now on.")
+    from .ext.jobqueue import JobQueue as JobQ
+    return JobQ(*args, **kwargs)
+
+
 __author__ = 'devs@python-telegram-bot.org'
-__version__ = '3.3'
+__version__ = '3.4'
 __all__ = ('Audio', 'Bot', 'Chat', 'Emoji', 'TelegramError', 'InputFile',
            'Contact', 'ForceReply', 'ReplyKeyboardHide', 'ReplyKeyboardMarkup',
            'UserProfilePhotos', 'ChatAction', 'Location', 'Video', 'Document',
diff --git a/telegram/ext/__init__.py b/telegram/ext/__init__.py
@@ -21,8 +21,6 @@
 
 from .dispatcher import Dispatcher
 from .jobqueue import JobQueue
-from .updatequeue import UpdateQueue
 from .updater import Updater
 
-
-__all__ = ('Dispatcher', 'JobQueue', 'UpdateQueue', 'Updater')
+__all__ = ('Dispatcher', 'JobQueue', 'Updater')
diff --git a/telegram/ext/dispatcher.py b/telegram/ext/dispatcher.py
@@ -27,7 +27,7 @@
 from time import sleep
 
 from telegram import (TelegramError, Update, NullHandler)
-from telegram.ext.updatequeue import Empty
+from telegram.utils.updatequeue import Empty
 
 logging.getLogger(__name__).addHandler(NullHandler())
 
diff --git a/telegram/ext/updater.py b/telegram/ext/updater.py
@@ -29,8 +29,9 @@
 import subprocess
 from signal import signal, SIGINT, SIGTERM, SIGABRT
 from telegram import Bot, TelegramError, NullHandler
-from telegram.ext import dispatcher, Dispatcher, JobQueue, UpdateQueue
+from telegram.ext import dispatcher, Dispatcher, JobQueue
 from telegram.error import Unauthorized, InvalidToken
+from telegram.utils.updatequeue import UpdateQueue
 from telegram.utils.webhookhandler import (WebhookServer, WebhookHandler)
 
 logging.getLogger(__name__).addHandler(NullHandler())
diff --git a/telegram/utils/updatequeue.py b/telegram/utils/updatequeue.py
diff --git a/tests/test_updater.py b/tests/test_updater.py
@@ -48,7 +48,7 @@
 sys.path.append('.')
 
 from telegram import Update, Message, TelegramError, User, Chat, Bot
-from telegram.ext.updater import Updater
+from telegram.ext import Updater
 from telegram.ext.dispatcher import run_async
 from telegram.error import Unauthorized, InvalidToken
 from tests.base import BaseTest
