renamed broadcaster.py to dispatcher.py

jh0ker · jh0ker · commit 15501e185bb3 · 2015-11-22T14:52:41.000+01:00
diff --git a/examples/eventhandler_bot.py b/examples/eventhandler_bot.py
@@ -14,9 +14,8 @@
 Type 'stop' on the command line to stop the bot.
 """
 
-import sys
 from telegram import BotEventHandler
-from telegram.broadcaster import run_async
+from telegram.dispatcher import run_async
 from time import sleep
 import logging
 import sys
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -47,7 +47,7 @@
 from .message import Message
 from .update import Update
 from .bot import Bot
-from .broadcaster import Dispatcher
+from .dispatcher import Dispatcher
 from .boteventhandler import BotEventHandler
 
 __all__ = ['Bot', 'BotEventHandler', 'Dispatcher', 'Emoji', 'TelegramError',
diff --git a/telegram/boteventhandler.py b/telegram/boteventhandler.py
@@ -12,7 +12,7 @@
 
 import subprocess
 
-from telegram import (Bot, TelegramError, broadcaster, Dispatcher,
+from telegram import (Bot, TelegramError, dispatcher, Dispatcher,
                       NullHandler)
 from telegram.utils.webhookhandler import (WebhookServer, WebhookHandler)
 
@@ -214,7 +214,7 @@ def stop(self):
 
         self.logger.debug("Requesting Dispatcher to stop...")
         self.dispatcher.stop()
-        while broadcaster.running_async > 0:
+        while dispatcher.running_async > 0:
             sleep(1)
 
         self.logger.debug("Dispatcher stopped.")
diff --git a/telegram/dispatcher.py b/telegram/dispatcher.py
diff --git a/tests/test_boteventhandler.py b/tests/test_boteventhandler.py
@@ -34,7 +34,7 @@
 sys.path.append('.')
 
 from telegram import Update, Message, TelegramError, User, GroupChat
-from telegram.broadcaster import run_async
+from telegram.dispatcher import run_async
 from tests.base import BaseTest
 from threading import Lock, Thread
 
