summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAles Ledvinka <aledvink@redhat.com>2014-04-14 11:20:29 +0200
committerAles Ledvinka <aledvink@redhat.com>2014-04-14 11:20:29 +0200
commitfd34bd01f207a1bf61755597b4d43c5bc49d76e5 (patch)
tree77e0f6f315e3522343fd1dc0f819b8b45a8ccfa3 /src
parent0dc22d1e636d5b2d17e560bdcce6b5ae51a4e0b9 (diff)
downloadopenlmi-providers-fd34bd01f207a1bf61755597b4d43c5bc49d76e5.tar.gz
openlmi-providers-fd34bd01f207a1bf61755597b4d43c5bc49d76e5.tar.xz
openlmi-providers-fd34bd01f207a1bf61755597b4d43c5bc49d76e5.zip
python2.6 syntax conversion, review comments for set performance
Diffstat (limited to 'src')
-rw-r--r--src/software/lmi/software/LMI_SoftwareIdentityResource.py4
-rw-r--r--src/software/lmi/software/LMI_SoftwareJob.py4
-rw-r--r--src/software/lmi/software/core/Job.py4
-rw-r--r--src/software/lmi/software/yumdb/repository.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/software/lmi/software/LMI_SoftwareIdentityResource.py b/src/software/lmi/software/LMI_SoftwareIdentityResource.py
index 09bf915..f339bb4 100644
--- a/src/software/lmi/software/LMI_SoftwareIdentityResource.py
+++ b/src/software/lmi/software/LMI_SoftwareIdentityResource.py
@@ -240,9 +240,9 @@ class LMI_SoftwareIdentityResource(CIMProvider2):
return ( self.values.RequestStateChange. \
Use_of_Timeout_Parameter_Not_Supported
, out_params)
- if param_requestedstate not in set((
+ if param_requestedstate not in (
self.values.RequestStateChange.RequestedState.Enabled,
- self.values.RequestStateChange.RequestedState.Disabled )):
+ self.values.RequestStateChange.RequestedState.Disabled ):
return ( self.values.RequestStateChange.Invalid_State_Transition
, out_params)
diff --git a/src/software/lmi/software/LMI_SoftwareJob.py b/src/software/lmi/software/LMI_SoftwareJob.py
index 0f8d61c..254272a 100644
--- a/src/software/lmi/software/LMI_SoftwareJob.py
+++ b/src/software/lmi/software/LMI_SoftwareJob.py
@@ -233,8 +233,8 @@ class LMI_SoftwareJob(CIMProvider2):
"""
job = Job.object_path2job(object_name)
try:
- if param_requestedstate not in set((
- self.values.RequestStateChange.RequestedState.Terminate )):
+ if param_requestedstate not in (
+ self.values.RequestStateChange.RequestedState.Terminate ):
raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER,
"Valid RequestedState can by only Terminate (%d)" %
self.values.RequestStateChange.RequestedState.Terminate)
diff --git a/src/software/lmi/software/core/Job.py b/src/software/lmi/software/core/Job.py
index 92364e6..697a6f5 100644
--- a/src/software/lmi/software/core/Job.py
+++ b/src/software/lmi/software/core/Job.py
@@ -672,8 +672,8 @@ def object_path2job(op):
"Missing InstanceID key property.")
instid = op['InstanceID']
match = util.RE_INSTANCE_ID.match(instid)
- if not match or match.group('clsname').lower() not in set((
- c.lower() for c in JOB_CLASS_NAMES)):
+ if not match or match.group('clsname').lower() not in set(
+ c.lower() for c in JOB_CLASS_NAMES):
raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER,
"InstanceID must start with one of {%s} prefixes."
" And end with positive integer." % (
diff --git a/src/software/lmi/software/yumdb/repository.py b/src/software/lmi/software/yumdb/repository.py
index 3d85c15..08de694 100644
--- a/src/software/lmi/software/yumdb/repository.py
+++ b/src/software/lmi/software/yumdb/repository.py
@@ -63,9 +63,9 @@ def get_prop_from_yum_repo(repo, prop_name):
val = None
elif prop_name == "ready":
val = val()
- elif prop_name in set(("arch", "basearch", "releasever")):
+ elif prop_name in ("arch", "basearch", "releasever"):
val = repo.yumvar[prop_name]
- elif prop_name in set(("revision", "last_update")):
+ elif prop_name in ("revision", "last_update"):
if repo.enabled and repo.repoXML:
md = repo.repoXML
if prop_name == "last_update":