commit a4cbf5ba86d196b236cc58ad2dee2f3317e1ee10 Author: Marek 'marx' Grac Date: Mon Sep 8 15:02:53 2014 +0200 [clenaup] Fix whitespace convention issues diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 557358a..640f81a 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -719,7 +719,6 @@ def check_input(device_opt, opt): logging.getLogger().addHandler(SyslogLibHandler()) ## add loggint to stderr logging.getLogger().addHandler(logging.StreamHandler(stream=sys.stderr)) - acceptable_actions = ["on", "off", "status", "list", "monitor"] if 1 == device_opt.count("fabric_fencing"): @@ -1159,9 +1158,8 @@ def fence_logout(conn, logout_string, sleep=0): def array_to_dict(ar): return dict([[x[0].split(".")[-1], x[1]] for x in ar]) - ## Own logger handler that uses old-style syslog handler as otherwise everything is sourced -## from /dev/syslog +## from /dev/syslog class SyslogLibHandler(logging.StreamHandler): """ A handler class that correctly push messages into syslog diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 2cea105..e47f11e 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -11,7 +11,7 @@ from suds.sudsobject import Property from suds.transport.http import HttpAuthenticated from suds.transport import Reply, TransportError from fencing import * -from fencing import fail, EC_STATUS, EC_LOGIN_DENIED, EC_INVALID_PRIVILEGES, EC_WAITING_ON, EC_WAITING_OFF +from fencing import fail, fail_usage, EC_STATUS, EC_LOGIN_DENIED, EC_INVALID_PRIVILEGES, EC_WAITING_ON, EC_WAITING_OFF from fencing import run_delay #BEGIN_VERSION_GENERATION @@ -33,7 +33,7 @@ class RequestsTransport(HttpAuthenticated): def send(self, request): self.addcredentials(request) - resp = self.session.post(request.url, data = request.message, headers = request.headers, cert = self.cert, verify = self.verify) + resp = self.session.post(request.url, data=request.message, headers=request.headers, cert=self.cert, verify=self.verify) result = Reply(resp.status_code, resp.headers, resp.content) return result @@ -58,7 +58,7 @@ def soap_login(options): try: headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : ""} - conn = Client(url + "/vimService.wsdl", location = url, transport = RequestsTransport(verify = verify), headers = headers) + conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers) mo_ServiceInstance = Property('ServiceInstance') mo_ServiceInstance._type = 'ServiceInstance'