From d6219b65bff1068bfbad29913acafd8891eb608c Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 16 Mar 2016 13:49:56 +0200
Subject: [PATCH] Refactoring: access identifiers directly.

Instead of having one more level of indirection.
---
 pysollib/tile/menubar.py | 2 +-
 pysollib/tile/toolbar.py | 2 +-
 pysollib/tk/menubar.py   | 2 +-
 pysollib/tk/toolbar.py   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py
index e80fdd97..c9b6c37a 100644
--- a/pysollib/tile/menubar.py
+++ b/pysollib/tile/menubar.py
@@ -46,7 +46,7 @@ from selecttile import SelectTileDialogWithPreview
 from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog
 from solverdialog import connect_game_solver_dialog
 
-from pysollib.ui.tktile.menubar import createToolbarMenu, MfxMenubar, MfxMenu, PysolMenubarTkCommon
+from pysollib.ui.tktile.menubar import MfxMenubar, MfxMenu, PysolMenubarTkCommon
 # ************************************************************************
 # * - create menubar
 # * - update menubar
diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py
index 30a08541..436ad96a 100644
--- a/pysollib/tile/toolbar.py
+++ b/pysollib/tile/toolbar.py
@@ -39,7 +39,7 @@ from pysollib.winsystems import TkSettings
 # Toolkit imports
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxTooltip
-from menubar import createToolbarMenu, MfxMenu
+from pysollib.ui.tktile.menubar import createToolbarMenu, MfxMenu
 from pysollib.ui.tktile.tkutil import loadImage
 
 
diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py
index 830f8d8a..345dcca4 100644
--- a/pysollib/tk/menubar.py
+++ b/pysollib/tk/menubar.py
@@ -42,7 +42,7 @@ from selecttile import SelectTileDialogWithPreview
 from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog
 from solverdialog import connect_game_solver_dialog
 
-from pysollib.ui.tktile.menubar import createToolbarMenu, MfxMenubar, MfxMenu, PysolMenubarTkCommon
+from pysollib.ui.tktile.menubar import MfxMenubar, PysolMenubarTkCommon
 # ************************************************************************
 # * - create menubar
 # * - update menubar
diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py
index f90308c9..a93274ff 100644
--- a/pysollib/tk/toolbar.py
+++ b/pysollib/tk/toolbar.py
@@ -38,7 +38,7 @@ from pysollib.winsystems import TkSettings
 # Toolkit imports
 from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxTooltip
-from menubar import createToolbarMenu, MfxMenu
+from pysollib.ui.tktile.menubar import createToolbarMenu, MfxMenu
 
 
 # ************************************************************************