Skip to content

Commit

Permalink
Format with black
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyaglow committed Jul 13, 2018
1 parent f5bb9a4 commit ec616e3
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 16 deletions.
39 changes: 28 additions & 11 deletions remotevbox/machine.py
Expand Up @@ -115,7 +115,9 @@ def coredump(self, filepath, add_time_suffix=False):

self.service.IMachineDebugger_dumpGuestCore(imdebugger, filepath, "")
except zeep.exceptions.Fault as err:
raise MachineCoredumpError("Coredump of guest's memory failed: {}".format(err.message))
raise MachineCoredumpError(
"Coredump of guest's memory failed: {}".format(err.message)
)

def restore(self, snapshot_name=None):
if self.state() == self.RUNNING:
Expand Down Expand Up @@ -270,7 +272,9 @@ def poweroff(self):
)
iprogress.wait()
except zeep.exceptions.Fault as err:
raise MachinePowerdownError("Power down operation failed: {}".format(err.message))
raise MachinePowerdownError(
"Power down operation failed: {}".format(err.message)
)

if self._get_machine_session_state() == self.LOCKED and self._get_session_state() == self.LOCKED:
self.unlock()
Expand All @@ -288,7 +292,9 @@ def _get_extradata_keys(self):
try:
keys = self.service.IMachine_getExtraDataKeys(self.mid)
except zeep.exceptions.Fault as err:
raise MachineExtraDataError("ExtraDataKeys operation failed: {}".format(err.message))
raise MachineExtraDataError(
"ExtraDataKeys operation failed: {}".format(err.message)
)

return keys

Expand All @@ -306,7 +312,9 @@ def extradata(self, key=None):
try:
return_value = self.service.IMachine_getExtraData(self.mid, key)
except zeep.exceptions.Fault as err:
raise MachineExtraDataError("Extradata operation failed: {}".format(err.message))
raise MachineExtraDataError(
"Extradata operation failed: {}".format(err.message)
)

return return_value

Expand All @@ -320,7 +328,9 @@ def set_extradata(self, key, value):
m2 = self.service.ISession_getMachine(self.session)
self.service.IMachine_setExtraData(m2, key, value)
except zeep.exceptions.Fault as err:
raise MachineExtraDataError("Extradata operation failed: {}".format(err.message))
raise MachineExtraDataError(
"Extradata operation failed: {}".format(err.message)
)

if self._get_machine_session_state() == self.LOCKED:
self.unlock()
Expand All @@ -333,8 +343,7 @@ def info(self, key):
except zeep.exceptions.Fault as err:
raise MachineInfoError(
"Info error happened while trying to get key: {}. Message was: {}".format(
key,
err.message,
key, err.message
)
)

Expand All @@ -351,7 +360,9 @@ def vrde_info(self):
value = self.service.IVRDEServer_getVRDEProperty(server, property_name)
info[property_name] = value
except zeep.exceptions.Fault as err:
raise MachineVrdeInfoError("Failed to return information about VRDE server: {}".format(err.message))
raise MachineVrdeInfoError(
"Failed to return information about VRDE server: {}".format(err.message)
)

return info

Expand Down Expand Up @@ -443,15 +454,21 @@ def enable_trace(self, filename):
try:
self.service.INetworkAdapter_setTraceEnabled(self.adapter, True)
except zeep.exceptions.Fault as err:
raise MachineEnableNetTraceError("Failed to enable net trace: {}".format(err.message))
raise MachineEnableNetTraceError(
"Failed to enable net trace: {}".format(err.message)
)

try:
self.service.INetworkAdapter_setTraceFile(self.adapter, filename)
except zeep.exceptions.Fault as err:
raise MachineSetTraceFileError("Failed to set pcap trace file: {}".format(err.message))
raise MachineSetTraceFileError(
"Failed to set pcap trace file: {}".format(err.message)
)

def disable_trace(self):
try:
self.service.INetworkAdapter_setTraceEnabled(self.adapter, False)
except zeep.exceptions.Fault as err:
raise MachineDisableNetTraceError("Failed to disable net trace: {}".format(err.message))
raise MachineDisableNetTraceError(
"Failed to disable net trace: {}".format(err.message)
)
6 changes: 1 addition & 5 deletions remotevbox/vbox.py
Expand Up @@ -7,11 +7,7 @@

from .machine import IMachine
from .websession_manager import IWebsessionManager
from .exceptions import (
FindMachineError,
ListMachinesError,
WebServiceConnectionError,
)
from .exceptions import (FindMachineError, ListMachinesError, WebServiceConnectionError)

VBOX_SOAP_BINDING = "{http://www.virtualbox.org/}vboxBinding"

Expand Down

0 comments on commit ec616e3

Please sign in to comment.