From b8be30bc35606536914d0c9b1561c1597d45ed95 Mon Sep 17 00:00:00 2001 From: idziubenko Date: Tue, 3 Aug 2021 10:30:46 +0300 Subject: [PATCH] imports changed to relative --- pym/consolegui/application/Box.py | 4 +--- pym/consolegui/application/CertificateClass.py | 3 +-- pym/consolegui/application/ConnectionTabs.py | 6 ++---- pym/consolegui/application/ControlButton.py | 4 +--- pym/consolegui/application/DisplayMethod.py | 2 +- pym/consolegui/application/LeftMenu.py | 2 +- pym/consolegui/application/MainClass.py | 2 +- pym/consolegui/application/MainFrameResult.py | 2 +- pym/consolegui/application/SelectTable.py | 2 +- pym/consolegui/application/TrayIcon.py | 2 +- pym/consolegui/application/View_Process.py | 2 +- pym/consolegui/application/client_class.py | 2 +- pym/consolegui/application/conf_connection.py | 3 +-- pym/consolegui/application/create_cert.py | 2 +- pym/consolegui/application/helpwidget.py | 2 +- pym/consolegui/application/mainframe.py | 2 +- pym/consolegui/application/mainmenu.py | 2 +- pym/consolegui/application/more.py | 2 +- pym/consolegui/application/pid_information.py | 2 +- pym/consolegui/application/session_function.py | 2 +- pym/consolegui/application/statusfield.py | 2 +- pym/consolegui/application/tools.py | 2 +- 22 files changed, 23 insertions(+), 31 deletions(-) diff --git a/pym/consolegui/application/Box.py b/pym/consolegui/application/Box.py index bebc009..328e184 100644 --- a/pym/consolegui/application/Box.py +++ b/pym/consolegui/application/Box.py @@ -14,9 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function -from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt import urllib.request as urllib2 from .DisplayMethod import DisplayMethod, StartWidget, ConnectLostLabel diff --git a/pym/consolegui/application/CertificateClass.py b/pym/consolegui/application/CertificateClass.py index 04c41fb..e4aba65 100644 --- a/pym/consolegui/application/CertificateClass.py +++ b/pym/consolegui/application/CertificateClass.py @@ -14,8 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt import urllib.request as urllib2 import OpenSSL, hashlib diff --git a/pym/consolegui/application/ConnectionTabs.py b/pym/consolegui/application/ConnectionTabs.py index c5897e3..6a9d220 100644 --- a/pym/consolegui/application/ConnectionTabs.py +++ b/pym/consolegui/application/ConnectionTabs.py @@ -14,13 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function -from __future__ import absolute_import import dbus import dbus.service import dbus.mainloop.glib -from calculate.consolegui import qt +from .. import qt import time, sys import calculate.contrib from suds import MethodNotFound @@ -35,7 +33,7 @@ from .more import get_sid, get_view_params, _print, get_icon, get_system_rgb, \ dpivalue from .MainClass import ApiClient -from calculate.consolegui.datavars import DataVarsGui +from ..datavars import DataVarsGui from .pid_information import client_pid_info #from calculate.lib.cl_lang import setLocalTranslate #setLocalTranslate('console_gui',sys.modules[__name__]) diff --git a/pym/consolegui/application/ControlButton.py b/pym/consolegui/application/ControlButton.py index 53cd451..e211a53 100644 --- a/pym/consolegui/application/ControlButton.py +++ b/pym/consolegui/application/ControlButton.py @@ -14,9 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function -from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .more import LabelWordWrap, _print, get_system_rgb, ParameterWindow, dpivalue DEBUG_LEVEL = 99999 diff --git a/pym/consolegui/application/DisplayMethod.py b/pym/consolegui/application/DisplayMethod.py index e1c4668..8e81a7c 100644 --- a/pym/consolegui/application/DisplayMethod.py +++ b/pym/consolegui/application/DisplayMethod.py @@ -15,7 +15,7 @@ # limitations under the License. from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .more import ButtonMenu, FlowLayout, get_sid, ClientServiceThread, \ get_view_params, show_msg, client_list_methods, get_system_rgb, \ diff --git a/pym/consolegui/application/LeftMenu.py b/pym/consolegui/application/LeftMenu.py index fae7c00..ec4d6a4 100644 --- a/pym/consolegui/application/LeftMenu.py +++ b/pym/consolegui/application/LeftMenu.py @@ -15,7 +15,7 @@ # limitations under the License. from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .more import ButtonMenu, icon_visible, LabelWordWrap, get_sid, show_msg, \ ClientServiceThread, show_question, get_view_params, _print, \ get_system_rgb, dpivalue diff --git a/pym/consolegui/application/MainClass.py b/pym/consolegui/application/MainClass.py index 487a9bd..363a6cf 100644 --- a/pym/consolegui/application/MainClass.py +++ b/pym/consolegui/application/MainClass.py @@ -16,7 +16,7 @@ from __future__ import absolute_import from .Box import MainWgt -from calculate.consolegui import qt +from .. import qt #from mainmenu import MainMenu import os diff --git a/pym/consolegui/application/MainFrameResult.py b/pym/consolegui/application/MainFrameResult.py index 4f79b8b..11e680a 100644 --- a/pym/consolegui/application/MainFrameResult.py +++ b/pym/consolegui/application/MainFrameResult.py @@ -16,7 +16,7 @@ from __future__ import print_function from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt DEBUG_LEVEL = 99999 diff --git a/pym/consolegui/application/SelectTable.py b/pym/consolegui/application/SelectTable.py index ae3900c..2a6c00e 100644 --- a/pym/consolegui/application/SelectTable.py +++ b/pym/consolegui/application/SelectTable.py @@ -15,7 +15,7 @@ # limitations under the License. from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .more import get_system_rgb, ParameterWindow diff --git a/pym/consolegui/application/TrayIcon.py b/pym/consolegui/application/TrayIcon.py index 274b8b7..e4a5e57 100644 --- a/pym/consolegui/application/TrayIcon.py +++ b/pym/consolegui/application/TrayIcon.py @@ -15,7 +15,7 @@ # limitations under the License. from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt import time import urllib.request as urllib2 # from calculate.core.client.function import create_obj diff --git a/pym/consolegui/application/View_Process.py b/pym/consolegui/application/View_Process.py index 385341d..5984830 100644 --- a/pym/consolegui/application/View_Process.py +++ b/pym/consolegui/application/View_Process.py @@ -15,7 +15,7 @@ # limitations under the License. # from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .pid_information import client_list_pid, client_pid_info from .more import LabelWordWrap, show_msg, get_sid, ClientServiceThread diff --git a/pym/consolegui/application/client_class.py b/pym/consolegui/application/client_class.py index a6d8ee6..7f3220e 100644 --- a/pym/consolegui/application/client_class.py +++ b/pym/consolegui/application/client_class.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from calculate.consolegui import qt +from .. import qt import urllib.request as u2 if hasattr(u2,"ssl"): u2.ssl._create_default_https_context = u2.ssl._create_unverified_context diff --git a/pym/consolegui/application/conf_connection.py b/pym/consolegui/application/conf_connection.py index 801c59a..44fe859 100644 --- a/pym/consolegui/application/conf_connection.py +++ b/pym/consolegui/application/conf_connection.py @@ -14,8 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt import calculate.contrib from suds import WebFault import logging, OpenSSL diff --git a/pym/consolegui/application/create_cert.py b/pym/consolegui/application/create_cert.py index 26b4278..2e84dce 100644 --- a/pym/consolegui/application/create_cert.py +++ b/pym/consolegui/application/create_cert.py @@ -16,7 +16,7 @@ from __future__ import absolute_import import socket -from calculate.consolegui import qt +from .. import qt from .more import LabelWordWrap, show_msg, get_icon diff --git a/pym/consolegui/application/helpwidget.py b/pym/consolegui/application/helpwidget.py index 9611b20..e8f0e3c 100644 --- a/pym/consolegui/application/helpwidget.py +++ b/pym/consolegui/application/helpwidget.py @@ -15,7 +15,7 @@ # limitations under the License. from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .more import LabelWordWrap, show_msg, get_icon import datetime from calculate.lib.datavars import DataVars diff --git a/pym/consolegui/application/mainframe.py b/pym/consolegui/application/mainframe.py index e72070f..f2647dd 100644 --- a/pym/consolegui/application/mainframe.py +++ b/pym/consolegui/application/mainframe.py @@ -16,7 +16,7 @@ # from __future__ import print_function # from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt # from calculate.core.client.function import create_obj, listToArrayArray, \ # listToArray from .utils import create_obj, listToArrayArray, listToArray diff --git a/pym/consolegui/application/mainmenu.py b/pym/consolegui/application/mainmenu.py index ae2e3db..6b8f9ee 100644 --- a/pym/consolegui/application/mainmenu.py +++ b/pym/consolegui/application/mainmenu.py @@ -16,7 +16,7 @@ from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt from .more import TopMenu, HelpMenu#, FlowLayout class MainMenu(qt.QWidget): diff --git a/pym/consolegui/application/more.py b/pym/consolegui/application/more.py index 32dbd99..cdb37e4 100644 --- a/pym/consolegui/application/more.py +++ b/pym/consolegui/application/more.py @@ -30,7 +30,7 @@ def debug(level, *args): print(s, end=' ') print() -from calculate.consolegui import qt +from .. import qt # from calculate.core.client.function import create_obj # from .utils import create_obj from . import utils diff --git a/pym/consolegui/application/pid_information.py b/pym/consolegui/application/pid_information.py index b1f1a3c..1d4baac 100644 --- a/pym/consolegui/application/pid_information.py +++ b/pym/consolegui/application/pid_information.py @@ -16,7 +16,7 @@ from __future__ import absolute_import from .more import get_sid, get_icon -from calculate.consolegui import qt +from .. import qt from .ReturnMessage import ReturnedMessage import urllib.request as urllib2 diff --git a/pym/consolegui/application/session_function.py b/pym/consolegui/application/session_function.py index 49796ce..a53012e 100644 --- a/pym/consolegui/application/session_function.py +++ b/pym/consolegui/application/session_function.py @@ -15,7 +15,7 @@ # limitations under the License. from __future__ import absolute_import -from calculate.consolegui import qt +from .. import qt import urllib.request as urllib2 from calculate.lib.utils.tools import Locker diff --git a/pym/consolegui/application/statusfield.py b/pym/consolegui/application/statusfield.py index a6b223c..8d9b418 100644 --- a/pym/consolegui/application/statusfield.py +++ b/pym/consolegui/application/statusfield.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from calculate.consolegui import qt +from .. import qt class StatusLabel(qt.QLabel): def __init__(self, name, parent): diff --git a/pym/consolegui/application/tools.py b/pym/consolegui/application/tools.py index 1c84a15..5dfb0de 100644 --- a/pym/consolegui/application/tools.py +++ b/pym/consolegui/application/tools.py @@ -17,7 +17,7 @@ from __future__ import absolute_import import os -from calculate.consolegui import qt +from .. import qt from .more import LabelWordWrap, FileOpenWgt, show_msg, show_question, \ client_list_methods, get_icon, dpivalue