remove lazy import of JobQueue

jh0ker · jh0ker · commit cb793173545c · 2016-04-21T20:37:43.000+02:00
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -80,39 +80,6 @@
 from .bot import Bot
 
 
-def Updater(*args, **kwargs):
-    """
-    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.4'
 __all__ = ['Audio',
diff --git a/tests/test_jobqueue.py b/tests/test_jobqueue.py
@@ -71,15 +71,6 @@ def job1(self, bot):
     def job2(self, bot):
         raise Exception("Test Error")
 
-    def test_legacy_import(self):
-        from telegram import JobQueue as legacyJobQueue
-
-        ljq = legacyJobQueue("Bot", tick_interval=0.005)
-
-        self.assertIsInstance(ljq, JobQueue)
-
-        ljq.stop()
-
     def test_basic(self):
         self.jq.put(self.job1, 0.1)
         sleep(1.5)
