Change in vdsm[master]: Replace 'has_key' with 'in'

asegurap at redhat.com asegurap at redhat.com
Wed Oct 24 11:08:42 UTC 2012


Antoni Segura Puimedon has uploaded a new change for review.

Change subject: Replace 'has_key' with 'in'
......................................................................

Replace 'has_key' with 'in'

Replace the dictionary method 'has_key' for the more
pythonic and forwards compatible 'in' operator.

Change-Id: Ia5e94594422ec3edbcd82002f1c124fbb10a9fae
Signed-off-by: Antoni S. Puimedon <asegurap at redhat.com>
---
M vdsm/storage/hsm.py
M vdsm/vm.py
M vdsm_hooks/directlun/after_vm_destroy.py
M vdsm_hooks/directlun/before_vm_migrate_destination.py
M vdsm_hooks/directlun/before_vm_start.py
M vdsm_hooks/floppy/before_vm_migrate_source.py
M vdsm_hooks/floppy/before_vm_start.py
M vdsm_hooks/hostusb/after_vm_destroy.py
M vdsm_hooks/hostusb/before_vm_migrate_source.py
M vdsm_hooks/hostusb/before_vm_start.py
M vdsm_hooks/hugepages/after_vm_destroy.py
M vdsm_hooks/hugepages/before_vm_migrate_destination.py
M vdsm_hooks/hugepages/before_vm_start.py
M vdsm_hooks/isolatedprivatevlan/before_vm_start.py
M vdsm_hooks/numa/before_vm_start.py
M vdsm_hooks/pincpu/before_vm_start.py
M vdsm_hooks/promisc/before_vm_destroy.py
M vdsm_hooks/qos/before_vm_start.py
M vdsm_hooks/smartcard/before_vm_start.py
M vdsm_hooks/smbios/before_vm_start.py
M vdsm_hooks/sriov/after_vm_destroy.py
M vdsm_hooks/sriov/before_vm_migrate_source.py
M vdsm_hooks/vmdisk/before_vm_start.py
M vdsm_reg/createDaemon.py
24 files changed, 26 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/8769/1

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 711354b..ab4faaa 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1582,7 +1582,7 @@
                     'physicalblocksize': dev.get("physicalblocksize", "")
                     }
             for path in devInfo["pathstatus"]:
-                if path.has_key("hbtl"):
+                if 'hbtl' in path:
                     path["lun"] = path["hbtl"].lun
                     del path["hbtl"]
                 del path["devnum"]
