# HG changeset patch # User Andrey Skvortsov # Date 1507562006 -10800 # Node ID 47a3f39bead0689d2f69aac1f974bbf3317d9692 # Parent 70c1cc354a8fe6375e09ba188ceb7cf4770f2638 fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'" diff -r 70c1cc354a8f -r 47a3f39bead0 c_ext/__init__.py --- a/c_ext/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/c_ext/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,4 +22,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from c_ext import * +from __future__ import absolute_import +from c_ext.c_ext import * diff -r 70c1cc354a8f -r 47a3f39bead0 c_ext/c_ext.py --- a/c_ext/c_ext.py Mon Oct 09 16:04:39 2017 +0300 +++ b/c_ext/c_ext.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,9 +22,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from __future__ import absolute_import import os -from CFileEditor import CFileEditor +from c_ext.CFileEditor import CFileEditor from CodeFileTreeNode import CodeFile diff -r 70c1cc354a8f -r 47a3f39bead0 canfestival/__init__.py --- a/canfestival/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/canfestival/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,4 +22,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from canfestival import * +from __future__ import absolute_import +from canfestival.canfestival import * diff -r 70c1cc354a8f -r 47a3f39bead0 canfestival/canfestival.py --- a/canfestival/canfestival.py Mon Oct 09 16:04:39 2017 +0300 +++ b/canfestival/canfestival.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,6 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from __future__ import absolute_import import os import sys import shutil @@ -53,9 +54,9 @@ from commondialogs import CreateNodeDialog from subindextable import IECTypeConversion, SizeConversion -import config_utils -from SlaveEditor import SlaveEditor, MasterViewer -from NetworkEditor import NetworkEditor +from canfestival import config_utils +from canfestival.SlaveEditor import SlaveEditor, MasterViewer +from canfestival.NetworkEditor import NetworkEditor AddCatalog(os.path.join(CanFestivalPath, "objdictgen", "locale")) diff -r 70c1cc354a8f -r 47a3f39bead0 controls/DebugVariablePanel/DebugVariableGraphicViewer.py --- a/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Mon Oct 09 16:04:39 2017 +0300 +++ b/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import from types import TupleType from time import time as gettime from distutils.version import LooseVersion @@ -36,8 +38,8 @@ from mpl_toolkits.mplot3d import Axes3D from editors.DebugViewer import REFRESH_PERIOD -from DebugVariableViewer import * -from GraphButton import GraphButton +from controls.DebugVariablePanel.DebugVariableViewer import * +from controls.DebugVariablePanel.GraphButton import GraphButton if LooseVersion(matplotlib.__version__) >= LooseVersion("1.5.0"): diff -r 70c1cc354a8f -r 47a3f39bead0 controls/DebugVariablePanel/DebugVariablePanel.py --- a/controls/DebugVariablePanel/DebugVariablePanel.py Mon Oct 09 16:04:39 2017 +0300 +++ b/controls/DebugVariablePanel/DebugVariablePanel.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import from types import TupleType import numpy @@ -37,9 +39,9 @@ from editors.DebugViewer import DebugViewer from util.BitmapLibrary import GetBitmap -from DebugVariableItem import DebugVariableItem -from DebugVariableTextViewer import DebugVariableTextViewer -from DebugVariableGraphicViewer import * +from controls.DebugVariablePanel.DebugVariableItem import DebugVariableItem +from controls.DebugVariablePanel.DebugVariableTextViewer import DebugVariableTextViewer +from controls.DebugVariablePanel.DebugVariableGraphicViewer import * MILLISECOND = 1000000 # Number of nanosecond in a millisecond diff -r 70c1cc354a8f -r 47a3f39bead0 controls/DebugVariablePanel/DebugVariableTextViewer.py --- a/controls/DebugVariablePanel/DebugVariableTextViewer.py Mon Oct 09 16:04:39 2017 +0300 +++ b/controls/DebugVariablePanel/DebugVariableTextViewer.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,12 +22,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import from types import TupleType import wx -from DebugVariableViewer import DebugVariableViewer -from GraphButton import GraphButton +from controls.DebugVariablePanel.DebugVariableViewer import DebugVariableViewer +from controls.DebugVariablePanel.GraphButton import GraphButton # ------------------------------------------------------------------------------- # Debug Variable Text Viewer Drop Target diff -r 70c1cc354a8f -r 47a3f39bead0 controls/DebugVariablePanel/__init__.py --- a/controls/DebugVariablePanel/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/controls/DebugVariablePanel/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,5 +22,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -from DebugVariablePanel import DebugVariablePanel +from __future__ import absolute_import +from controls.DebugVariablePanel.DebugVariablePanel import DebugVariablePanel diff -r 70c1cc354a8f -r 47a3f39bead0 controls/VariablePanel.py --- a/controls/VariablePanel.py Mon Oct 09 16:04:39 2017 +0300 +++ b/controls/VariablePanel.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import re from types import TupleType, StringType, UnicodeType @@ -32,9 +34,9 @@ from plcopen.structures import LOCATIONDATATYPES, TestIdentifier, IEC_KEYWORDS, DefaultType from graphics.GraphicCommons import REFRESH_HIGHLIGHT_PERIOD, ERROR_HIGHLIGHT from dialogs.ArrayTypeDialog import ArrayTypeDialog -from CustomGrid import CustomGrid -from CustomTable import CustomTable -from LocationCellEditor import LocationCellEditor +from controls.CustomGrid import CustomGrid +from controls.CustomTable import CustomTable +from controls.LocationCellEditor import LocationCellEditor from util.BitmapLibrary import GetBitmap from util.TranslationCatalogs import NoTranslate from PLCControler import _VariableInfos diff -r 70c1cc354a8f -r 47a3f39bead0 controls/__init__.py --- a/controls/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/controls/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -24,21 +24,23 @@ # Package initialization -from CustomEditableListBox import CustomEditableListBox -from CustomGrid import CustomGrid -from CustomTable import CustomTable -from CustomTree import CustomTree -from CustomIntCtrl import CustomIntCtrl -from DebugVariablePanel import DebugVariablePanel -from DurationCellEditor import DurationCellEditor -from LibraryPanel import LibraryPanel -from LocationCellEditor import LocationCellEditor -from PouInstanceVariablesPanel import PouInstanceVariablesPanel -from ProjectPropertiesPanel import ProjectPropertiesPanel -from VariablePanel import VariablePanel -from SearchResultPanel import SearchResultPanel -from TextCtrlAutoComplete import TextCtrlAutoComplete -from FolderTree import FolderTree -from LogViewer import LogViewer -from CustomStyledTextCtrl import CustomStyledTextCtrl -from CustomToolTip import CustomToolTip +from __future__ import absolute_import + +from controls.CustomEditableListBox import CustomEditableListBox +from controls.CustomGrid import CustomGrid +from controls.CustomTable import CustomTable +from controls.CustomTree import CustomTree +from controls.CustomIntCtrl import CustomIntCtrl +from controls.DebugVariablePanel import DebugVariablePanel +from controls.DurationCellEditor import DurationCellEditor +from controls.LibraryPanel import LibraryPanel +from controls.LocationCellEditor import LocationCellEditor +from controls.PouInstanceVariablesPanel import PouInstanceVariablesPanel +from controls.ProjectPropertiesPanel import ProjectPropertiesPanel +from controls.VariablePanel import VariablePanel +from controls.SearchResultPanel import SearchResultPanel +from controls.TextCtrlAutoComplete import TextCtrlAutoComplete +from controls.FolderTree import FolderTree +from controls.LogViewer import LogViewer +from controls.CustomStyledTextCtrl import CustomStyledTextCtrl +from controls.CustomToolTip import CustomToolTip diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/ConnectionDialog.py --- a/dialogs/ConnectionDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/ConnectionDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,11 +23,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import wx from graphics.GraphicCommons import CONNECTOR, CONTINUATION from graphics.FBD_Objects import FBD_Connector -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Set Connection Parameters Dialog diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/FBDBlockDialog.py --- a/dialogs/FBDBlockDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/FBDBlockDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,13 +23,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import re import wx from graphics.FBD_Objects import FBD_Block from controls.LibraryPanel import LibraryPanel -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Helpers diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/FBDVariableDialog.py --- a/dialogs/FBDVariableDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/FBDVariableDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,11 +23,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from __future__ import absolute_import import wx from graphics.GraphicCommons import INPUT, INOUT, OUTPUT from graphics.FBD_Objects import FBD_Variable -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Helpers diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/LDElementDialog.py --- a/dialogs/LDElementDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/LDElementDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,13 +23,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import wx from graphics.GraphicCommons import CONTACT_NORMAL, CONTACT_REVERSE, \ CONTACT_RISING, CONTACT_FALLING, COIL_NORMAL, COIL_REVERSE, COIL_SET, \ COIL_RESET, COIL_RISING, COIL_FALLING from graphics.LD_Objects import LD_Contact, LD_Coil -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Set Ladder Element Parmeters Dialog diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/LDPowerRailDialog.py --- a/dialogs/LDPowerRailDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/LDPowerRailDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,11 +23,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import wx from graphics.GraphicCommons import LEFTRAIL, RIGHTRAIL from graphics.LD_Objects import LD_PowerRail -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Set Ladder Power Rail Parameters Dialog diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/SFCDivergenceDialog.py --- a/dialogs/SFCDivergenceDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/SFCDivergenceDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,12 +23,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from __future__ import absolute_import import wx from graphics.GraphicCommons import SELECTION_DIVERGENCE, \ SELECTION_CONVERGENCE, SIMULTANEOUS_DIVERGENCE, SIMULTANEOUS_CONVERGENCE from graphics.SFC_Objects import SFC_Divergence -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Create New Divergence Dialog diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/SFCStepDialog.py --- a/dialogs/SFCStepDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/SFCStepDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,10 +23,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import wx from graphics.SFC_Objects import SFC_Step -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Set SFC Step Parameters Dialog diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/SFCTransitionDialog.py --- a/dialogs/SFCTransitionDialog.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/SFCTransitionDialog.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,10 +23,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from __future__ import absolute_import import wx from graphics.SFC_Objects import SFC_Transition -from BlockPreviewDialog import BlockPreviewDialog +from dialogs.BlockPreviewDialog import BlockPreviewDialog # ------------------------------------------------------------------------------- # Set Transition Parameters Dialog diff -r 70c1cc354a8f -r 47a3f39bead0 dialogs/__init__.py --- a/dialogs/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/dialogs/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -25,25 +25,27 @@ # Package initialization -from ConnectionDialog import ConnectionDialog -from ActionBlockDialog import ActionBlockDialog -from FBDBlockDialog import FBDBlockDialog -from FBDVariableDialog import FBDVariableDialog -from LDElementDialog import LDElementDialog -from LDPowerRailDialog import LDPowerRailDialog -from SFCStepDialog import SFCStepDialog -from SFCStepNameDialog import SFCStepNameDialog -from SFCTransitionDialog import SFCTransitionDialog -from SFCDivergenceDialog import SFCDivergenceDialog -from ForceVariableDialog import ForceVariableDialog -from ArrayTypeDialog import ArrayTypeDialog -from DurationEditorDialog import DurationEditorDialog -from SearchInProjectDialog import SearchInProjectDialog -from BrowseLocationsDialog import BrowseLocationsDialog -from ProjectDialog import ProjectDialog -from PouDialog import PouDialog -from PouTransitionDialog import PouTransitionDialog -from PouActionDialog import PouActionDialog -from FindInPouDialog import FindInPouDialog -from BrowseValuesLibraryDialog import BrowseValuesLibraryDialog -from DiscoveryDialog import DiscoveryDialog +from __future__ import absolute_import + +from dialogs.ConnectionDialog import ConnectionDialog +from dialogs.ActionBlockDialog import ActionBlockDialog +from dialogs.FBDBlockDialog import FBDBlockDialog +from dialogs.FBDVariableDialog import FBDVariableDialog +from dialogs.LDElementDialog import LDElementDialog +from dialogs.LDPowerRailDialog import LDPowerRailDialog +from dialogs.SFCStepDialog import SFCStepDialog +from dialogs.SFCStepNameDialog import SFCStepNameDialog +from dialogs.SFCTransitionDialog import SFCTransitionDialog +from dialogs.SFCDivergenceDialog import SFCDivergenceDialog +from dialogs.ForceVariableDialog import ForceVariableDialog +from dialogs.ArrayTypeDialog import ArrayTypeDialog +from dialogs.DurationEditorDialog import DurationEditorDialog +from dialogs.SearchInProjectDialog import SearchInProjectDialog +from dialogs.BrowseLocationsDialog import BrowseLocationsDialog +from dialogs.ProjectDialog import ProjectDialog +from dialogs.PouDialog import PouDialog +from dialogs.PouTransitionDialog import PouTransitionDialog +from dialogs.PouActionDialog import PouActionDialog +from dialogs.FindInPouDialog import FindInPouDialog +from dialogs.BrowseValuesLibraryDialog import BrowseValuesLibraryDialog +from dialogs.DiscoveryDialog import DiscoveryDialog diff -r 70c1cc354a8f -r 47a3f39bead0 docutil/__init__.py --- a/docutil/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/docutil/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from dochtml import * -from docpdf import * -from docsvg import * + +from __future__ import absolute_import +from docutil.dochtml import * +from docutil.docpdf import * +from docutil.docsvg import * diff -r 70c1cc354a8f -r 47a3f39bead0 editors/ConfTreeNodeEditor.py --- a/editors/ConfTreeNodeEditor.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/ConfTreeNodeEditor.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,11 +23,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import types import wx -from EditorPanel import EditorPanel +from editors.EditorPanel import EditorPanel from IDEFrame import TITLE, FILEMENU, PROJECTTREE, PAGETITLES diff -r 70c1cc354a8f -r 47a3f39bead0 editors/DataTypeEditor.py --- a/editors/DataTypeEditor.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/DataTypeEditor.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,6 +23,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import re from types import TupleType @@ -33,7 +35,7 @@ from graphics.GraphicCommons import REFRESH_HIGHLIGHT_PERIOD from controls import CustomEditableListBox, CustomGrid, CustomTable, CustomIntCtrl from dialogs import ArrayTypeDialog -from EditorPanel import EditorPanel +from editors.EditorPanel import EditorPanel from util.BitmapLibrary import GetBitmap from util.TranslationCatalogs import NoTranslate diff -r 70c1cc354a8f -r 47a3f39bead0 editors/FileManagementPanel.py --- a/editors/FileManagementPanel.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/FileManagementPanel.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,13 +22,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import os import shutil import wx import wx.lib.buttons -from EditorPanel import EditorPanel +from editors.EditorPanel import EditorPanel from util.BitmapLibrary import GetBitmap from controls import FolderTree diff -r 70c1cc354a8f -r 47a3f39bead0 editors/LDViewer.py --- a/editors/LDViewer.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/LDViewer.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,11 +22,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import from types import * import wx -from Viewer import * +from editors.Viewer import * def ExtractNextBlocks(block, block_list): diff -r 70c1cc354a8f -r 47a3f39bead0 editors/ProjectNodeEditor.py --- a/editors/ProjectNodeEditor.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/ProjectNodeEditor.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,10 +22,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import wx from controls import ProjectPropertiesPanel, VariablePanel -from ConfTreeNodeEditor import ConfTreeNodeEditor +from editors.ConfTreeNodeEditor import ConfTreeNodeEditor class ProjectNodeEditor(ConfTreeNodeEditor): diff -r 70c1cc354a8f -r 47a3f39bead0 editors/ResourceEditor.py --- a/editors/ResourceEditor.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/ResourceEditor.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import wx import wx.lib.buttons import wx.grid @@ -29,7 +31,7 @@ from graphics.GraphicCommons import REFRESH_HIGHLIGHT_PERIOD, ERROR_HIGHLIGHT from controls import CustomGrid, CustomTable, DurationCellEditor from dialogs.DurationEditorDialog import IEC_TIME_MODEL -from EditorPanel import EditorPanel +from editors.EditorPanel import EditorPanel from util.BitmapLibrary import GetBitmap from util.TranslationCatalogs import NoTranslate from plcopen.structures import TestIdentifier, IEC_KEYWORDS diff -r 70c1cc354a8f -r 47a3f39bead0 editors/SFCViewer.py --- a/editors/SFCViewer.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/SFCViewer.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,11 +22,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import from types import * import wx -from Viewer import * +from editors.Viewer import * from graphics.SFC_Objects import * from graphics.GraphicCommons import SELECTION_DIVERGENCE, \ SELECTION_CONVERGENCE, SIMULTANEOUS_DIVERGENCE, SIMULTANEOUS_CONVERGENCE, EAST, NORTH, WEST, SOUTH diff -r 70c1cc354a8f -r 47a3f39bead0 editors/TextViewer.py --- a/editors/TextViewer.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/TextViewer.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import re from types import * @@ -30,7 +32,7 @@ from graphics.GraphicCommons import ERROR_HIGHLIGHT, SEARCH_RESULT_HIGHLIGHT, REFRESH_HIGHLIGHT_PERIOD from plcopen.structures import ST_BLOCK_START_KEYWORDS, IEC_BLOCK_START_KEYWORDS, LOCATIONDATATYPES -from EditorPanel import EditorPanel +from editors.EditorPanel import EditorPanel from controls.CustomStyledTextCtrl import CustomStyledTextCtrl, faces, GetCursorPos # ------------------------------------------------------------------------------- diff -r 70c1cc354a8f -r 47a3f39bead0 editors/Viewer.py --- a/editors/Viewer.py Mon Oct 09 16:04:39 2017 +0300 +++ b/editors/Viewer.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import math from time import time as gettime from types import TupleType @@ -35,7 +37,7 @@ from graphics import * from dialogs import * from editors.DebugViewer import DebugViewer, REFRESH_PERIOD -from EditorPanel import EditorPanel +from editors.EditorPanel import EditorPanel SCROLLBAR_UNIT = 10 WINDOW_BORDER = 10 diff -r 70c1cc354a8f -r 47a3f39bead0 graphics/__init__.py --- a/graphics/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/graphics/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -24,9 +24,11 @@ # Package initialisation -from GraphicCommons import * -from FBD_Objects import * -from LD_Objects import * -from SFC_Objects import * -from RubberBand import RubberBand -from DebugDataConsumer import DebugDataConsumer +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 diff -r 70c1cc354a8f -r 47a3f39bead0 plcopen/__init__.py --- a/plcopen/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/plcopen/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -26,5 +26,7 @@ # plcopen module dynamically creates its classes -from plcopen import PLCOpenParser, LoadProject, SaveProject, LoadPou, \ +from __future__ import absolute_import +from plcopen.plcopen import \ + PLCOpenParser, LoadProject, SaveProject, LoadPou, \ LoadPouInstances, VarOrder, QualifierList, rect diff -r 70c1cc354a8f -r 47a3f39bead0 plcopen/structures.py --- a/plcopen/structures.py Mon Oct 09 16:04:39 2017 +0300 +++ b/plcopen/structures.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,12 +22,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import string import re from collections import OrderedDict -from plcopen import LoadProject -from definitions import * +from plcopen.plcopen import LoadProject +from plcopen.definitions import * TypeHierarchy = dict(TypeHierarchy_list) diff -r 70c1cc354a8f -r 47a3f39bead0 py_ext/PythonFileCTNMixin.py --- a/py_ext/PythonFileCTNMixin.py Mon Oct 09 16:04:39 2017 +0300 +++ b/py_ext/PythonFileCTNMixin.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,6 +23,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import os import re import util.paths as paths @@ -30,7 +32,7 @@ from xmlclass import GenerateParserFromXSD from CodeFileTreeNode import CodeFile -from PythonEditor import PythonEditor +from py_ext.PythonEditor import PythonEditor class PythonFileCTNMixin(CodeFile): diff -r 70c1cc354a8f -r 47a3f39bead0 py_ext/__init__.py --- a/py_ext/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/py_ext/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,6 +22,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from py_ext import * -from PythonEditor import PythonEditor -from PythonFileCTNMixin import PythonFileCTNMixin +from __future__ import absolute_import +from py_ext.py_ext import * +from py_ext.PythonEditor import PythonEditor +from py_ext.PythonFileCTNMixin import PythonFileCTNMixin diff -r 70c1cc354a8f -r 47a3f39bead0 py_ext/py_ext.py --- a/py_ext/py_ext.py Mon Oct 09 16:04:39 2017 +0300 +++ b/py_ext/py_ext.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,9 +23,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import os from POULibrary import POULibrary -from PythonFileCTNMixin import PythonFileCTNMixin +from py_ext.PythonFileCTNMixin import PythonFileCTNMixin import util.paths as paths diff -r 70c1cc354a8f -r 47a3f39bead0 runtime/__init__.py --- a/runtime/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/runtime/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -21,8 +21,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - +from __future__ import absolute_import import os -from PLCObject import PLCObject, PLCprint -import ServicePublisher +from runtime.PLCObject import PLCObject, PLCprint +import runtime.ServicePublisher diff -r 70c1cc354a8f -r 47a3f39bead0 svgui/__init__.py --- a/svgui/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/svgui/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,4 +22,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from svgui import * +from __future__ import absolute_import +from svgui.svgui import * diff -r 70c1cc354a8f -r 47a3f39bead0 svgui/pyjs/__init__.py --- a/svgui/pyjs/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/svgui/pyjs/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -1,1 +1,2 @@ -from pyjs import * +from __future__ import absolute_import +from svgui.pyjs.pyjs import * diff -r 70c1cc354a8f -r 47a3f39bead0 svgui/pyjs/build.py --- a/svgui/pyjs/build.py Mon Oct 09 16:04:39 2017 +0300 +++ b/svgui/pyjs/build.py Mon Oct 09 18:13:26 2017 +0300 @@ -1,5 +1,7 @@ #!/usr/bin/env python + +from __future__ import absolute_import from __future__ import print_function import sys import shutil @@ -10,7 +12,7 @@ from optparse import OptionParser from cStringIO import StringIO -import pyjs +from svgui.pyjs import pyjs usage = """ diff -r 70c1cc354a8f -r 47a3f39bead0 svgui/svgui.py --- a/svgui/svgui.py Mon Oct 09 16:04:39 2017 +0300 +++ b/svgui/svgui.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,11 +23,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +from __future__ import absolute_import import os import shutil import wx -from pyjs import translate +from svgui.pyjs import translate import util.paths as paths from POULibrary import POULibrary diff -r 70c1cc354a8f -r 47a3f39bead0 tests/tools/check_source.sh --- a/tests/tools/check_source.sh Mon Oct 09 16:04:39 2017 +0300 +++ b/tests/tools/check_source.sh Mon Oct 09 18:13:26 2017 +0300 @@ -222,8 +222,7 @@ enable=$enable,W0611 # (unused-import) Unused import X enable=$enable,C1001 # (old-style-class) Old-style class defined. Problem with PyJS enable=$enable,W0102 # (dangerous-default-value) Dangerous default value {} as argument - - # enable=$enable,W0403 # relative import + enable=$enable,W0403 # (relative-import) Relative import 'Y', should be 'X.Y' # enable= options= diff -r 70c1cc354a8f -r 47a3f39bead0 util/misc.py --- a/util/misc.py Mon Oct 09 16:04:39 2017 +0300 +++ b/util/misc.py Mon Oct 09 18:13:26 2017 +0300 @@ -26,8 +26,13 @@ Misc definitions """ + +from __future__ import absolute_import import os +from util.BitmapLibrary import AddBitmapFolder +from util.TranslationCatalogs import AddCatalog + def CheckPathPerm(path): """ Helper func to check path write permission """ @@ -53,9 +58,6 @@ def InstallLocalRessources(CWD): - from BitmapLibrary import AddBitmapFolder - from TranslationCatalogs import AddCatalog - # Beremiz bitmaps AddBitmapFolder(os.path.join(CWD, "images")) diff -r 70c1cc354a8f -r 47a3f39bead0 wxglade_hmi/__init__.py --- a/wxglade_hmi/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/wxglade_hmi/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -22,4 +22,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from wxglade_hmi import * +from __future__ import absolute_import +from wxglade_hmi.wxglade_hmi import * diff -r 70c1cc354a8f -r 47a3f39bead0 xmlclass/__init__.py --- a/xmlclass/__init__.py Mon Oct 09 16:04:39 2017 +0300 +++ b/xmlclass/__init__.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,6 +23,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Package initialisation - -from xmlclass import ClassFactory, GenerateParser, DefaultElementClass, GetAttributeValue, time_model, CreateNode, NodeSetAttr, NodeRenameAttr -from xsdschema import XSDClassFactory, GenerateParserFromXSD, GenerateParserFromXSDstring +from __future__ import absolute_import +from xmlclass.xmlclass import \ + ClassFactory, \ + GenerateParser, \ + DefaultElementClass, \ + GetAttributeValue, \ + time_model, \ + CreateNode, \ + NodeSetAttr, \ + NodeRenameAttr +from xmlclass.xsdschema import XSDClassFactory, GenerateParserFromXSD, GenerateParserFromXSDstring diff -r 70c1cc354a8f -r 47a3f39bead0 xmlclass/xsdschema.py --- a/xmlclass/xsdschema.py Mon Oct 09 16:04:39 2017 +0300 +++ b/xmlclass/xsdschema.py Mon Oct 09 18:13:26 2017 +0300 @@ -23,6 +23,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from __future__ import absolute_import from __future__ import print_function import os import re @@ -30,7 +31,7 @@ from xml.dom import minidom from types import * -from xmlclass import * +from xmlclass.xmlclass import * def GenerateDictFacets(facets):