python2.6 support, review comment performance of set([])

9 files changed, 53 insertions, 53 deletions

diff --git a/src/software/lmi/software/LMI_SoftwareIdentityResource.py b/src/software/lmi/software/LMI_SoftwareIdentityResource.py
index dd1c4a9..09bf915 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 set((
                 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 29749c4..0f8d61c 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 set((
+                    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/InstallationService.py b/src/software/lmi/software/core/InstallationService.py
index 9bb085b..6cc079c 100644
--- a/src/software/lmi/software/core/InstallationService.py
+++ b/src/software/lmi/software/core/InstallationService.py
@@ -175,13 +175,13 @@ class Values(object):
                 13 : "ScheduleInstallAt",
             }
 
-        InstallOptions.supported = set([
+        InstallOptions.supported = set((
             InstallOptions.Install,
             InstallOptions.Update,
             InstallOptions.Uninstall,
             InstallOptions.Force_installation,
             InstallOptions.Repair,
-        ])
+        ))
 
 
     class CheckSoftwareIdentity(object):
@@ -681,7 +681,7 @@ def _install_or_remove_check_params(
     elif not isinstance(install_options, list):
         raise InstallationError(values.Unspecified_Error,
                 "InstallOptions must be a list of uint16 values.")
-    options = set([p for p in install_options])
+    options = set((p for p in install_options))
 
     if options - supported_options:
         raise InstallationError(values.Unspecified_Error,
@@ -700,10 +700,10 @@ def _install_or_remove_check_params(
                         "install option \"%s\" can not have any"
                         " associated value: %s" % (opt, val))
     _check_target_and_collection(env, method, target, collection)
-    exclusive = [opt for opt in options if opt in set([
+    exclusive = [opt for opt in options if opt in set((
         values.InstallOptions.Install,
         values.InstallOptions.Update,
-        values.InstallOptions.Uninstall ])]
+        values.InstallOptions.Uninstall ))]
     if len(exclusive) > 1:
         raise InstallationError(values.Unspecified_Error,
             "specified more than one mutually exclusive option at once: {%s}" %
diff --git a/src/software/lmi/software/core/Job.py b/src/software/lmi/software/core/Job.py
index 05a684b..92364e6 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." % (
@@ -709,8 +709,8 @@ def modify_instance(instance):
             "deleteoncompletion" : "delete_on_completion",
             "timebeforeremoval"  : "time_before_removal"
     }
-    metadata_props = set(["name"])
-    reschedule_props = set(["delete_on_completion", "time_before_removal"])
+    metadata_props = set(("name"))
+    reschedule_props = set(("delete_on_completion", "time_before_removal"))
     for name, prop in instance.properties.items():
         if prop is None:
             LOG().warn('property "%s" is None', name)
diff --git a/src/software/lmi/software/yumdb/jobmanager.py b/src/software/lmi/software/yumdb/jobmanager.py
index cb5fff2..b133e8e 100644
--- a/src/software/lmi/software/yumdb/jobmanager.py
+++ b/src/software/lmi/software/yumdb/jobmanager.py
@@ -168,7 +168,7 @@ class JobIndicationSender(object):
         :param list indication_ids: Can be even single id.
         """
         if isinstance(indication_ids, basestring):
-            indication_ids = set([indication_ids])
+            indication_ids = set((indication_ids))
         self._indications = set(indication_ids)
 
     @cmpi_logging.trace_method
@@ -177,7 +177,7 @@ class JobIndicationSender(object):
         Add filter IDs.
         """
         if isinstance(indication_ids, basestring):
-            indication_ids = set([indication_ids])
+            indication_ids = set((indication_ids))
         self._indications.update(indication_ids)
 
     @cmpi_logging.trace_method
diff --git a/src/software/lmi/software/yumdb/repository.py b/src/software/lmi/software/yumdb/repository.py
index 59a9e69..3d85c15 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 set(("arch", "basearch", "releasever")):
         val = repo.yumvar[prop_name]
-    elif prop_name in set(["revision", "last_update"]):
+    elif prop_name in set(("revision", "last_update")):
         if repo.enabled and repo.repoXML:
             md = repo.repoXML
             if prop_name == "last_update":
diff --git a/src/software/test/test_hosted_software_identity_resource.py b/src/software/test/test_hosted_software_identity_resource.py
index e897881..aa99f90 100644
--- a/src/software/test/test_hosted_software_identity_resource.py
+++ b/src/software/test/test_hosted_software_identity_resource.py
@@ -156,8 +156,8 @@ class TestHostedSoftwareIdentityResource(swbase.SwTestCase):
             objpath = self.make_op(repo)
             self.assertCIMNameEqual(ref.path, objpath.Dependent)
             self.assertEqual(set(ref.path.key_properties()),
-                    set(["CreationClassName", "Name",
-                          "SystemCreationClassName", "SystemName"]))
+                    set(("CreationClassName", "Name",
+                          "SystemCreationClassName", "SystemName")))
             if repo.status:
                 self.assertEqual(ref.EnabledState, ENABLED_STATE_ENABLED,
                         "EnabledState does not match for repo %s" % repo.repoid)
@@ -195,8 +195,8 @@ class TestHostedSoftwareIdentityResource(swbase.SwTestCase):
             objpath = self.make_op(repo)
             self.assertCIMNameEqual(objpath.Dependent, ref)
             self.assertEqual(set(ref.key_properties()),
-                    set(["CreationClassName", "Name",
-                          "SystemCreationClassName", "SystemName"]))
+                    set(("CreationClassName", "Name",
+                          "SystemCreationClassName", "SystemName")))
             repos.remove(ref.Name)
         self.assertEqual(len(repos), 0)
 
diff --git a/src/software/test/test_resource_for_software_identity.py b/src/software/test/test_resource_for_software_identity.py
index 9b89cf4..651d7c6 100644
--- a/src/software/test/test_resource_for_software_identity.py
+++ b/src/software/test/test_resource_for_software_identity.py
@@ -233,8 +233,8 @@ class TestResourceForSoftwareIdentity(swbase.SwTestCase):
             self.assertEqual(ref.namespace, 'root/cimv2')
             self.assertEqual(ref.classname, "LMI_SoftwareIdentityResource")
             self.assertEqual(set(ref.key_properties()),
-                    set(["SystemCreationClassName", "SystemName",
-                        "Name", "CreationClassName"]))
+                    set(("SystemCreationClassName", "SystemName",
+                        "Name", "CreationClassName")))
             self.assertEqual(ref.Name, pkg.repoid,
                     'Repository name does not match for pkg "%s"'
                     % pkg.nevra)
@@ -268,8 +268,8 @@ class TestResourceForSoftwareIdentity(swbase.SwTestCase):
             self.assertEqual(ref.namespace, 'root/cimv2')
             self.assertEqual(ref.classname, "LMI_SoftwareIdentityResource")
             self.assertEqual(set(ref.path.key_properties()),
-                    set(["SystemCreationClassName", "SystemName",
-                        "Name", "CreationClassName"]))
+                    set(("SystemCreationClassName", "SystemName",
+                        "Name", "CreationClassName")))
             self.assertEqual(ref.Name, pkg.repoid,
                     'Repository name does not match for pkg "%s"'
                     % pkg.nevra)
diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py
index 60c18cc..b1d278d 100644
--- a/src/software/test/test_software_identity_file_check.py
+++ b/src/software/test/test_software_identity_file_check.py
@@ -205,7 +205,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         os.lchown(filepath, inst.UserIDOriginal, inst.GroupIDOriginal)
 
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_TARGET]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_TARGET)))
         self.assertGreater(len(inst.LinkTarget), len(inst.LinkTargetOriginal))
 
         self.assertTrue(inst.FileExists,
@@ -281,11 +281,11 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         with open(filepath, "a+") as fobj:
             fobj.write("data\n")
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([
+        self.assertEqual(set(inst.FailedFlags), set((
                 FAILED_FLAGS_SIZE,
                 FAILED_FLAGS_CHECKSUM,
                 FAILED_FLAGS_MTIME,
-            ]))
+            )))
 
         self.assertGreater(inst.FileSize, inst.FileSizeOriginal,
                 "File size should be greater, then expected for regular file"
@@ -374,7 +374,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         os.chmod(filepath, 0644)
         self.assertTrue(os.path.exists(filepath))
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_DEVNUM]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_DEVNUM)))
         self.assertEqual(inst.FileMode, stats.st_mode)
 
     def check_filepath(self, pkg, filepath):