@@ -1988,7 +1988,7 @@
         """
         # FIXME: remove this method when iface selection is in higher interface
         typeName = CON_TYPE_ID_2_CON_TYPE[conTypeId]
-        if typeName == 'iscsi' and not conDef.has_key('initiatorName'):
+        if typeName == 'iscsi' and 'initiatorName' not in conDef:
             ifaces = config.get('irs', 'iscsi_default_ifaces').split(',')
             if 'iser' in ifaces:
                 conObj._iface = iscsi.IscsiInterface('iser')
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 11b79fd..6ad3bde 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -366,7 +366,7 @@
 
     def _normalizeVdsmImg(self, drv):
         drv['reqsize'] = drv.get('reqsize', '0')  # Backward compatible
-        if not drv.has_key('device'):
+        if 'device' not in drv:
             drv['device'] = 'disk'
 
         if drv['device'] == 'disk':
@@ -563,7 +563,7 @@
         drives = [(order, drv) for order, drv in enumerate(confDrives)]
         indexed = []
         for order, drv in drives:
-            if not self._usedIndices.has_key(drv['iface']):
+            if drv['iface'] not in self._usedIndices:
                 self._usedIndices[drv['iface']] = []
             idx = drv.get('index')
             if idx is not None:
diff --git a/vdsm_hooks/directlun/after_vm_destroy.py b/vdsm_hooks/directlun/after_vm_destroy.py
index 01a93e1..8b0a9c2 100755
--- a/vdsm_hooks/directlun/after_vm_destroy.py
+++ b/vdsm_hooks/directlun/after_vm_destroy.py
@@ -22,7 +22,7 @@
         sys.stderr.write('directlun after_vm_destroy: error rm -f %s, err = %s\n' % (devpath, err))
         sys.exit(2)
 
-if os.environ.has_key('directlun'):
+if 'directlun' in os.environ:
     try:
         luns = os.environ['directlun']
         domxml = hooking.read_domxml()
diff --git a/vdsm_hooks/directlun/before_vm_migrate_destination.py b/vdsm_hooks/directlun/before_vm_migrate_destination.py
index ea74020..ee57020 100755
--- a/vdsm_hooks/directlun/before_vm_migrate_destination.py
+++ b/vdsm_hooks/directlun/before_vm_migrate_destination.py
@@ -64,7 +64,7 @@
         sys.stderr.write('directlun: error chown %s to %s, err = %s\n' % (devpath, owner, err))
         sys.exit(2)
 
-if os.environ.has_key('directlun'):
+if 'directlun' in os.environ:
     try:
         luns = os.environ['directlun']
 
diff --git a/vdsm_hooks/directlun/before_vm_start.py b/vdsm_hooks/directlun/before_vm_start.py
index 4d56290..0fff56a 100755
--- a/vdsm_hooks/directlun/before_vm_start.py
+++ b/vdsm_hooks/directlun/before_vm_start.py
@@ -120,7 +120,7 @@
         sys.exit(2)
 
 
-if os.environ.has_key('directlun'):
+if 'directlun' in os.environ:
     try:
         luns = os.environ['directlun']
 
diff --git a/vdsm_hooks/floppy/before_vm_migrate_source.py b/vdsm_hooks/floppy/before_vm_migrate_source.py
index bd710b3..c700055 100755
--- a/vdsm_hooks/floppy/before_vm_migrate_source.py
+++ b/vdsm_hooks/floppy/before_vm_migrate_source.py
@@ -3,6 +3,6 @@
 import os
 import sys
 
-if os.environ.has_key('floppy'):
+if 'floppy' in os.environ:
     sys.stderr.write('floppy before_vm_migrate_source: cannot migrate VM with floppy hook\n')
     sys.exit(2)
diff --git a/vdsm_hooks/floppy/before_vm_start.py b/vdsm_hooks/floppy/before_vm_start.py
index d74d63a..4bc3e4b 100755
--- a/vdsm_hooks/floppy/before_vm_start.py
+++ b/vdsm_hooks/floppy/before_vm_start.py
@@ -23,7 +23,7 @@
     # modprobe floppy
 '''
 
-if os.environ.has_key('floppy'):
+if 'floppy' in os.environ:
     try:
         floppy = os.environ['floppy']
 
diff --git a/vdsm_hooks/hostusb/after_vm_destroy.py b/vdsm_hooks/hostusb/after_vm_destroy.py
index 0500c46..3f6e8c7 100755
--- a/vdsm_hooks/hostusb/after_vm_destroy.py
+++ b/vdsm_hooks/hostusb/after_vm_destroy.py
@@ -66,7 +66,7 @@
         sys.stderr.write('hostusb after_vm_destroy: error chown %s to %s, err = %s\n' % (devpath, owner, err))
         sys.exit(2)
 
-if os.environ.has_key('hostusb'):
+if 'hostusb' in os.environ:
     try:
         regex = re.compile('^0x[\d,A-F,a-f]{4}$')
         for usb in os.environ['hostusb'].split('&'):
diff --git a/vdsm_hooks/hostusb/before_vm_migrate_source.py b/vdsm_hooks/hostusb/before_vm_migrate_source.py
index b8f0b53..6bc5592 100755
--- a/vdsm_hooks/hostusb/before_vm_migrate_source.py
+++ b/vdsm_hooks/hostusb/before_vm_migrate_source.py
@@ -3,6 +3,6 @@
 import os
 import sys
 
-if os.environ.has_key('hostusb'):
+if 'hostusb' in os.environ:
     sys.stderr.write('hostusb: cannot migrate VM with host usb devices\n')
     sys.exit(2)
diff --git a/vdsm_hooks/hostusb/before_vm_start.py b/vdsm_hooks/hostusb/before_vm_start.py
index 747970c..3d3bbed 100755
--- a/vdsm_hooks/hostusb/before_vm_start.py
+++ b/vdsm_hooks/hostusb/before_vm_start.py
@@ -108,7 +108,7 @@
 
     return hostdev
 
-if os.environ.has_key('hostusb'):
+if 'hostusb' in os.environ:
     try:
         regex = re.compile('^0x[\d,A-F,a-f]{4}$')
         domxml = hooking.read_domxml()
diff --git a/vdsm_hooks/hugepages/after_vm_destroy.py b/vdsm_hooks/hugepages/after_vm_destroy.py
index aeb58b1..c28dfca 100755
--- a/vdsm_hooks/hugepages/after_vm_destroy.py
+++ b/vdsm_hooks/hugepages/after_vm_destroy.py
@@ -16,7 +16,7 @@
 
     sys.stderr.write('hugepages: removing %d huge pages\n' % pages)
 
-if os.environ.has_key('hugepages'):
+if 'hugepages' in os.environ:
     try:
         pages = int(os.environ.get('hugepages'))
 
diff --git a/vdsm_hooks/hugepages/before_vm_migrate_destination.py b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
index 6354e1c..9d28fdf 100755
--- a/vdsm_hooks/hugepages/before_vm_migrate_destination.py
+++ b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
@@ -41,7 +41,7 @@
             sys.exit(2)
 
 
-if os.environ.has_key('hugepages'):
+if 'hugepages' in os.environ:
     try:
         pages = int(os.environ.get('hugepages'))
 
diff --git a/vdsm_hooks/hugepages/before_vm_start.py b/vdsm_hooks/hugepages/before_vm_start.py
index a5198fb..23874ed 100755
--- a/vdsm_hooks/hugepages/before_vm_start.py
+++ b/vdsm_hooks/hugepages/before_vm_start.py
@@ -67,7 +67,7 @@
             sys.exit(2)
 
 
-if os.environ.has_key('hugepages'):
+if 'hugepages' in os.environ:
     try:
         domxml = hooking.read_domxml()
 
diff --git a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
index 708aa30..8332470 100755
--- a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
+++ b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
@@ -27,7 +27,7 @@
     parameter.setAttribute('value', gateway)
     filterref.appendChild(parameter)
 
-if os.environ.has_key('isolatedprivatevlan'):
+if 'isolatedprivatevlan' in os.environ:
     try:
         try:
             gateway, ip = os.environ['isolatedprivatevlan'].split(',')
diff --git a/vdsm_hooks/numa/before_vm_start.py b/vdsm_hooks/numa/before_vm_start.py
index f12e9cb..83e1f10 100755
--- a/vdsm_hooks/numa/before_vm_start.py
+++ b/vdsm_hooks/numa/before_vm_start.py
@@ -25,7 +25,7 @@
     numa=strict:1-4
 '''
 
-if os.environ.has_key('numa'):
+if 'numa' in os.environ:
     try:
         mode, nodeset = os.environ['numa'].split(':')
 
diff --git a/vdsm_hooks/pincpu/before_vm_start.py b/vdsm_hooks/pincpu/before_vm_start.py
index ec85c37..0377992 100755
--- a/vdsm_hooks/pincpu/before_vm_start.py
+++ b/vdsm_hooks/pincpu/before_vm_start.py
@@ -14,7 +14,7 @@
 pincpu="1-4,^3,6" (or all together)
 '''
 
-if os.environ.has_key('pincpu'):
+if 'pincpu' in os.environ:
     try:
         domxml = hooking.read_domxml()
 
diff --git a/vdsm_hooks/promisc/before_vm_destroy.py b/vdsm_hooks/promisc/before_vm_destroy.py
index 7c3135c..ee6d080 100755
--- a/vdsm_hooks/promisc/before_vm_destroy.py
+++ b/vdsm_hooks/promisc/before_vm_destroy.py
@@ -30,7 +30,7 @@
     if retcode != 0:
         sys.stderr.write('promisc: error executing command "%s" error: %s' % (command, err))
 
-if os.environ.has_key('promisc'):
+if 'promisc' in os.environ:
     try:
         networks = os.environ['promisc']
 
diff --git a/vdsm_hooks/qos/before_vm_start.py b/vdsm_hooks/qos/before_vm_start.py
index 1d4d16b..ecbc05f 100755
--- a/vdsm_hooks/qos/before_vm_start.py
+++ b/vdsm_hooks/qos/before_vm_start.py
@@ -66,7 +66,7 @@
             return iface
     return None
 
-if os.environ.has_key('qos'):
+if 'qos' in os.environ:
     try:
         domxml = hooking.read_domxml()
         interfaces = domxml.getElementsByTagName('interface')
diff --git a/vdsm_hooks/smartcard/before_vm_start.py b/vdsm_hooks/smartcard/before_vm_start.py
index 07e52e7..1944978 100755
--- a/vdsm_hooks/smartcard/before_vm_start.py
+++ b/vdsm_hooks/smartcard/before_vm_start.py
@@ -11,7 +11,7 @@
 <smartcard mode='passthrough' type='spicevmc'/>
 '''
 
-if os.environ.has_key('smartcard'):
+if 'smartcard' in os.environ:
     try:
         sys.stderr.write('smartcard: adding smartcard support\n')
         domxml = hooking.read_domxml()
diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py
index d89a8f5..b272e5b 100755
--- a/vdsm_hooks/smbios/before_vm_start.py
+++ b/vdsm_hooks/smbios/before_vm_start.py
@@ -70,7 +70,7 @@
         e.appendChild(txt)
         bios.appendChild(e)
 
-if os.environ.has_key('smbios'):
+if 'smbios' in os.environ:
     try:
         data = os.environ['smbios']
 
diff --git a/vdsm_hooks/sriov/after_vm_destroy.py b/vdsm_hooks/sriov/after_vm_destroy.py
index ee122ff..79058e3 100755
--- a/vdsm_hooks/sriov/after_vm_destroy.py
+++ b/vdsm_hooks/sriov/after_vm_destroy.py
@@ -30,7 +30,7 @@
                 sys.stderr.write('sriov after_vm_destroy: error chown %s to %s, err = %s\n' % (dev, owner, err))
                 sys.exit(2)
 
-if os.environ.has_key('sriov'):
+if 'sriov' in os.environ:
     try:
         lines = ''
         nics = os.environ['sriov']
diff --git a/vdsm_hooks/sriov/before_vm_migrate_source.py b/vdsm_hooks/sriov/before_vm_migrate_source.py
index eabdae3..d748c0c 100755
--- a/vdsm_hooks/sriov/before_vm_migrate_source.py
+++ b/vdsm_hooks/sriov/before_vm_migrate_source.py
@@ -3,6 +3,6 @@
 import os
 import sys
 
-if os.environ.has_key('sriov'):
+if 'sriov' in os.environ:
     sys.stderr.write('sriov: cannot migrate VM with sr-iov devices\n')
     sys.exit(2)
diff --git a/vdsm_hooks/vmdisk/before_vm_start.py b/vdsm_hooks/vmdisk/before_vm_start.py
index 191d5c1..da4ee38 100755
--- a/vdsm_hooks/vmdisk/before_vm_start.py
+++ b/vdsm_hooks/vmdisk/before_vm_start.py
@@ -63,7 +63,7 @@
 
     return disk
 
-if os.environ.has_key('vmdisk'):
+if 'vmdisk' in os.environ:
     try:
         disks = os.environ['vmdisk']
 
diff --git a/vdsm_reg/createDaemon.py b/vdsm_reg/createDaemon.py
index 5953796..db529c4 100644
--- a/vdsm_reg/createDaemon.py
+++ b/vdsm_reg/createDaemon.py
@@ -155,7 +155,7 @@
     #
     # OR
     #
-    # if (os.sysconf_names.has_key("SC_OPEN_MAX")):
+    # if 'SC_OPEN_MAX' in os.sysconf_names:
     #    maxfd = os.sysconf("SC_OPEN_MAX")
     # else:
     #    maxfd = MAXFD


--
To view, visit http://gerrit.ovirt.org/8769
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5e94594422ec3edbcd82002f1c124fbb10a9fae
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap at redhat.com>


More information about the vdsm-patches mailing list