From feca7b565841c37d2fd26759505aa56219f64e7e Mon Sep 17 00:00:00 2001 From: "lb@lb520" Date: Mon, 19 Mar 2018 10:55:41 +0100 Subject: [PATCH] Cosmetics: Kivy __all removed. --- pysollib/kivy/card.py | 2 -- pysollib/kivy/colorsdialog.py | 2 -- pysollib/kivy/edittextdialog.py | 2 -- pysollib/kivy/findcarddialog.py | 5 ----- pysollib/kivy/fontsdialog.py | 2 -- pysollib/kivy/menubar.py | 5 ----- pysollib/kivy/playeroptionsdialog.py | 2 -- pysollib/kivy/selecttree.py | 2 -- pysollib/kivy/solverdialog.py | 8 -------- pysollib/kivy/statusbar.py | 4 ---- pysollib/kivy/timeoutsdialog.py | 2 -- pysollib/kivy/tkcanvas.py | 8 -------- pysollib/kivy/tkconst.py | 19 ------------------- pysollib/kivy/tkstats.py | 10 ---------- pysollib/kivy/tkutil.py | 22 ---------------------- pysollib/kivy/tkwrap.py | 9 ++------- pysollib/kivy/toolbar.py | 22 ++++++++-------------- 17 files changed, 10 insertions(+), 116 deletions(-) diff --git a/pysollib/kivy/card.py b/pysollib/kivy/card.py index dc208240..97a8bd1a 100644 --- a/pysollib/kivy/card.py +++ b/pysollib/kivy/card.py @@ -31,8 +31,6 @@ from pysollib.kivy.tkcanvas import MfxCanvasGroup, MfxCanvasImage from pysollib.kivy.LApp import LImageItem from pysollib.kivy.LApp import LImage -__all__ = ['Card'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/colorsdialog.py b/pysollib/kivy/colorsdialog.py index a00d287f..f10060de 100644 --- a/pysollib/kivy/colorsdialog.py +++ b/pysollib/kivy/colorsdialog.py @@ -24,8 +24,6 @@ # Toolkit imports from pysollib.pysoltk import MfxDialog -__all__ = ['ColorsDialog'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/edittextdialog.py b/pysollib/kivy/edittextdialog.py index dd7fff82..2ee89982 100644 --- a/pysollib/kivy/edittextdialog.py +++ b/pysollib/kivy/edittextdialog.py @@ -24,8 +24,6 @@ # Toolkit imports from pysollib.pysoltk import MfxDialog -__all__ = ['EditTextDialog'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/findcarddialog.py b/pysollib/kivy/findcarddialog.py index fc37a482..d3ff5611 100644 --- a/pysollib/kivy/findcarddialog.py +++ b/pysollib/kivy/findcarddialog.py @@ -35,11 +35,6 @@ # from pysollib.settings import TITLE -__all__ = ['create_find_card_dialog', - 'connect_game_find_card_dialog', - 'destroy_find_card_dialog', - ] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/fontsdialog.py b/pysollib/kivy/fontsdialog.py index 6e6b7802..7feae6bf 100644 --- a/pysollib/kivy/fontsdialog.py +++ b/pysollib/kivy/fontsdialog.py @@ -24,8 +24,6 @@ # Toolkit imports from pysollib.pysoltk import MfxDialog -__all__ = ['FontsDialog'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/menubar.py b/pysollib/kivy/menubar.py index 4d2e4e48..d3c9483e 100644 --- a/pysollib/kivy/menubar.py +++ b/pysollib/kivy/menubar.py @@ -25,10 +25,7 @@ # imports import math import os -# import sys import re -# import logging -# import traceback # PySol imports from pysollib.mygettext import _ @@ -66,8 +63,6 @@ from pysollib.kivy.LApp import LScrollView from pysollib.kivy.LApp import LTreeRoot -__all__ = ['PysolMenubarTk'] - # ************************************************************************ # * tk emuls: # ************************************************************************ diff --git a/pysollib/kivy/playeroptionsdialog.py b/pysollib/kivy/playeroptionsdialog.py index 19b4d52c..eec263a8 100644 --- a/pysollib/kivy/playeroptionsdialog.py +++ b/pysollib/kivy/playeroptionsdialog.py @@ -24,8 +24,6 @@ # Toolkit imports from pysollib.pysoltk import MfxDialog -__all__ = ['PlayerOptionsDialog'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/selecttree.py b/pysollib/kivy/selecttree.py index b6bf3aa3..12ae8db1 100644 --- a/pysollib/kivy/selecttree.py +++ b/pysollib/kivy/selecttree.py @@ -27,8 +27,6 @@ # Toolkit imports from pysollib.kivy.tktree import MfxTreeLeaf, MfxTreeNode, MfxTreeInCanvas -__all__ = ['SelectDialogTreeData'] - # ************************************************************************ # * Nodes # ************************************************************************ diff --git a/pysollib/kivy/solverdialog.py b/pysollib/kivy/solverdialog.py index ce03d78f..c983b5dc 100644 --- a/pysollib/kivy/solverdialog.py +++ b/pysollib/kivy/solverdialog.py @@ -31,14 +31,6 @@ # from tkconst import EVENT_HANDLED # from tkwidget import MfxDialog -__all__ = [ - # 'SolverDialog', - 'create_solver_dialog', - 'connect_game_solver_dialog', - 'destroy_solver_dialog', - 'reset_solver_dialog', -] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/statusbar.py b/pysollib/kivy/statusbar.py index 6a943a3f..028e6f07 100644 --- a/pysollib/kivy/statusbar.py +++ b/pysollib/kivy/statusbar.py @@ -36,10 +36,6 @@ if __name__ == '__main__': # Toolkit imports # from pysollib.settings import WIN_SYSTEM - -__all__ = ['PysolStatusbar', - 'HelpStatusbar'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/timeoutsdialog.py b/pysollib/kivy/timeoutsdialog.py index 10cd79df..10f04367 100644 --- a/pysollib/kivy/timeoutsdialog.py +++ b/pysollib/kivy/timeoutsdialog.py @@ -24,8 +24,6 @@ # Toolkit imports from pysollib.kivy.tkwidget import MfxDialog -__all__ = ['TimeoutsDialog'] - # ************************************************************************ # * # ************************************************************************ diff --git a/pysollib/kivy/tkcanvas.py b/pysollib/kivy/tkcanvas.py index afcfbf49..f050a028 100644 --- a/pysollib/kivy/tkcanvas.py +++ b/pysollib/kivy/tkcanvas.py @@ -43,14 +43,6 @@ from kivy.clock import Clock from kivy.graphics import Color from kivy.graphics import Rectangle -''' -__all__ = ['MfxCanvasGroup', - 'MfxCanvasImage', - 'MfxCanvasText', - 'MfxCanvasLine', - 'MfxCanvasRectangle', - 'MfxCanvas'] -''' # ************************************************************************ # * canvas items helpers # ************************************************************************ diff --git a/pysollib/kivy/tkconst.py b/pysollib/kivy/tkconst.py index 4c77879f..4c0edc4c 100644 --- a/pysollib/kivy/tkconst.py +++ b/pysollib/kivy/tkconst.py @@ -19,25 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# ---------------------------------------------------------------------------# - -__all__ = ['EVENT_HANDLED', - 'EVENT_PROPAGATE', - 'CURSOR_DRAG', - 'CURSOR_WATCH', - 'CURSOR_DOWN_ARROW', - 'ANCHOR_CENTER', - 'ANCHOR_N', - 'ANCHOR_NW', - 'ANCHOR_NE', - 'ANCHOR_S', - 'ANCHOR_SW', - 'ANCHOR_SE', - 'ANCHOR_W', - 'ANCHOR_E', - 'TOOLBAR_BUTTONS', - ] - # ************************************************************************ # * constants # ************************************************************************ diff --git a/pysollib/kivy/tkstats.py b/pysollib/kivy/tkstats.py index 3700a9f0..cd976100 100644 --- a/pysollib/kivy/tkstats.py +++ b/pysollib/kivy/tkstats.py @@ -20,16 +20,6 @@ # along with this program. If not, see . # # ---------------------------------------------------------------------------# -''' -__all__ = ['SingleGame_StatsDialog', - 'AllGames_StatsDialog', - 'FullLog_StatsDialog', - 'SessionLog_StatsDialog', - 'Status_StatsDialog', - 'Top_StatsDialog', - 'ProgressionDialog', - ] -''' # imports # import os # import time diff --git a/pysollib/kivy/tkutil.py b/pysollib/kivy/tkutil.py index 5621f7b5..656a236c 100644 --- a/pysollib/kivy/tkutil.py +++ b/pysollib/kivy/tkutil.py @@ -26,28 +26,6 @@ # emulated. from __future__ import division -''' -__all__ = ['wm_withdraw', - 'wm_map', - 'setTransient', - 'makeToplevel', - 'make_help_toplevel', - 'bind', - 'unbind_destroy', - 'after', - 'after_idle', - 'after_cancel', - # 'makeImage', - 'copyImage', - 'loadImage', - # 'fillImage', - 'createImage', - 'shadowImage', - 'markImage', - 'createBottom', - 'get_text_width', - ] -''' # imports import os diff --git a/pysollib/kivy/tkwrap.py b/pysollib/kivy/tkwrap.py index 805959cc..e47531a5 100644 --- a/pysollib/kivy/tkwrap.py +++ b/pysollib/kivy/tkwrap.py @@ -21,13 +21,8 @@ # # ---------------------------------------------------------------------------# -__all__ = ['TclError', - 'MfxRoot'] - -E402Fix = True -if E402Fix: - import logging - from kivy.cache import Cache +import logging +from kivy.cache import Cache TclError = 0 diff --git a/pysollib/kivy/toolbar.py b/pysollib/kivy/toolbar.py index 3106b160..3bdda453 100644 --- a/pysollib/kivy/toolbar.py +++ b/pysollib/kivy/toolbar.py @@ -18,20 +18,14 @@ # # ---------------------------------------------------------------------------# -__all__ = ['PysolToolbarTk'] +# imports +import os -E402Fix = True - -if E402Fix: - # imports - import os - - # PySol imports - # from pysollib.mfxutil import destruct - from pysollib.util import IMAGE_EXTENSIONS - from pysollib.settings import TITLE - from pysollib.winsystems import TkSettings - from pysollib.mygettext import _, n_ +# PySol imports +from pysollib.util import IMAGE_EXTENSIONS +from pysollib.settings import TITLE +from pysollib.winsystems import TkSettings +from pysollib.mygettext import _, n_ # ************************************************************************ # * @@ -70,7 +64,7 @@ class AbstractToolbarButton: # ************************************************************************ -if E402Fix: +if True: from pysollib.kivy.LApp import LImage # from LApp import LMainWindow from kivy.uix.boxlayout import BoxLayout