@@ -563,57 +563,57 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         objpath.wrapped_object["Name"] = permsdir + 'rw-rw-rw-'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 0666)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR,
-            FILE_MODE_WOTH, FILE_MODE_WGRP, FILE_MODE_WUSR]))
+            FILE_MODE_WOTH, FILE_MODE_WGRP, FILE_MODE_WUSR)))
 
         objpath.wrapped_object["Name"] = permsdir + 'r--r--r--'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 0444)
-        self.assertEqual(set(inst.FileModeFlags), set([
-            FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR]))
+        self.assertEqual(set(inst.FileModeFlags), set((
+            FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR)))
 
         objpath.wrapped_object["Name"] = permsdir + 'r-xr-xr-x'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 0555)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR,
             FILE_MODE_XOTH, FILE_MODE_XGRP, FILE_MODE_XUSR]))
 
         objpath.wrapped_object["Name"] = permsdir + 'r---w---x'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 0421)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_RUSR, FILE_MODE_WGRP, FILE_MODE_XOTH]))
 
         objpath.wrapped_object["Name"] = permsdir + 'rwSr--r--'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 04644)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_RUSR, FILE_MODE_WUSR,
             FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SUID]))
 
         objpath.wrapped_object["Name"] = permsdir + 'rw-r-Sr--'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 02644)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_RUSR, FILE_MODE_WUSR,
