apibuild: Remove whitespace before ', ' and ':'

PEP8 recommends removing whitespace immediately before a comma,
semicolon, or colon [1]. In addition remove multiple spaces after
keyword (PEP8 - E271).

1: https://www.python.org/dev/peps/pep-0008/#whitespace-in-expressions-and-statements

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
This commit is contained in:
Radostin Stoyanov 2018-03-20 06:48:46 +00:00 committed by Daniel P. Berrangé
parent 6d43a754af
commit 28593b5b54
4 changed files with 127 additions and 131 deletions

View File

@ -1825,8 +1825,8 @@ class CParser:
# this dict contains the functions that are allowed to use [unsigned] # this dict contains the functions that are allowed to use [unsigned]
# long for legacy reasons in their signature and return type. this list is # long for legacy reasons in their signature and return type. this list is
# fixed. new procedures and public APIs have to use [unsigned] long long # fixed. new procedures and public APIs have to use [unsigned] long long
long_legacy_functions = \ long_legacy_functions = {
{ "virGetVersion" : (False, ("libVer", "typeVer")), "virGetVersion": (False, ("libVer", "typeVer")),
"virConnectGetLibVersion": (False, ("libVer")), "virConnectGetLibVersion": (False, ("libVer")),
"virConnectGetVersion": (False, ("hvVer")), "virConnectGetVersion": (False, ("hvVer")),
"virDomainGetMaxMemory": (True, ()), "virDomainGetMaxMemory": (True, ()),
@ -1859,7 +1859,8 @@ class CParser:
"virDomainBlockJobSetSpeed": (False, ("bandwidth")), "virDomainBlockJobSetSpeed": (False, ("bandwidth")),
"virDomainBlockPull": (False, ("bandwidth")), "virDomainBlockPull": (False, ("bandwidth")),
"virDomainBlockRebase": (False, ("bandwidth")), "virDomainBlockRebase": (False, ("bandwidth")),
"virDomainMigrateGetMaxSpeed" : (False, ("bandwidth")) } "virDomainMigrateGetMaxSpeed": (False, ("bandwidth"))
}
def checkLongLegacyFunction(self, name, return_type, signature): def checkLongLegacyFunction(self, name, return_type, signature):
if "long" in return_type and "long long" not in return_type: if "long" in return_type and "long long" not in return_type:
@ -1883,10 +1884,11 @@ class CParser:
# this dict contains the structs that are allowed to use [unsigned] # this dict contains the structs that are allowed to use [unsigned]
# long for legacy reasons. this list is fixed. new structs have to use # long for legacy reasons. this list is fixed. new structs have to use
# [unsigned] long long # [unsigned] long long
long_legacy_struct_fields = \ long_legacy_struct_fields = {
{ "_virDomainInfo" : ("maxMem", "memory"), "_virDomainInfo": ("maxMem", "memory"),
"_virNodeInfo": ("memory"), "_virNodeInfo": ("memory"),
"_virDomainBlockJobInfo" : ("bandwidth") } "_virDomainBlockJobInfo": ("bandwidth")
}
def checkLongLegacyStruct(self, name, fields): def checkLongLegacyStruct(self, name, fields):
for field in fields: for field in fields:

View File

