From d9a04a36ca908c99988d72122527aed6ac998e2b Mon Sep 17 00:00:00 2001 From: Goffi Date: Sat, 24 Sep 2022 16:08:26 +0200 Subject: [PATCH] core (main): `OrderedDict` is not necesasry here anymore, as `dict` are now ordered --- sat/core/sat_main.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sat/core/sat_main.py b/sat/core/sat_main.py index f6d07fa0..c28222cd 100644 --- a/sat/core/sat_main.py +++ b/sat/core/sat_main.py @@ -50,11 +50,6 @@ from sat.stdui import ui_contact_list, ui_profile_manager import sat.plugins -try: - from collections import OrderedDict # only available from python 2.7 -except ImportError: - from ordereddict import OrderedDict - log = getLogger(__name__) class SAT(service.Service): @@ -64,9 +59,8 @@ class SAT(service.Service): # this _init is called in startService log.info(f"{C.APP_NAME} {self.full_version}") self._cb_map = {} # map from callback_id to callbacks - self._menus = ( - OrderedDict() - ) # dynamic menus. key: callback_id, value: menu data (dictionnary) + # dynamic menus. key: callback_id, value: menu data (dictionnary) + self._menus = {} self._menus_paths = {} # path to id. key: (menu_type, lower case tuple of path), # value: menu id self.initialised = defer.Deferred()