Don't use singletons for menus

jsmnbom · jsmnbom · commit 0373cee350d4 · 2017-05-27T22:33:04.000+02:00
Singletons are quite frankly gross and requiring the user to initialize their menus shouldn't be a huge deal
Also remove str_type stuff since it was unused
Add a id_from_update method since it was used in several places but looked incredibly gross as a "oneliner"
diff --git a/examples/menubot.py b/examples/menubot.py
@@ -34,7 +34,7 @@ def text(self, update):
 
     def buttons(self):
         return [
-            [Button('Test', menu=SubMenu1), Button('Test2', menu=SubMenu2)],
+            [Button('Test', menu=sub_menu1), Button('Test2', menu=sub_menu2)],
             [Button('Exit', callback=start)]
         ]
 
@@ -45,7 +45,7 @@ class SubMenu1(Menu):
     def buttons(self):
         return [
             # [ToggleButton('Toggleable', 'on'), ToggleButton('Toggleable', 'on')],
-            [Button('Recursion', menu=SubMenu1), Button('Other menu!', menu=SubMenu2)],
+            [Button('Recursion', menu=sub_menu1), Button('Other menu!', menu=sub_menu2)],
             [BackButton('Back')]
         ]
 
@@ -59,8 +59,13 @@ class SubMenu2(Menu):
             [BackButton('Back')]
         ]
 
-dp.add_handler(MenuHandler(MainMenu))
-dp.add_handler(CommandHandler('menu', MainMenu.start, pass_user_data=True, pass_chat_data=True))
+
+main_menu = MainMenu()
+sub_menu1 = SubMenu1()
+sub_menu2 = SubMenu2()
+
+dp.add_handler(MenuHandler(main_menu))
+dp.add_handler(CommandHandler('menu', main_menu.start, pass_user_data=True, pass_chat_data=True))
 
 # Or maybe?
 # dp.add_handler(MenuHandler(MainMenu, entry=CommandHandler('menu'))
diff --git a/telegram/ext/menu.py b/telegram/ext/menu.py
@@ -28,30 +28,23 @@
 from telegram.error import BadRequest
 from telegram.ext import Handler
 
-try:
-    str_type = str
-except NameError:
-    str_type = basestring  # noqa pylint: disable=undefined-variable
+
+def id_from_update(update):
+    if update.callback_query.message:
+        return update.callback_query.message.chat_id, update.callback_query.message.message_id
+    return update.callback_query.inline_message_id
 
 
 class Menu(object):
-    _instance = None
     _buttons = None
     text = ''
     buttons = None
     data = {}
     root_menu = None  # populated in menuhandler
     stack = None  # Only used in root menu assigned in menuhandler
 
-    def __new__(cls):
-        if not cls._instance:
-            cls._instance = super(Menu, cls).__new__(cls)
-        return cls._instance
-
     def callback(self, bot, update, user_data, chat_data):
-        _id = (update.callback_query.message.chat_id, update.callback_query.message.message_id
-               ) if update.callback_query.message else update.callback_query.inline_message_id
-        self.root_menu().stack[_id].append(self)
+        self.root_menu.stack[id_from_update(update)].append(self)
         try:
             return update.callback_query.edit_message_text(self.get_text(update),
                                                            reply_markup=self.keyboard(user_data,
@@ -62,11 +55,10 @@ def callback(self, bot, update, user_data, chat_data):
             else:
                 raise
 
-    @classmethod
-    def start(cls, bot, update, user_data=None, chat_data=None):
+    def start(self, bot, update, user_data=None, chat_data=None):
         # user_ and chat_data is only needed if we wanna do stuff that need state (ie.
         # ToggleButtons)
-        return update.message.reply_text(cls().get_text(update), reply_markup=cls().keyboard(
+        return update.message.reply_text(self.get_text(update), reply_markup=self.keyboard(
             user_data, chat_data))
 
     def keyboard(self, user_data, chat_data):
@@ -109,7 +101,7 @@ def __init__(self,
             raise RuntimeError
         self.callback = callback
         if menu is not None:
-            self.callback = menu().callback
+            self.callback = menu.callback
             pass_user_data = True
             pass_chat_data = True
         self.menu = menu
@@ -158,15 +150,12 @@ def __init__(self, text, name=None):
                                          pass_user_data=True, pass_chat_data=True, name=name)
 
     def _callback(self, bot, update, user_data, chat_data):
-        _id = (update.callback_query.message.chat_id, update.callback_query.message.message_id
-               ) if update.callback_query.message else update.callback_query.inline_message_id
-
-        stack = self.parent_menu().root_menu().stack[_id]
+        stack = self.parent_menu.root_menu.stack[id_from_update(update)]
         try:
             stack.pop()
             last_menu = stack.pop()
         except IndexError:
-            last_menu = self.parent_menu().root_menu()
+            last_menu = self.parent_menu.root_menu
         last_menu.callback(bot, update, user_data, chat_data)
 
 
@@ -186,7 +175,7 @@ def __init__(self, menu):
 
     def collect_buttons(self, menu):
         menu.root_menu = self.menu
-        for button in chain.from_iterable(menu().get_buttons()):
+        for button in chain.from_iterable(menu.get_buttons()):
             button.parent_menu = menu
             if button.name not in self.buttons and (button.callback is not None or
                                                     button.menu is not None):
