From 53e7d458c59a44cea24b9d05ccf481feaffc0191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20M=2E=20G=C3=B3mez?= Date: Mon, 4 May 2020 19:51:32 +0200 Subject: [PATCH] #940: Run `2to3` on OGAgent source code Result after running the command: `2to3 -w ogagent/src` --- src/OGAgentUser.py | 56 ++++++++----------- src/OGAgent_rc.py | 2 +- src/opengnsys/RESTApi.py | 2 +- src/opengnsys/__init__.py | 6 +- src/opengnsys/config.py | 14 ++--- src/opengnsys/httpserver.py | 2 +- src/opengnsys/ipc.py | 2 +- src/opengnsys/linux/OGAgentService.py | 11 ++-- src/opengnsys/linux/operations.py | 2 +- src/opengnsys/linux/renamer/__init__.py | 2 +- src/opengnsys/linux/renamer/debian.py | 2 +- src/opengnsys/linux/renamer/opensuse.py | 2 +- src/opengnsys/linux/renamer/redhat.py | 2 +- src/opengnsys/loader.py | 2 +- src/opengnsys/log.py | 2 +- src/opengnsys/macos/__init__.py | 2 +- src/opengnsys/macos/operations.py | 2 +- .../modules/client/OpenGnSys/__init__.py | 2 +- .../modules/server/OpenGnSys/__init__.py | 13 +++-- src/opengnsys/operations.py | 2 +- src/opengnsys/service.py | 6 +- src/opengnsys/utils.py | 2 +- src/opengnsys/windows/OGAgentService.py | 2 +- src/opengnsys/windows/__init__.py | 2 +- src/opengnsys/windows/log.py | 2 +- src/opengnsys/windows/operations.py | 12 ++-- src/opengnsys/workers/client_worker.py | 2 +- src/opengnsys/workers/server_worker.py | 2 +- src/prototypes/threaded_server.py | 2 +- src/test_modules/client/Sample1/__init__.py | 2 +- src/test_modules/server/Sample1/__init__.py | 2 +- src/test_modules/server/Sample1/sample1.py | 2 +- .../server/Sample1/sample_pkg/__init__.py | 2 +- src/test_rest_server.py | 2 +- 34 files changed, 81 insertions(+), 91 deletions(-) diff --git a/src/OGAgentUser.py b/src/OGAgentUser.py index 478c40e..3b83250 100644 --- a/src/OGAgentUser.py +++ b/src/OGAgentUser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright (c) 2014 Virtual Cable S.L. @@ -29,28 +29,21 @@ """ @author: Adolfo Gómez, dkmaster at dkmon dot com """ -from __future__ import unicode_literals - +import atexit +import base64 import json import sys import time from PyQt5 import QtCore, QtGui, QtWidgets -import six -import atexit -from opengnsys import VERSION, ipc, operations, utils -from opengnsys.log import logger -from opengnsys.service import IPC_PORT from about_dialog_ui import Ui_OGAAboutDialog from message_dialog_ui import Ui_OGAMessageDialog -from opengnsys.scriptThread import ScriptExecutorThread +from opengnsys import VERSION, ipc, operations, utils from opengnsys.config import readConfig from opengnsys.loader import loadModules - -# Set default characters encoding to UTF-8 -reload(sys) -if hasattr(sys, 'setdefaultencoding'): - sys.setdefaultencoding('utf-8') +from opengnsys.log import logger +from opengnsys.scriptThread import ScriptExecutorThread +from opengnsys.service import IPC_PORT trayIcon = None @@ -61,7 +54,7 @@ def sigAtExit(): # About dialog -class OGAAboutDialog(QtGui.QDialog): +class OGAAboutDialog(QtWidgets.QDialog): def __init__(self, parent=None): QtWidgets.QDialog.__init__(self, parent) self.ui = Ui_OGAAboutDialog() @@ -115,13 +108,13 @@ class MessagesProcessor(QtCore.QThread): def isAlive(self): return self.ipc is not None - def sendLogin(self, userName, language): + def sendLogin(self, username, language): if self.ipc: - self.ipc.sendLogin(userName, language) + self.ipc.sendLogin(username, language) - def sendLogout(self, userName): + def sendLogout(self, username): if self.ipc: - self.ipc.sendLogout(userName) + self.ipc.sendLogout(username) def run(self): if self.ipc is None: @@ -136,15 +129,15 @@ class MessagesProcessor(QtCore.QThread): msg = self.ipc.getMessage() if msg is None: break - msgId, data = msg + msg_id, data = msg logger.debug('Got Message on User Space: {}:{}'.format(msgId, data)) - if msgId == ipc.MSG_MESSAGE: + if msg_id == ipc.MSG_MESSAGE: module, message, data = data.split('\0') self.message.emit((module, message, data)) - elif msgId == ipc.MSG_LOGOFF: + elif msg_id == ipc.MSG_LOGOFF: self.logoff.emit() - elif msgId == ipc.MSG_SCRIPT: - self.script.emit(QtCore.QString.fromUtf8(data)) + elif msg_id == ipc.MSG_SCRIPT: + self.script.emit(data.decode('utf-8')) except Exception as e: try: logger.error('Got error on IPC thread {}'.format(utils.exceptionToMessage(e))) @@ -161,17 +154,14 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon): def __init__(self, app_, parent=None): self.app = app_ self.config = readConfig(client=True) - + self.modules = None # Get opengnsys section as dict cfg = dict(self.config.items('opengnsys')) - # Set up log level logger.setLevel(cfg.get('log', 'INFO')) self.ipcport = int(cfg.get('ipc_port', IPC_PORT)) - # style = app.style() - # icon = QtGui.QIcon(style.standardPixmap(QtGui.QStyle.SP_ComputerIcon)) icon = QtGui.QIcon(':/images/img/oga.png') QtWidgets.QSystemTrayIcon.__init__(self, icon, parent) @@ -208,18 +198,16 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon): logger.debug('Modules: {}'.format(list(v.name for v in self.modules))) # Send init to all modules - validMods = [] + valid_mods = [] for mod in self.modules: try: logger.debug('Activating module {}'.format(mod.name)) mod.activate() - validMods.append(mod) + valid_mods.append(mod) except Exception as e: logger.exception() logger.error("Activation of {} failed: {}".format(mod.name, utils.exceptionToMessage(e))) - - self.modules[:] = validMods # copy instead of assignment - + self.modules[:] = valid_mods # copy instead of assignment # If this is running, it's because he have logged in, inform service of this fact self.ipc.sendLogin(operations.getCurrentUser(), operations.getSessionLanguage()) @@ -259,7 +247,7 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon): def executeScript(self, script): logger.debug('Executing script') - script = six.text_type(script.toUtf8()).decode('base64') + script = base64.b64decode(script.encode('ascii')) th = ScriptExecutorThread(script) th.start() diff --git a/src/OGAgent_rc.py b/src/OGAgent_rc.py index b0a9562..affcb8c 100644 --- a/src/OGAgent_rc.py +++ b/src/OGAgent_rc.py @@ -6,7 +6,7 @@ # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ \x00\x00\x0f\x42\ diff --git a/src/opengnsys/RESTApi.py b/src/opengnsys/RESTApi.py index d785dfa..8773cf5 100644 --- a/src/opengnsys/RESTApi.py +++ b/src/opengnsys/RESTApi.py @@ -32,7 +32,7 @@ # pylint: disable-msg=E1101,W0703 -from __future__ import unicode_literals + import requests import logging diff --git a/src/opengnsys/__init__.py b/src/opengnsys/__init__.py index 7be8700..1cad939 100644 --- a/src/opengnsys/__init__.py +++ b/src/opengnsys/__init__.py @@ -29,13 +29,13 @@ """ @author: Adolfo Gómez, dkmaster at dkmon dot com """ -from __future__ import unicode_literals + # On centos, old six release does not includes byte2int, nor six.PY2 import six -import modules -from RESTApi import REST, RESTError +from . import modules +from .RESTApi import REST, RESTError try: with open('../VERSION', 'r') as v: diff --git a/src/opengnsys/config.py b/src/opengnsys/config.py index d1f3ede..7ffe046 100644 --- a/src/opengnsys/config.py +++ b/src/opengnsys/config.py @@ -26,24 +26,25 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -''' +""" @author: Adolfo Gómez, dkmaster at dkmon dot com -''' +""" # pylint: disable=unused-wildcard-import, wildcard-import -from __future__ import unicode_literals -from ConfigParser import SafeConfigParser + +from configparser import SafeConfigParser config = None + def readConfig(client=False): - ''' + """ Reads configuration file If client is False, will read ogagent.cfg as configuration If client is True, will read ogclient.cfg as configuration This is this way so we can protect ogagent.cfg against reading for non admin users on all platforms. - ''' + """ cfg = SafeConfigParser() if client is True: fname = 'ogclient.cfg' @@ -55,4 +56,3 @@ def readConfig(client=False): return None return cfg - \ No newline at end of file diff --git a/src/opengnsys/httpserver.py b/src/opengnsys/httpserver.py index a06ae6b..d11a4e2 100644 --- a/src/opengnsys/httpserver.py +++ b/src/opengnsys/httpserver.py @@ -29,7 +29,7 @@ @author: Adolfo Gómez, dkmaster at dkmon dot com ''' # pylint: disable=unused-wildcard-import,wildcard-import -from __future__ import unicode_literals, print_function + # Pydev can't parse "six.moves.xxxx" because it is loaded lazy import six diff --git a/src/opengnsys/ipc.py b/src/opengnsys/ipc.py index dd3663d..aad3921 100644 --- a/src/opengnsys/ipc.py +++ b/src/opengnsys/ipc.py @@ -28,7 +28,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import socket import threading diff --git a/src/opengnsys/linux/OGAgentService.py b/src/opengnsys/linux/OGAgentService.py index 29a238d..76bfbb8 100644 --- a/src/opengnsys/linux/OGAgentService.py +++ b/src/opengnsys/linux/OGAgentService.py @@ -26,10 +26,10 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -''' +""" @author: Adolfo Gómez, dkmaster at dkmon dot com -''' -from __future__ import unicode_literals +""" + from opengnsys.service import CommonService from opengnsys.service import IPC_PORT @@ -45,7 +45,7 @@ import json try: from prctl import set_proctitle # @UnresolvedImport -except Exception: # Platform may not include prctl, so in case it's not available, we let the "name" as is +except ImportError: # Platform may not include prctl, so in case it's not available, we let the "name" as is def set_proctitle(_): pass @@ -63,7 +63,6 @@ class OGAgentSvc(Daemon, CommonService): # Call modules initialization # They are called in sequence, no threading is done at this point, so ensure modules onActivate always returns - # ********************* # * Main Service loop * @@ -93,6 +92,7 @@ def usage(): sys.stderr.write("usage: {} start|stop|restart|fg|login 'username'|logout 'username'|message 'module' 'message' 'json'\n".format(sys.argv[0])) sys.exit(2) + if __name__ == '__main__': logger.setLevel('INFO') @@ -105,7 +105,6 @@ if __name__ == '__main__': sys.exit(0) except Exception as e: logger.error(e) - if len(sys.argv) == 3 and sys.argv[1] in ('login', 'logout'): logger.debug('Running client opengnsys') diff --git a/src/opengnsys/linux/operations.py b/src/opengnsys/linux/operations.py index f3236e2..3b2c5d3 100644 --- a/src/opengnsys/linux/operations.py +++ b/src/opengnsys/linux/operations.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import socket import platform diff --git a/src/opengnsys/linux/renamer/__init__.py b/src/opengnsys/linux/renamer/__init__.py index 27198dc..7b3bc69 100644 --- a/src/opengnsys/linux/renamer/__init__.py +++ b/src/opengnsys/linux/renamer/__init__.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import platform import os diff --git a/src/opengnsys/linux/renamer/debian.py b/src/opengnsys/linux/renamer/debian.py index be55e00..2e6e2a1 100644 --- a/src/opengnsys/linux/renamer/debian.py +++ b/src/opengnsys/linux/renamer/debian.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + from opengnsys.linux.renamer import renamers from opengnsys.log import logger diff --git a/src/opengnsys/linux/renamer/opensuse.py b/src/opengnsys/linux/renamer/opensuse.py index a2d29a5..3f05e4e 100644 --- a/src/opengnsys/linux/renamer/opensuse.py +++ b/src/opengnsys/linux/renamer/opensuse.py @@ -28,7 +28,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + from opengnsys.linux.renamer import renamers from opengnsys.log import logger diff --git a/src/opengnsys/linux/renamer/redhat.py b/src/opengnsys/linux/renamer/redhat.py index 8821a81..2605c22 100644 --- a/src/opengnsys/linux/renamer/redhat.py +++ b/src/opengnsys/linux/renamer/redhat.py @@ -28,7 +28,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + from opengnsys.linux.renamer import renamers from opengnsys.log import logger diff --git a/src/opengnsys/loader.py b/src/opengnsys/loader.py index 23988fc..ca053b6 100644 --- a/src/opengnsys/loader.py +++ b/src/opengnsys/loader.py @@ -33,7 +33,7 @@ # This is a simple module loader, so we can add "external opengnsys" modules as addons # Modules under "opengsnsys/modules" are always autoloaded -from __future__ import unicode_literals + import pkgutil import os.path diff --git a/src/opengnsys/log.py b/src/opengnsys/log.py index e34c087..c559113 100644 --- a/src/opengnsys/log.py +++ b/src/opengnsys/log.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import traceback import sys diff --git a/src/opengnsys/macos/__init__.py b/src/opengnsys/macos/__init__.py index ee5ba4c..988217f 100644 --- a/src/opengnsys/macos/__init__.py +++ b/src/opengnsys/macos/__init__.py @@ -29,4 +29,4 @@ ''' @author: Ramón M. Gómez, ramongomez at us dot es ''' -from __future__ import unicode_literals + diff --git a/src/opengnsys/macos/operations.py b/src/opengnsys/macos/operations.py index 286b6d8..15b6b11 100644 --- a/src/opengnsys/macos/operations.py +++ b/src/opengnsys/macos/operations.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import socket import platform diff --git a/src/opengnsys/modules/client/OpenGnSys/__init__.py b/src/opengnsys/modules/client/OpenGnSys/__init__.py index adeb0a6..51a5137 100644 --- a/src/opengnsys/modules/client/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/client/OpenGnSys/__init__.py @@ -28,7 +28,7 @@ """ @author: Ramón M. Gómez, ramongomez at us dot es """ -from __future__ import unicode_literals + from opengnsys.workers import ClientWorker diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py index 466b1e3..b7f2618 100644 --- a/src/opengnsys/modules/server/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright (c) 2014 Virtual Cable S.L. @@ -28,7 +29,7 @@ """ @author: Ramón M. Gómez, ramongomez at us dot es """ -from __future__ import unicode_literals + import os import random @@ -36,12 +37,14 @@ import shutil import string import threading import time -import urllib +import urllib.error +import urllib.parse +import urllib.request -from opengnsys.workers import ServerWorker -from opengnsys import REST, RESTError, operations, VERSION +from opengnsys import REST, operations, VERSION from opengnsys.log import logger from opengnsys.scriptThread import ScriptExecutorThread +from opengnsys.workers import ServerWorker # Check authorization header decorator @@ -312,7 +315,7 @@ class OpenGnSysWorker(ServerWorker): """ logger.debug('Processing script request') # Decoding script (Windows scripts need a subprocess call per line) - script = urllib.unquote(post_params.get('script').decode('base64')).decode('utf8') + script = urllib.parse.unquote(post_params.get('script').decode('base64')).decode('utf8') if operations.os_type == 'Windows': script = 'import subprocess; {0}'.format( ';'.join(['subprocess.check_output({0},shell=True)'.format(repr(c)) for c in script.split('\n')])) diff --git a/src/opengnsys/operations.py b/src/opengnsys/operations.py index be777dd..1ec9872 100644 --- a/src/opengnsys/operations.py +++ b/src/opengnsys/operations.py @@ -31,7 +31,7 @@ """ # pylint: disable=unused-wildcard-import,wildcard-import -from __future__ import unicode_literals + import sys # Importing platform operations and getting operating system data. diff --git a/src/opengnsys/service.py b/src/opengnsys/service.py index 4a44028..9f8295b 100644 --- a/src/opengnsys/service.py +++ b/src/opengnsys/service.py @@ -26,10 +26,10 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -''' +""" @author: Adolfo Gómez, dkmaster at dkmon dot com -''' -from __future__ import unicode_literals +""" + from .log import logger from .config import readConfig diff --git a/src/opengnsys/utils.py b/src/opengnsys/utils.py index 9480a6a..36bef63 100644 --- a/src/opengnsys/utils.py +++ b/src/opengnsys/utils.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import sys import six diff --git a/src/opengnsys/windows/OGAgentService.py b/src/opengnsys/windows/OGAgentService.py index 71716d7..857b2cc 100644 --- a/src/opengnsys/windows/OGAgentService.py +++ b/src/opengnsys/windows/OGAgentService.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + # pylint: disable=unused-wildcard-import, wildcard-import import win32serviceutil # @UnresolvedImport, pylint: disable=import-error diff --git a/src/opengnsys/windows/__init__.py b/src/opengnsys/windows/__init__.py index e662942..c47fe7d 100644 --- a/src/opengnsys/windows/__init__.py +++ b/src/opengnsys/windows/__init__.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import os import sys diff --git a/src/opengnsys/windows/log.py b/src/opengnsys/windows/log.py index 745fd03..16750ae 100644 --- a/src/opengnsys/windows/log.py +++ b/src/opengnsys/windows/log.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import servicemanager # @UnresolvedImport, pylint: disable=import-error import logging diff --git a/src/opengnsys/windows/operations.py b/src/opengnsys/windows/operations.py index 95331fd..51d56d7 100644 --- a/src/opengnsys/windows/operations.py +++ b/src/opengnsys/windows/operations.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + import os import locale @@ -102,12 +102,12 @@ def getWindowsVersion(): ''' Returns Windows version. ''' - import _winreg - reg = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion') + import winreg + reg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion') try: - data = '{} {}'.format(_winreg.QueryValueEx(reg, 'ProductName')[0], _winreg.QueryValueEx(reg, 'ReleaseId')[0]) + data = '{} {}'.format(winreg.QueryValueEx(reg, 'ProductName')[0], winreg.QueryValueEx(reg, 'ReleaseId')[0]) except Exception: - data = '{} {}'.format(_winreg.QueryValueEx(reg, 'ProductName')[0], _winreg.QueryValueEx(reg, 'CurrentBuildNumber')[0]) + data = '{} {}'.format(winreg.QueryValueEx(reg, 'ProductName')[0], winreg.QueryValueEx(reg, 'CurrentBuildNumber')[0]) reg.Close() return data @@ -200,7 +200,7 @@ def joinDomain(domain, ou, account, password, executeInOneStep=False): error = getErrorMessage(res) if res == 1355: error = "DC Is not reachable" - print('{} {}'.format(res, error)) + print(('{} {}'.format(res, error))) raise Exception('Error joining domain {}, with credentials {}/*****{}: {}, {}'.format(domain.value, account.value, ', under OU {}'.format(ou.value) if ou.value is not None else '', res, error)) diff --git a/src/opengnsys/workers/client_worker.py b/src/opengnsys/workers/client_worker.py index 6a08380..b294f92 100644 --- a/src/opengnsys/workers/client_worker.py +++ b/src/opengnsys/workers/client_worker.py @@ -29,7 +29,7 @@ @author: Adolfo Gómez, dkmaster at dkmon dot com ''' # pylint: disable=unused-wildcard-import,wildcard-import -from __future__ import unicode_literals + class ClientWorker(object): ''' diff --git a/src/opengnsys/workers/server_worker.py b/src/opengnsys/workers/server_worker.py index 141d657..79268b8 100644 --- a/src/opengnsys/workers/server_worker.py +++ b/src/opengnsys/workers/server_worker.py @@ -29,7 +29,7 @@ @author: Adolfo Gómez, dkmaster at dkmon dot com ''' # pylint: disable=unused-wildcard-import,wildcard-import -from __future__ import unicode_literals + class ServerWorker(object): ''' diff --git a/src/prototypes/threaded_server.py b/src/prototypes/threaded_server.py index ed5583b..b8d7751 100644 --- a/src/prototypes/threaded_server.py +++ b/src/prototypes/threaded_server.py @@ -3,7 +3,7 @@ Created on Jul 9, 2015 @author: dkmaster ''' -from __future__ import unicode_literals, print_function + # Pydev can't parse "six.moves.xxxx" because it is loaded lazy from six.moves.socketserver import ThreadingMixIn # @UnresolvedImport diff --git a/src/test_modules/client/Sample1/__init__.py b/src/test_modules/client/Sample1/__init__.py index db174f0..a6dcf49 100644 --- a/src/test_modules/client/Sample1/__init__.py +++ b/src/test_modules/client/Sample1/__init__.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + from opengnsys.workers import ClientWorker diff --git a/src/test_modules/server/Sample1/__init__.py b/src/test_modules/server/Sample1/__init__.py index 189957e..0359b8a 100644 --- a/src/test_modules/server/Sample1/__init__.py +++ b/src/test_modules/server/Sample1/__init__.py @@ -1,2 +1,2 @@ # Module must be imported on package, so we can initialize and load it -from sample1 import Sample1 \ No newline at end of file +from .sample1 import Sample1 \ No newline at end of file diff --git a/src/test_modules/server/Sample1/sample1.py b/src/test_modules/server/Sample1/sample1.py index 61e405e..08cb90f 100644 --- a/src/test_modules/server/Sample1/sample1.py +++ b/src/test_modules/server/Sample1/sample1.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + from opengnsys.workers import ServerWorker diff --git a/src/test_modules/server/Sample1/sample_pkg/__init__.py b/src/test_modules/server/Sample1/sample_pkg/__init__.py index 1936572..571a11c 100644 --- a/src/test_modules/server/Sample1/sample_pkg/__init__.py +++ b/src/test_modules/server/Sample1/sample_pkg/__init__.py @@ -29,7 +29,7 @@ ''' @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -from __future__ import unicode_literals + def test(): diff --git a/src/test_rest_server.py b/src/test_rest_server.py index ad1aede..f1bdd37 100644 --- a/src/test_rest_server.py +++ b/src/test_rest_server.py @@ -30,7 +30,7 @@ @author: Adolfo Gómez, dkmaster at dkmon dot com ''' # pylint: disable=unused-wildcard-import,wildcard-import -from __future__ import unicode_literals, print_function + # Pydev can't parse "six.moves.xxxx" because it is loaded lazy from six.moves.socketserver import ThreadingMixIn # @UnresolvedImport