beremiz

Unclutter graphics package scope.

2018-02-13, Edouard Tisserant
7e6b03251bfe
Parents e6de7df5f401
Children 65d2dbbf7022
Unclutter graphics package scope.
Moved some import statements from "graphics" package to "viewer" module.
It also avoid systematic import of everything in graphics when we only need one submodule.
2 files changed, 8 insertions(+), 9 deletions(-)
  • +8 -1
    editors/Viewer.py
  • +0 -8
    graphics/__init__.py
    • --- a/editors/Viewer.py Tue Feb 13 13:57:53 2018 +0100
    +++ b/editors/Viewer.py Tue Feb 13 14:01:20 2018 +0100
    @@ -34,7 +34,14 @@
    from plcopen.structures import *
    from PLCControler import ITEM_VAR_LOCAL, ITEM_POU, ITEM_PROGRAM, ITEM_FUNCTIONBLOCK
    from graphics.DebugDataConsumer import DebugDataConsumer
    -from graphics import *
    +
    +from graphics.GraphicCommons import *
    +from graphics.FBD_Objects import *
    +from graphics.LD_Objects import *
    +from graphics.SFC_Objects import *
    +from graphics.RubberBand import RubberBand
    +from graphics.DebugDataConsumer import DebugDataConsumer
    +
    from dialogs import *
    from editors.DebugViewer import DebugViewer, REFRESH_PERIOD
    from editors.EditorPanel import EditorPanel
    --- a/graphics/__init__.py Tue Feb 13 13:57:53 2018 +0100
    +++ b/graphics/__init__.py Tue Feb 13 14:01:20 2018 +0100
    @@ -24,11 +24,3 @@
    # Package initialisation
    -from __future__ import absolute_import
    -
    -from graphics.GraphicCommons import *
    -from graphics.FBD_Objects import *
    -from graphics.LD_Objects import *
    -from graphics.SFC_Objects import *
    -from graphics.RubberBand import RubberBand
    -from graphics.DebugDataConsumer import DebugDataConsumer