-            FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SGID]))
+            FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SGID)))
 
         objpath.wrapped_object["Name"] = permsdir + 'rw-r--r-T'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 01644)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_RUSR, FILE_MODE_WUSR,
-            FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SVTX]))
+            FILE_MODE_RGRP, FILE_MODE_ROTH, FILE_MODE_SVTX)))
 
         objpath.wrapped_object["Name"] = permsdir + 'rwsr-sr-t'
         inst = objpath.to_instance()
         self.assertEqual(inst.FileMode, stat.S_IFREG | 07755)
-        self.assertEqual(set(inst.FileModeFlags), set([
+        self.assertEqual(set(inst.FileModeFlags), set((
             FILE_MODE_ROTH, FILE_MODE_RGRP, FILE_MODE_RUSR,
             FILE_MODE_XOTH, FILE_MODE_XGRP, FILE_MODE_XUSR,
-            FILE_MODE_WUSR, FILE_MODE_SUID, FILE_MODE_SGID, FILE_MODE_SVTX]))
+            FILE_MODE_WUSR, FILE_MODE_SUID, FILE_MODE_SGID, FILE_MODE_SVTX)))
 
     @enable_lmi_exceptions
     def test_enum_instance_names(self):
@@ -653,7 +653,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_MODE]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE)))
 
         # restore it
         shutil.copy(backup, fp)
@@ -673,7 +673,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
         self.assertEqual(set(inst.FailedFlags),
-                set([FAILED_FLAGS_SIZE, FAILED_FLAGS_CHECKSUM]))
+                set((FAILED_FLAGS_SIZE, FAILED_FLAGS_CHECKSUM)))
 
         # restore it
         shutil.copy(backup, fp)
@@ -690,7 +690,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_MTIME]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MTIME)))
 
     @enable_lmi_exceptions
     @swbase.test_with_packages('stable#pkg1')
@@ -742,7 +742,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_UID]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_UID)))
 
         # remove symlink
         os.remove(fp)
@@ -751,7 +751,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_EXISTENCE]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_EXISTENCE)))
 
         # restore it (mtime)
         os.symlink("../data/target.txt", fp)
@@ -769,7 +769,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_TARGET]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_TARGET)))
 
     @swbase.test_with_packages('stable#pkg3')
     def test_method_invoke_on_fifo(self):
@@ -804,7 +804,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_UID]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_UID)))
 
         # remove fifo
         os.remove(fp)
@@ -813,7 +813,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_EXISTENCE]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_EXISTENCE)))
 
         # restore it
         os.mkfifo(fp, 0644)
@@ -832,7 +832,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_MODE]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE)))
 
         # replace it with regular file
         os.remove(fp)
@@ -847,7 +847,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
         self.assertEqual(inst.FileType, FILE_TYPE_FILE)
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_MODE]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE)))
 
     @swbase.test_with_packages('stable#pkg4')
     def test_method_invoke_on_directory(self):
@@ -890,7 +890,7 @@ class TestSoftwareIdentityFileCheck(swbase.SwTestCase):
         (rval, _, _) = inst.InvokeOnSystem(TargetSystem=self.system_iname)
         self.assertEqual(rval, INVOKE_NOT_SATISFIED)
         inst.refresh()
-        self.assertEqual(set(inst.FailedFlags), set([FAILED_FLAGS_MODE]))
+        self.assertEqual(set(inst.FailedFlags), set((FAILED_FLAGS_MODE)))
 
 def suite():
     """For unittest loaders."""