imports changed to relative

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 .. import qt
-from __future__ import absolute_import
-from calculate.consolegui import qt
 import urllib.request as urllib2
 
 from .DisplayMethod import DisplayMethod, StartWidget, ConnectLostLabel

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 .. import qt
-from calculate.consolegui import qt
 import urllib.request as urllib2
 import OpenSSL, hashlib
 

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__])

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 .. import qt
-from __future__ import absolute_import
-from calculate.consolegui import qt
 from .more import LabelWordWrap, _print, get_system_rgb, ParameterWindow, dpivalue
 
 DEBUG_LEVEL = 99999

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, \

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

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

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
 

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
 
 

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

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

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

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 .. import qt
-from calculate.consolegui import qt
 import calculate.contrib
 from suds import WebFault
 import logging, OpenSSL

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
 

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

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

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):

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

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

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
 

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):

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