From ed201c95131297d736d2dce1845bf85d6a70de9a Mon Sep 17 00:00:00 2001 From: looooo Date: Tue, 10 Apr 2018 22:22:51 +0200 Subject: [PATCH] py3: port ship to py3 imports --- src/Mod/Ship/shipAreasCurve/Preview.py | 2 +- src/Mod/Ship/shipAreasCurve/TaskPanel.py | 4 ++-- src/Mod/Ship/shipAreasCurve/__init__.py | 2 +- src/Mod/Ship/shipCapacityCurve/TaskPanel.py | 6 +++--- src/Mod/Ship/shipCapacityCurve/__init__.py | 2 +- src/Mod/Ship/shipCreateLoadCondition/Tools.py | 2 +- src/Mod/Ship/shipCreateLoadCondition/__init__.py | 2 +- src/Mod/Ship/shipCreateShip/Preview.py | 2 +- src/Mod/Ship/shipCreateShip/TaskPanel.py | 8 ++++---- src/Mod/Ship/shipCreateShip/__init__.py | 2 +- src/Mod/Ship/shipCreateTank/TaskPanel.py | 4 ++-- src/Mod/Ship/shipCreateTank/Tools.py | 2 +- src/Mod/Ship/shipCreateTank/__init__.py | 2 +- src/Mod/Ship/shipCreateWeight/TaskPanel.py | 4 ++-- src/Mod/Ship/shipCreateWeight/__init__.py | 2 +- src/Mod/Ship/shipGZ/TaskPanel.py | 6 +++--- src/Mod/Ship/shipGZ/Tools.py | 2 +- src/Mod/Ship/shipGZ/__init__.py | 2 +- src/Mod/Ship/shipHydrostatics/TaskPanel.py | 8 ++++---- src/Mod/Ship/shipHydrostatics/Tools.py | 2 +- src/Mod/Ship/shipHydrostatics/__init__.py | 2 +- src/Mod/Ship/shipLoadExample/__init__.py | 2 +- src/Mod/Ship/shipOutlineDraw/Preview.py | 2 +- src/Mod/Ship/shipOutlineDraw/TaskPanel.py | 4 ++-- src/Mod/Ship/shipOutlineDraw/__init__.py | 2 +- src/Mod/Ship/shipUtils/Units.py | 2 +- 26 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Mod/Ship/shipAreasCurve/Preview.py b/src/Mod/Ship/shipAreasCurve/Preview.py index 44fbd6cf95..58781d7897 100644 --- a/src/Mod/Ship/shipAreasCurve/Preview.py +++ b/src/Mod/Ship/shipAreasCurve/Preview.py @@ -25,7 +25,7 @@ import FreeCAD import FreeCADGui from FreeCAD import Base import Part -import Units +from FreeCAD import Units from shipUtils import Paths diff --git a/src/Mod/Ship/shipAreasCurve/TaskPanel.py b/src/Mod/Ship/shipAreasCurve/TaskPanel.py index 7b814d2503..923e1ee282 100644 --- a/src/Mod/Ship/shipAreasCurve/TaskPanel.py +++ b/src/Mod/Ship/shipAreasCurve/TaskPanel.py @@ -26,8 +26,8 @@ import FreeCAD as App import FreeCADGui as Gui import Units from PySide import QtGui, QtCore -import Preview -import PlotAux +from . import Preview +from . import PlotAux import Instance from shipUtils import Paths import shipUtils.Units as USys diff --git a/src/Mod/Ship/shipAreasCurve/__init__.py b/src/Mod/Ship/shipAreasCurve/__init__.py index c8f2b6ebaf..d17a2361f6 100644 --- a/src/Mod/Ship/shipAreasCurve/__init__.py +++ b/src/Mod/Ship/shipAreasCurve/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipCapacityCurve/TaskPanel.py b/src/Mod/Ship/shipCapacityCurve/TaskPanel.py index 5ce111a0e2..8f05ab4652 100644 --- a/src/Mod/Ship/shipCapacityCurve/TaskPanel.py +++ b/src/Mod/Ship/shipCapacityCurve/TaskPanel.py @@ -24,10 +24,10 @@ import math import FreeCAD as App import FreeCADGui as Gui -import Units +from FreeCAD import Units from PySide import QtGui, QtCore -import Tools -import PlotAux +from . import Tools +from . import PlotAux import TankInstance as Instance from shipUtils import Paths import shipUtils.Units as USys diff --git a/src/Mod/Ship/shipCapacityCurve/__init__.py b/src/Mod/Ship/shipCapacityCurve/__init__.py index c8f2b6ebaf..d17a2361f6 100644 --- a/src/Mod/Ship/shipCapacityCurve/__init__.py +++ b/src/Mod/Ship/shipCapacityCurve/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipCreateLoadCondition/Tools.py b/src/Mod/Ship/shipCreateLoadCondition/Tools.py index adda788065..c060e90ea4 100644 --- a/src/Mod/Ship/shipCreateLoadCondition/Tools.py +++ b/src/Mod/Ship/shipCreateLoadCondition/Tools.py @@ -24,7 +24,7 @@ import FreeCAD as App import Spreadsheet -import Units +from FreeCAD import Units READ_ONLY_FOREGROUND = (0.5, 0.5, 0.5) diff --git a/src/Mod/Ship/shipCreateLoadCondition/__init__.py b/src/Mod/Ship/shipCreateLoadCondition/__init__.py index 3b36c535d7..b59d0321d6 100644 --- a/src/Mod/Ship/shipCreateLoadCondition/__init__.py +++ b/src/Mod/Ship/shipCreateLoadCondition/__init__.py @@ -24,7 +24,7 @@ import FreeCAD as App import FreeCADGui as Gui from PySide import QtGui -import Tools +from . import Tools READ_ONLY_FOREGROUND = (0.5, 0.5, 0.5) diff --git a/src/Mod/Ship/shipCreateShip/Preview.py b/src/Mod/Ship/shipCreateShip/Preview.py index c13e903292..8e9e6d946f 100644 --- a/src/Mod/Ship/shipCreateShip/Preview.py +++ b/src/Mod/Ship/shipCreateShip/Preview.py @@ -25,7 +25,7 @@ import FreeCAD import FreeCADGui from FreeCAD import Base import Part -import Units +from FreeCAD import Units from PySide import QtGui, QtCore from shipUtils import Paths diff --git a/src/Mod/Ship/shipCreateShip/TaskPanel.py b/src/Mod/Ship/shipCreateShip/TaskPanel.py index d07ebbd5d0..a6be565255 100644 --- a/src/Mod/Ship/shipCreateShip/TaskPanel.py +++ b/src/Mod/Ship/shipCreateShip/TaskPanel.py @@ -23,11 +23,11 @@ import FreeCAD as App import FreeCADGui as Gui -import Units +from FreeCAD import Units from PySide import QtGui, QtCore -import Preview -import Tools -import Instance +from . import Preview +from . import Tools +import Instance # from ship from shipUtils import Paths import shipUtils.Units as USys import shipUtils.Locale as Locale diff --git a/src/Mod/Ship/shipCreateShip/__init__.py b/src/Mod/Ship/shipCreateShip/__init__.py index eae1886035..bef0bca9cb 100644 --- a/src/Mod/Ship/shipCreateShip/__init__.py +++ b/src/Mod/Ship/shipCreateShip/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipCreateTank/TaskPanel.py b/src/Mod/Ship/shipCreateTank/TaskPanel.py index 096914f6dd..b2e95fbb25 100644 --- a/src/Mod/Ship/shipCreateTank/TaskPanel.py +++ b/src/Mod/Ship/shipCreateTank/TaskPanel.py @@ -23,9 +23,9 @@ import FreeCAD as App import FreeCADGui as Gui -import Units +from FreeCAD import Units from PySide import QtGui, QtCore -import Tools +from . import Tools import TankInstance as Instance from shipUtils import Paths import shipUtils.Units as USys diff --git a/src/Mod/Ship/shipCreateTank/Tools.py b/src/Mod/Ship/shipCreateTank/Tools.py index bb52c98365..2b91e84c1a 100644 --- a/src/Mod/Ship/shipCreateTank/Tools.py +++ b/src/Mod/Ship/shipCreateTank/Tools.py @@ -23,7 +23,7 @@ import FreeCAD as App -import Units +from FreeCAD import Units import TankInstance as Instance diff --git a/src/Mod/Ship/shipCreateTank/__init__.py b/src/Mod/Ship/shipCreateTank/__init__.py index eae1886035..bef0bca9cb 100644 --- a/src/Mod/Ship/shipCreateTank/__init__.py +++ b/src/Mod/Ship/shipCreateTank/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipCreateWeight/TaskPanel.py b/src/Mod/Ship/shipCreateWeight/TaskPanel.py index 8329e47efe..09e96b47cc 100644 --- a/src/Mod/Ship/shipCreateWeight/TaskPanel.py +++ b/src/Mod/Ship/shipCreateWeight/TaskPanel.py @@ -23,9 +23,9 @@ import FreeCAD as App import FreeCADGui as Gui -import Units +from FreeCAD import Units from PySide import QtGui, QtCore -import Tools +from . import Tools import WeightInstance as Instance from shipUtils import Paths import shipUtils.Units as USys diff --git a/src/Mod/Ship/shipCreateWeight/__init__.py b/src/Mod/Ship/shipCreateWeight/__init__.py index eae1886035..bef0bca9cb 100644 --- a/src/Mod/Ship/shipCreateWeight/__init__.py +++ b/src/Mod/Ship/shipCreateWeight/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipGZ/TaskPanel.py b/src/Mod/Ship/shipGZ/TaskPanel.py index 28c93bb80f..fea0ebd46e 100644 --- a/src/Mod/Ship/shipGZ/TaskPanel.py +++ b/src/Mod/Ship/shipGZ/TaskPanel.py @@ -24,10 +24,10 @@ import math import FreeCAD as App import FreeCADGui as Gui -import Units +from FreeCAD import Units from PySide import QtGui, QtCore -import PlotAux -import Tools +from . import PlotAux +from . import Tools from shipUtils import Paths import shipUtils.Units as USys import shipUtils.Locale as Locale diff --git a/src/Mod/Ship/shipGZ/Tools.py b/src/Mod/Ship/shipGZ/Tools.py index 4062300555..1ecf6e5bf4 100644 --- a/src/Mod/Ship/shipGZ/Tools.py +++ b/src/Mod/Ship/shipGZ/Tools.py @@ -26,7 +26,7 @@ import FreeCAD as App import FreeCADGui as Gui from FreeCAD import Vector, Matrix, Placement import Part -import Units +from FreeCAD import Units import Instance as ShipInstance import WeightInstance import TankInstance diff --git a/src/Mod/Ship/shipGZ/__init__.py b/src/Mod/Ship/shipGZ/__init__.py index c8f2b6ebaf..d17a2361f6 100644 --- a/src/Mod/Ship/shipGZ/__init__.py +++ b/src/Mod/Ship/shipGZ/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipHydrostatics/TaskPanel.py b/src/Mod/Ship/shipHydrostatics/TaskPanel.py index 124b623930..0d727e7994 100644 --- a/src/Mod/Ship/shipHydrostatics/TaskPanel.py +++ b/src/Mod/Ship/shipHydrostatics/TaskPanel.py @@ -27,14 +27,14 @@ import FreeCAD as App import FreeCADGui as Gui from FreeCAD import Base, Vector import Part -import Units +from FreeCAD import Units from PySide import QtGui, QtCore -import PlotAux -import Instance +from . import PlotAux +from . import Instance from shipUtils import Paths import shipUtils.Units as USys import shipUtils.Locale as Locale -import Tools +from . import Tools class TaskPanel: diff --git a/src/Mod/Ship/shipHydrostatics/Tools.py b/src/Mod/Ship/shipHydrostatics/Tools.py index 1eb898860b..4e46543214 100644 --- a/src/Mod/Ship/shipHydrostatics/Tools.py +++ b/src/Mod/Ship/shipHydrostatics/Tools.py @@ -25,7 +25,7 @@ import math import random from FreeCAD import Vector, Rotation, Matrix, Placement import Part -import Units +from FreeCAD import Units import FreeCAD as App import FreeCADGui as Gui from PySide import QtGui, QtCore diff --git a/src/Mod/Ship/shipHydrostatics/__init__.py b/src/Mod/Ship/shipHydrostatics/__init__.py index c8f2b6ebaf..d17a2361f6 100644 --- a/src/Mod/Ship/shipHydrostatics/__init__.py +++ b/src/Mod/Ship/shipHydrostatics/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipLoadExample/__init__.py b/src/Mod/Ship/shipLoadExample/__init__.py index 3ae4067f59..e97ab78366 100644 --- a/src/Mod/Ship/shipLoadExample/__init__.py +++ b/src/Mod/Ship/shipLoadExample/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipOutlineDraw/Preview.py b/src/Mod/Ship/shipOutlineDraw/Preview.py index 8beb69167d..ed12058266 100644 --- a/src/Mod/Ship/shipOutlineDraw/Preview.py +++ b/src/Mod/Ship/shipOutlineDraw/Preview.py @@ -26,7 +26,7 @@ import FreeCAD import FreeCADGui from FreeCAD import Base, Vector import Part -import Units +from FreeCAD import Units from shipUtils import Paths diff --git a/src/Mod/Ship/shipOutlineDraw/TaskPanel.py b/src/Mod/Ship/shipOutlineDraw/TaskPanel.py index a407cee092..8a17fe214c 100644 --- a/src/Mod/Ship/shipOutlineDraw/TaskPanel.py +++ b/src/Mod/Ship/shipOutlineDraw/TaskPanel.py @@ -24,10 +24,10 @@ import FreeCAD as App from FreeCAD import Base, Vector import FreeCADGui as Gui -import Units +from FreeCAD import Units import Part from PySide import QtGui, QtCore -import Preview +from . import Preview import Instance from shipUtils import Paths import shipUtils.Locale as Locale diff --git a/src/Mod/Ship/shipOutlineDraw/__init__.py b/src/Mod/Ship/shipOutlineDraw/__init__.py index c8f2b6ebaf..d17a2361f6 100644 --- a/src/Mod/Ship/shipOutlineDraw/__init__.py +++ b/src/Mod/Ship/shipOutlineDraw/__init__.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import TaskPanel +from . import TaskPanel def load(): diff --git a/src/Mod/Ship/shipUtils/Units.py b/src/Mod/Ship/shipUtils/Units.py index de31462e91..a2871023e6 100644 --- a/src/Mod/Ship/shipUtils/Units.py +++ b/src/Mod/Ship/shipUtils/Units.py @@ -22,7 +22,7 @@ #*************************************************************************** import FreeCAD -import Units +from FreeCAD import Units # Systems of length units