@ -1342,61 +1342,53 @@ predefined_objects = ["AnyType",
"MethodFault", "MethodFault",
"ManagedObjectReference"] "ManagedObjectReference"]
additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE, additional_enum_features = {
"ManagedEntityStatus": Enum.FEATURE__ANY_TYPE,
"TaskInfoState": Enum.FEATURE__ANY_TYPE, "TaskInfoState": Enum.FEATURE__ANY_TYPE,
"VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } "VirtualMachinePowerState": Enum.FEATURE__ANY_TYPE
}
additional_object_features = { "AutoStartDefaults" : Object.FEATURE__ANY_TYPE, additional_object_features = {
"AutoStartDefaults": Object.FEATURE__ANY_TYPE,
"AutoStartPowerInfo": Object.FEATURE__ANY_TYPE, "AutoStartPowerInfo": Object.FEATURE__ANY_TYPE,
"DatastoreHostMount" : Object.FEATURE__DEEP_COPY | "DatastoreHostMount": (Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST |
Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE),
Object.FEATURE__ANY_TYPE, "DatastoreInfo": Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST,
"DatastoreInfo" : Object.FEATURE__ANY_TYPE |
Object.FEATURE__DYNAMIC_CAST,
"HostConfigManager": Object.FEATURE__ANY_TYPE, "HostConfigManager": Object.FEATURE__ANY_TYPE,
"HostCpuIdInfo" : Object.FEATURE__LIST | "HostCpuIdInfo": Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE,
Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults": (Object.FEATURE__LIST |
"HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE),
Object.FEATURE__ANY_TYPE, "HostHostBusAdapter": Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE,
"HostHostBusAdapter" : Object.FEATURE__LIST | "HostInternetScsiHba": (Object.FEATURE__DYNAMIC_CAST |
Object.FEATURE__ANY_TYPE, Object.FEATURE__DEEP_COPY),
"HostInternetScsiHba" : Object.FEATURE__DYNAMIC_CAST |
Object.FEATURE__DEEP_COPY,
"HostInternetScsiTargetTransport": Object.FEATURE__DYNAMIC_CAST, "HostInternetScsiTargetTransport": Object.FEATURE__DYNAMIC_CAST,
"HostScsiDisk" : Object.FEATURE__LIST | "HostScsiDisk": (Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE |
Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST),
Object.FEATURE__DYNAMIC_CAST, "HostScsiTopologyInterface": (Object.FEATURE__LIST |
"HostScsiTopologyInterface" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE),
Object.FEATURE__ANY_TYPE, "HostScsiTopologyLun": (Object.FEATURE__ANY_TYPE | Object.FEATURE__LIST |
"HostScsiTopologyLun" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DEEP_COPY),
Object.FEATURE__LIST | "HostScsiTopologyTarget": Object.FEATURE__ANY_TYPE | Object.FEATURE__LIST,
Object.FEATURE__DEEP_COPY, "HostPortGroup": Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE,
"HostScsiTopologyTarget" : Object.FEATURE__ANY_TYPE | "HostVirtualSwitch": (Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST |
Object.FEATURE__LIST, Object.FEATURE__ANY_TYPE),
"HostPortGroup" : Object.FEATURE__LIST |
Object.FEATURE__ANY_TYPE,
"HostVirtualSwitch" : Object.FEATURE__DEEP_COPY |
Object.FEATURE__LIST |
Object.FEATURE__ANY_TYPE,
"ManagedObjectReference": Object.FEATURE__ANY_TYPE, "ManagedObjectReference": Object.FEATURE__ANY_TYPE,
"ObjectContent": Object.FEATURE__DEEP_COPY, "ObjectContent": Object.FEATURE__DEEP_COPY,
"PhysicalNic" : Object.FEATURE__DEEP_COPY | "PhysicalNic": (Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST |
Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE),
Object.FEATURE__ANY_TYPE,
"ResourcePoolResourceUsage": Object.FEATURE__ANY_TYPE, "ResourcePoolResourceUsage": Object.FEATURE__ANY_TYPE,
"ScsiLun" : Object.FEATURE__LIST | "ScsiLun": (Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE |
Object.FEATURE__ANY_TYPE | Object.FEATURE__DEEP_COPY),
Object.FEATURE__DEEP_COPY,
"ScsiLunDurableName": Object.FEATURE__LIST, "ScsiLunDurableName": Object.FEATURE__LIST,
"ServiceContent": Object.FEATURE__DESERIALIZE, "ServiceContent": Object.FEATURE__DESERIALIZE,
"SharesInfo": Object.FEATURE__ANY_TYPE, "SharesInfo": Object.FEATURE__ANY_TYPE,
"TaskInfo" : Object.FEATURE__LIST | "TaskInfo": Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE,
Object.FEATURE__ANY_TYPE,
"UserSession": Object.FEATURE__ANY_TYPE, "UserSession": Object.FEATURE__ANY_TYPE,
"VirtualMachineQuestionInfo": Object.FEATURE__ANY_TYPE, "VirtualMachineQuestionInfo": Object.FEATURE__ANY_TYPE,
"VirtualMachineSnapshotTree" : Object.FEATURE__DEEP_COPY | "VirtualMachineSnapshotTree": (Object.FEATURE__DEEP_COPY |
Object.FEATURE__ANY_TYPE, Object.FEATURE__ANY_TYPE),
"VmEventArgument" : Object.FEATURE__DESERIALIZE } "VmEventArgument": Object.FEATURE__DESERIALIZE
}
removed_object_features = {} removed_object_features = {}

View File

@ -342,7 +342,8 @@ class WmiClassVersion:
class Property: class Property:
typemap = {"boolean" : "BOOL", typemap = {
"boolean": "BOOL",
"string": "STR", "string": "STR",
"datetime": "STR", "datetime": "STR",
"int8": "INT8", "int8": "INT8",
@ -356,7 +357,8 @@ class Property:
"uint8": "UINT8", "uint8": "UINT8",
"uint16": "UINT16", "uint16": "UINT16",
"uint32": "UINT32", "uint32": "UINT32",
"uint64" : "UINT64"} "uint64": "UINT64"
}
def __init__(self, type, name, is_array): def __init__(self, type, name, is_array):