From c8d3b4b8bdd7f33ec99331c89d0e822508f944fa Mon Sep 17 00:00:00 2001 From: afabiani Date: Thu, 7 Nov 2019 14:57:39 +0100 Subject: [PATCH] [Fixes #40] Typos on class name --- setup.py | 6 ++--- src/wpsremote/ConfigParser.py | 4 +-- ...tMessages.py => busIndependentMessages.py} | 26 +++++++++---------- src/wpsremote/output_file_parameter.py | 6 ++--- src/wpsremote/path.py | 14 +--------- src/wpsremote/processbot.py | 20 +++++++------- src/wpsremote/run_threads.sh | 1 - src/wpsremote/servicebot.py | 22 ++++++++-------- src/wpsremote/wpsagent.py | 4 +-- src/wpsremote/xmppBus.py | 26 +++++++++---------- .../xmpp_data/configs/myservice/code/test.py | 12 ++++++--- test/test_bus_independent_messages.py | 2 +- test/test_path.py | 7 ++++- 13 files changed, 73 insertions(+), 77 deletions(-) rename src/wpsremote/{busIndipendentMessages.py => busIndependentMessages.py} (83%) diff --git a/setup.py b/setup.py index f3c6130..ed58260 100644 --- a/setup.py +++ b/setup.py @@ -53,9 +53,9 @@ REQUIREMENTS = [str(r.req) for r in inst_req] try: - readme_text = file('README.md', 'rb').read() -except IOError as e: - readme_text = open('README.md', 'rb').read() + readme_text = file('README.md', 'r').read() +except BaseException: + readme_text = open('README.md', 'r').read() setup( name="wps-remote", diff --git a/src/wpsremote/ConfigParser.py b/src/wpsremote/ConfigParser.py index ef12c9e..3cfab97 100644 --- a/src/wpsremote/ConfigParser.py +++ b/src/wpsremote/ConfigParser.py @@ -313,7 +313,7 @@ def read(self, filenames): Return list of successfully read files. """ - if isinstance(filenames, basestring): + if isinstance(filenames, str): filenames = [filenames] read_ok = [] for filename in filenames: @@ -758,7 +758,7 @@ def set(self, section, option, value=None): # - we do not allow valueless options, or # - we allow valueless options but the value is not None if self._optcre is self.OPTCRE or value: - if not isinstance(value, basestring): + if not isinstance(value, str): raise TypeError("option values must be strings") if value is not None: # check for bad percent signs: diff --git a/src/wpsremote/busIndipendentMessages.py b/src/wpsremote/busIndependentMessages.py similarity index 83% rename from src/wpsremote/busIndipendentMessages.py rename to src/wpsremote/busIndependentMessages.py index f8afc2b..779f72c 100644 --- a/src/wpsremote/busIndipendentMessages.py +++ b/src/wpsremote/busIndependentMessages.py @@ -11,15 +11,15 @@ __license__ = "GPL" -class BusInipendentMessage(object): +class BusIndependentMessage(object): pass -class PresenceMessage(BusInipendentMessage): +class PresenceMessage(BusIndependentMessage): pass -class InviteMessage(BusInipendentMessage): +class InviteMessage(BusIndependentMessage): def __init__(self, payload, originator): self._originator = originator @@ -29,7 +29,7 @@ def originator(self): return self._originator -class RegisterMessage(BusInipendentMessage): +class RegisterMessage(BusIndependentMessage): def __init__(self, originator, service, namespace, descritpion, par, output): self._originator = originator @@ -46,7 +46,7 @@ def originator(self): return self._originator -class ExecuteMessage(BusInipendentMessage): +class ExecuteMessage(BusIndependentMessage): @staticmethod def deserialize(filepath): @@ -77,14 +77,14 @@ def serialize(self, fileptr): pickle.dump(self, fileptr) -class ProgressMessage(BusInipendentMessage): +class ProgressMessage(BusIndependentMessage): def __init__(self, originator, progress): self.originator = originator self.progress = progress -class LogMessage(BusInipendentMessage): +class LogMessage(BusIndependentMessage): def __init__(self, originator, level, msg): self.level = level @@ -92,7 +92,7 @@ def __init__(self, originator, level, msg): self.msg = msg -class CompletedMessage(BusInipendentMessage): +class CompletedMessage(BusIndependentMessage): def __init__(self, originator, base_url, outputs): self.originator = originator @@ -103,14 +103,14 @@ def outputs(self): return self._outputs -class FinishMessage(BusInipendentMessage): +class FinishMessage(BusIndependentMessage): def __init__(self, payload, originator): self.originator = originator self.payload = payload -class ErrorMessage(BusInipendentMessage): +class ErrorMessage(BusIndependentMessage): def __init__(self, originator, msg, id=None): self.originator = originator @@ -118,14 +118,14 @@ def __init__(self, originator, msg, id=None): self.id = id -class AbortMessage(BusInipendentMessage): +class AbortMessage(BusIndependentMessage): def __init__(self, payload, originator): self.originator = originator self.payload = payload -class GetLoadAverageMessage(BusInipendentMessage): +class GetLoadAverageMessage(BusIndependentMessage): def __init__(self, payload, originator): self._originator = originator @@ -135,7 +135,7 @@ def originator(self): return self._originator -class LoadAverageMessage(BusInipendentMessage): +class LoadAverageMessage(BusIndependentMessage): def __init__(self, originator, outputs): self.originator = originator diff --git a/src/wpsremote/output_file_parameter.py b/src/wpsremote/output_file_parameter.py index 3c9d1db..7a55e0f 100644 --- a/src/wpsremote/output_file_parameter.py +++ b/src/wpsremote/output_file_parameter.py @@ -45,7 +45,7 @@ def __init__(self, par_name, d, template_vars_for_param_types=None, wps_executio for k, v in d.items(): if hasattr(self, "_" + k): - if template_vars_for_param_types is not None and isinstance(v, basestring): + if template_vars_for_param_types is not None and isinstance(v, str): for var, val in template_vars_for_param_types.items(): if var in v: v = v.replace("%" + var, val) @@ -168,7 +168,7 @@ def __init__(self, par_name, d, template_vars_for_param_types=None, wps_executio for k, v in d.items(): if hasattr(self, "_" + k): - if template_vars_for_param_types is not None and isinstance(v, basestring): + if template_vars_for_param_types is not None and isinstance(v, str): for var, val in template_vars_for_param_types.items(): if var in v: v = v.replace("%" + var, val) @@ -292,7 +292,7 @@ def __init__( for k, v in d.items(): if hasattr(self, "_" + k): - if template_vars_for_param_types is not None and isinstance(v, basestring): + if template_vars_for_param_types is not None and isinstance(v, str): for var, val in template_vars_for_param_types.items(): if var in v: v = v.replace("%" + var, val) diff --git a/src/wpsremote/path.py b/src/wpsremote/path.py index 9e0d7c6..8031358 100644 --- a/src/wpsremote/path.py +++ b/src/wpsremote/path.py @@ -72,18 +72,6 @@ except AttributeError: pass -# Pre-2.3 workaround for booleans -try: - True, False -except NameError: - True, False = 1, 0 - -# Pre-2.3 workaround for basestring. -try: - basestring -except NameError: - basestring = (str, unicode) - # Universal newline support _textmode = 'r' if hasattr(file, 'newlines'): @@ -117,7 +105,7 @@ def __add__(self, more): return self.__class__(resultStr) def __radd__(self, other): - if isinstance(other, basestring): + if isinstance(other, str): return self.__class__(other.__add__(self)) else: return NotImplemented diff --git a/src/wpsremote/processbot.py b/src/wpsremote/processbot.py index 3262bc3..73b43af 100644 --- a/src/wpsremote/processbot.py +++ b/src/wpsremote/processbot.py @@ -15,7 +15,7 @@ import base64 import sys -import busIndipendentMessages +import busIndependentMessages import computation_job_inputs import computational_job_input_actions import configInstance @@ -141,8 +141,8 @@ def __init__(self, remote_config_filepath, service_config_filepath, execute_mess self._finished = False # event handlers - self.bus.RegisterMessageCallback(busIndipendentMessages.FinishMessage, self.handle_finish) - self.bus.RegisterMessageCallback(busIndipendentMessages.AbortMessage, self.handle_abort) + self.bus.RegisterMessageCallback(busIndependentMessages.FinishMessage, self.handle_finish) + self.bus.RegisterMessageCallback(busIndependentMessages.AbortMessage, self.handle_abort) def exit(self, return_code, exception=None): # if exception: @@ -225,7 +225,7 @@ def process_output_parser(self, invoked_process): self.bus.xmpp.reconnect() self.bus.xmpp.send_presence() if self.bus.state() == 'connected': - self.bus.SendMessage(busIndipendentMessages. + self.bus.SendMessage(busIndependentMessages. LogMessage(self._remote_wps_endpoint, "INFO", "start parsing stdout of created process " + self.service)) @@ -263,7 +263,7 @@ def process_output_parser(self, invoked_process): " Could not send info message to GeoServer Endpoint " + str(self._remote_wps_endpoint)) if self.bus.state() == 'connected': - self.bus.SendMessage(busIndipendentMessages. + self.bus.SendMessage(busIndependentMessages. ProgressMessage(self._remote_wps_endpoint, float(res.group(1).strip()))) # match = True @@ -280,7 +280,7 @@ def process_output_parser(self, invoked_process): " Could not send info message to GeoServer Endpoint " + str(self._remote_wps_endpoint)) if self.bus.state() == 'connected': - self.bus.SendMessage(busIndipendentMessages. + self.bus.SendMessage(busIndependentMessages. LogMessage(self._remote_wps_endpoint, res.group(1).strip(), res.group(2).strip())) @@ -298,7 +298,7 @@ def process_output_parser(self, invoked_process): " Could not send info message to GeoServer Endpoint " + str(self._remote_wps_endpoint)) if self.bus.state() == 'connected': - self.bus.SendMessage(busIndipendentMessages. + self.bus.SendMessage(busIndependentMessages. ErrorMessage(self._remote_wps_endpoint, res.group(2).strip())) # match = True @@ -357,7 +357,7 @@ def process_output_parser(self, invoked_process): str(self._remote_wps_endpoint)) if self.bus.state() == 'connected': logger.info("sending 'completed' message tentative #" + str(counter)) - self.bus.SendMessage(busIndipendentMessages. + self.bus.SendMessage(busIndependentMessages. CompletedMessage(self._remote_wps_endpoint, self._remote_wps_baseurl, outputs)) counter = counter + 1 @@ -411,7 +411,7 @@ def send_error_message(self, msg): " Could not send info message to GeoServer Endpoint " + str(self._remote_wps_endpoint)) if self.bus.state() == 'connected': - self.bus.SendMessage(busIndipendentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) + self.bus.SendMessage(busIndependentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) else: try: self.bus.xmpp.reconnect() @@ -419,7 +419,7 @@ def send_error_message(self, msg): # self.bus.xmpp.get_roster() if self.bus.state() == 'connected': - self.bus.SendMessage(busIndipendentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) + self.bus.SendMessage(busIndependentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) else: sys.stdout.write("[XMPP Disconnected]: Process " + str(self._uniqueExeId) + diff --git a/src/wpsremote/run_threads.sh b/src/wpsremote/run_threads.sh index 06fb8d2..37d047c 100755 --- a/src/wpsremote/run_threads.sh +++ b/src/wpsremote/run_threads.sh @@ -1,2 +1 @@ python wpsagent.py -r ./xmpp_data/configs/remote.config -s ./xmpp_data/configs/myservice/service.config service & - diff --git a/src/wpsremote/servicebot.py b/src/wpsremote/servicebot.py index 72949ab..5f15c16 100644 --- a/src/wpsremote/servicebot.py +++ b/src/wpsremote/servicebot.py @@ -15,7 +15,7 @@ from collections import OrderedDict -import busIndipendentMessages +import busIndependentMessages import configInstance import computation_job_inputs @@ -95,11 +95,11 @@ def __init__(self, remote_config_filepath, service_config_filepath): # create the concrete bus object self.bus = introspection.get_class_three_arg(bus_class_name, remote_config, self.service, self.namespace) - self.bus.RegisterMessageCallback(busIndipendentMessages.InviteMessage, self.handle_invite) - self.bus.RegisterMessageCallback(busIndipendentMessages.ExecuteMessage, self.handle_execute) + self.bus.RegisterMessageCallback(busIndependentMessages.InviteMessage, self.handle_invite) + self.bus.RegisterMessageCallback(busIndependentMessages.ExecuteMessage, self.handle_execute) # -- Register here the callback to the "getloadavg" message - self.bus.RegisterMessageCallback(busIndipendentMessages.GetLoadAverageMessage, self.handle_getloadavg) + self.bus.RegisterMessageCallback(busIndependentMessages.GetLoadAverageMessage, self.handle_getloadavg) # self._lock_running_process = thread.allocate_lock() #critical section # to access running_process from separate threads @@ -144,7 +144,7 @@ def handle_invite(self, invite_message): self.bus.xmpp.reconnect() self.bus.xmpp.send_presence() self.bus.SendMessage( - busIndipendentMessages.RegisterMessage(invite_message.originator(), + busIndependentMessages.RegisterMessage(invite_message.originator(), self.service, self.namespace, self.description, @@ -231,7 +231,7 @@ def handle_getloadavg(self, getloadavg_message): self.bus.xmpp.reconnect() self.bus.xmpp.send_presence() self.bus.SendMessage( - busIndipendentMessages.LoadAverageMessage( + busIndependentMessages.LoadAverageMessage( getloadavg_message.originator(), outputs ) @@ -297,17 +297,17 @@ def output_parser_verbose(self, invoked_process, param_filepath): logger.debug("gs_UID[%s] / gs_JID[%s]" % (gs_UID, gs_JID)) try: if gs_UID and gs_JID: - self.bus.SendMessage(busIndipendentMessages.ErrorMessage( + self.bus.SendMessage(busIndependentMessages.ErrorMessage( gs_JID, msg + " Exception: " + str(gs_MSG), gs_UID)) elif self._remote_wps_endpoint: - self.bus.SendMessage(busIndipendentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) + self.bus.SendMessage(busIndependentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) else: exe_msg = None try: logger.debug("Trying to recover Originator from Process Params!") - exe_msg = busIndipendentMessages.ExecuteMessage.deserialize(param_filepath) + exe_msg = busIndependentMessages.ExecuteMessage.deserialize(param_filepath) if exe_msg.originator(): - self.bus.SendMessage(busIndipendentMessages. + self.bus.SendMessage(busIndependentMessages. ErrorMessage(exe_msg.originator(), msg + (" Exception: remote process exception. " @@ -336,7 +336,7 @@ def send_error_message(self, msg): self.bus.xmpp.reconnect() self.bus.xmpp.send_presence() if self._remote_wps_endpoint: - self.bus.SendMessage(busIndipendentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) + self.bus.SendMessage(busIndependentMessages.ErrorMessage(self._remote_wps_endpoint, msg)) else: msg = "Process " + str(self.service) + " STALLED! Don't know who to send ERROR Message..." logger.error(msg) diff --git a/src/wpsremote/wpsagent.py b/src/wpsremote/wpsagent.py index 51b1756..59d39ed 100644 --- a/src/wpsremote/wpsagent.py +++ b/src/wpsremote/wpsagent.py @@ -15,7 +15,7 @@ import servicebot import processbot import configInstance -import busIndipendentMessages +import busIndependentMessages import resource_cleaner __author__ = "Alessio Fabiani" @@ -117,7 +117,7 @@ def __init__(self, args): config_dir_service = path.path(args.serviceconfig).dirname() # deserilize pickled object with process startup info to get the unique_id # to create the sand box work dir for the process execution - self.exe_msg = busIndipendentMessages.ExecuteMessage.deserialize(args.params) + self.exe_msg = busIndependentMessages.ExecuteMessage.deserialize(args.params) # read the service config file with interpolation=true (raw=False) to get # the proper sand box work dir using the unique id as input parameter diff --git a/src/wpsremote/xmppBus.py b/src/wpsremote/xmppBus.py index fc872a8..b9e98e6 100644 --- a/src/wpsremote/xmppBus.py +++ b/src/wpsremote/xmppBus.py @@ -10,7 +10,7 @@ import urllib import pickle import sleekxmpp -import busIndipendentMessages +import busIndependentMessages import xmppMessages import bus import sys @@ -129,21 +129,21 @@ def CreateIndipendentMessage(self, msg): logging.info("handle request message from WPS " + str(payload)) variables = dict([tuple(each.strip().split('=')) for each in payload.split('&')]) requestParams = pickle.loads(urllib.unquote(variables['message'])) if variables['message'] is not None else None # noqa - return busIndipendentMessages.ExecuteMessage(msg['from'], + return busIndependentMessages.ExecuteMessage(msg['from'], variables['id'], variables['baseURL'], requestParams) elif ("topic=invite" in payload): logging.info("handle invite message from WPS " + str(payload)) - return busIndipendentMessages.InviteMessage(payload, msg['from']) + return busIndependentMessages.InviteMessage(payload, msg['from']) elif ("topic=finish" in payload): logging.info("handle finish message from WPS " + str(payload)) - return busIndipendentMessages.FinishMessage(payload, msg['from']) + return busIndependentMessages.FinishMessage(payload, msg['from']) elif ("topic=abort" in payload): logging.info("handle abort message from WPS " + str(payload)) - return busIndipendentMessages.AbortMessage(payload, msg['from']) + return busIndependentMessages.AbortMessage(payload, msg['from']) elif ("topic=getloadavg" in payload): - return busIndipendentMessages.GetLoadAverageMessage(payload, msg['from']) + return busIndependentMessages.GetLoadAverageMessage(payload, msg['from']) else: pass return None @@ -159,7 +159,7 @@ def _register(self, iq): pass def Convert(self, busIndipendentMsg): - if (isinstance(busIndipendentMsg, busIndipendentMessages.RegisterMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.RegisterMessage)): return xmppMessages.XMPPRegisterMessage(self, busIndipendentMsg.originator(), busIndipendentMsg.service, @@ -168,36 +168,36 @@ def Convert(self, busIndipendentMsg): busIndipendentMsg.input_parameters(), busIndipendentMsg.output) - if (isinstance(busIndipendentMsg, busIndipendentMessages.ProgressMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.ProgressMessage)): return xmppMessages.XMPPProgressMessage(busIndipendentMsg.originator, self, busIndipendentMsg.progress) - if (isinstance(busIndipendentMsg, busIndipendentMessages.LogMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.LogMessage)): return xmppMessages.XMPPLogMessage(busIndipendentMsg.originator, self, busIndipendentMsg.level, busIndipendentMsg.msg) - if (isinstance(busIndipendentMsg, busIndipendentMessages.CompletedMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.CompletedMessage)): return xmppMessages.XMPPCompletedMessage(busIndipendentMsg.originator, self, busIndipendentMsg.base_url, busIndipendentMsg.outputs()) - if (isinstance(busIndipendentMsg, busIndipendentMessages.ErrorMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.ErrorMessage)): return xmppMessages.XMPPErrorMessage(busIndipendentMsg.originator, self, busIndipendentMsg.msg, busIndipendentMsg.id) - if (isinstance(busIndipendentMsg, busIndipendentMessages.AbortMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.AbortMessage)): return xmppMessages.XMPPErrorMessage(busIndipendentMsg.originator, self, busIndipendentMsg.msg, busIndipendentMsg.id) - if (isinstance(busIndipendentMsg, busIndipendentMessages.LoadAverageMessage)): + if (isinstance(busIndipendentMsg, busIndependentMessages.LoadAverageMessage)): return xmppMessages.XMPPLoadAverageMessage(busIndipendentMsg.originator, self, busIndipendentMsg.outputs()) diff --git a/src/wpsremote/xmpp_data/configs/myservice/code/test.py b/src/wpsremote/xmpp_data/configs/myservice/code/test.py index b057732..088a964 100644 --- a/src/wpsremote/xmpp_data/configs/myservice/code/test.py +++ b/src/wpsremote/xmpp_data/configs/myservice/code/test.py @@ -35,7 +35,9 @@ def run(self): output_dir = '/tmp/%s' % self.args.execution_id if not os.path.exists(output_dir): os.makedirs(output_dir) - # trg = '%s/../../../output/%s/%s.shp' % (os.path.dirname(os.path.abspath(__file__)), self.args.execution_id, dst) + """ + trg = '%s/../../../output/%s/%s.shp' % (os.path.dirname(os.path.abspath(__file__)), self.args.execution_id, dst) + """ trg = '%s/%s.shp' % (output_dir, dst) # fullCmd = ' '.join([gdalContour, cmd, self.youCanQuoteMe(src), \ @@ -59,9 +61,11 @@ def run(self): time.sleep(30) # Delays for 30 seconds. You can also use a float value. if (ret == 0): - # zipf = zipfile.ZipFile(self.args.workdir+'/contour.zip', 'w') - # self.zipdir(self.args.workdir+'/', zipf) - # output_dir = '%s/../../../output/%s' % (os.path.dirname(os.path.abspath(__file__)), self.args.execution_id) + """ + zipf = zipfile.ZipFile(self.args.workdir+'/contour.zip', 'w') + self.zipdir(self.args.workdir+'/', zipf) + output_dir = '%s/../../../output/%s' % (os.path.dirname(os.path.abspath(__file__)), self.args.execution_id) + """ zipf = zipfile.ZipFile(output_dir+'/contour.zip', 'w') self.zipdir(output_dir+'/', zipf) zipf.close() diff --git a/test/test_bus_independent_messages.py b/test/test_bus_independent_messages.py index f89bb9d..a2a0b53 100644 --- a/test/test_bus_independent_messages.py +++ b/test/test_bus_independent_messages.py @@ -9,7 +9,7 @@ import mock import pickle import wpsremote.configInstance as configInstance -from wpsremote.busIndipendentMessages import ( +from wpsremote.busIndependentMessages import ( RegisterMessage, ProgressMessage, LogMessage, CompletedMessage, ErrorMessage, AbortMessage, LoadAverageMessage, InviteMessage, GetLoadAverageMessage, ExecuteMessage, FinishMessage ) diff --git a/test/test_path.py b/test/test_path.py index 83341ac..c3dbf66 100644 --- a/test/test_path.py +++ b/test/test_path.py @@ -4,6 +4,7 @@ # This code is licensed under the GPL 2.0 license, available at the root # application directory. +import sys import unittest import wpsremote.path as path @@ -84,7 +85,11 @@ def test_path_methods(self): [path.path('./src/wpsremote/xmpp_data/test/test_dir')] ) existing_file = path.path("./src/wpsremote/xmpp_data/test/test_file") - self.assertIsInstance(existing_file.open(), file) + if sys.version_info[0] < 3: + self.assertIsInstance(existing_file.open(), file) + else: + from io import IOBase + self.assertIsInstance(existing_file.open(), IOBase) self.assertEqual(existing_file.bytes(), "test content") existing_file.write_bytes("test file to write") self.assertEqual(existing_file.bytes(), "test file to write")