Change in vdsm[master]: pep8: make pep8-1.5 happy with E241

Monday, 31 March 2014

Dan Kenigsberg has uploaded a new change for review.

Change subject: pep8: make pep8-1.5 happy with E241
......................................................................

pep8: make pep8-1.5 happy with E241

Change-Id: Ieaa71ec0adc2fdeff4f5530220d0f55c619bd726
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/qemuImg.py
M tests/guestagentTests.py
M tests/vmTests.py
M vdsm/configNetwork.py
M vdsm/storage/hsm.py
M vdsm/virt/vm.py
6 files changed, 17 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/26249/1

diff --git a/lib/vdsm/qemuImg.py b/lib/vdsm/qemuImg.py
index 3869bd7..2124281 100644
--- a/lib/vdsm/qemuImg.py
+++ b/lib/vdsm/qemuImg.py
@@ -34,12 +34,12 @@
     VMDK = "vmdk"
 
 __iregex = {
-    'format':       re.compile("^file format: (?P<value>\w+)$"),
-    'virtualsize':  re.compile("^virtual size: "
-                               "[\d.]+[KMGT] \((?P<value>\d+)
bytes\)$"),
-    'clustersize':  re.compile("^cluster_size:
(?P<value>\d+)$"),
-    'backingfile':  re.compile("^backing file: (?P<value>.+) \(actual
path"),
-    'offset':  re.compile("^Image end offset: (?P<value>\d+)$"),
+    'format': re.compile("^file format: (?P<value>\w+)$"),
+    'virtualsize': re.compile("^virtual size: "
+                              "[\d.]+[KMGT] \((?P<value>\d+) bytes\)$"),
+    'clustersize': re.compile("^cluster_size: (?P<value>\d+)$"),
+    'backingfile': re.compile("^backing file: (?P<value>.+) \(actual
path"),
+    'offset': re.compile("^Image end offset: (?P<value>\d+)$"),
 }
 
 
diff --git a/tests/guestagentTests.py b/tests/guestagentTests.py
index 63badef..df4bfc3 100644
--- a/tests/guestagentTests.py
+++ b/tests/guestagentTests.py
@@ -91,13 +91,13 @@
         invalid = u"\u0000"
         self.assertEqual(u'\ufffd', guestagent._filterXmlChars(invalid))
         invalid2 = u"\uffff"
-        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid2))
+        self.assertEqual(u'\ufffd', guestagent._filterXmlChars(invalid2))
         invalid3 = u"\ufffe"
-        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid3))
+        self.assertEqual(u'\ufffd', guestagent._filterXmlChars(invalid3))
         invalid4 = u"\ud800"
-        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid4))
+        self.assertEqual(u'\ufffd', guestagent._filterXmlChars(invalid4))
         invalid5 = u"\udc79"
-        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid5))
+        self.assertEqual(u'\ufffd', guestagent._filterXmlChars(invalid5))
 
     def test_filterObject(self):
         ILLEGAL_DATA = {u"foo":
u"\x00data\x00test\uffff\ufffe\ud800\udc79"}
diff --git a/tests/vmTests.py b/tests/vmTests.py
index 552a1a7..d6e6e40 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -681,7 +681,7 @@
     @MonkeyPatch(constants, 'SMBIOS_MANUFACTURER', 'oVirt')
     @MonkeyPatch(constants, 'SMBIOS_OSNAME', 'oVirt Node')
     @MonkeyPatch(libvirtconnection, 'get', lambda x: ConnectionMock())
-    @MonkeyPatch(utils,  'getHostUUID',
+    @MonkeyPatch(utils, 'getHostUUID',
                  lambda: "fc25cbbe-5520-4f83-b82e-1541914753d9")
     def testBuildCmdLineX86_64(self):
         self.assertBuildCmdLine(CONF_TO_DOMXML_X86_64)
@@ -690,7 +690,7 @@
     @MonkeyPatch(caps, 'osversion', lambda: {
         'release': '1', 'version': '18', 'name':
'Fedora'})
     @MonkeyPatch(libvirtconnection, 'get', lambda x: ConnectionMock())
-    @MonkeyPatch(utils,  'getHostUUID',
+    @MonkeyPatch(utils, 'getHostUUID',
                  lambda: "fc25cbbe-5520-4f83-b82e-1541914753d9")
     def testBuildCmdLinePPC64(self):
         self.assertBuildCmdLine(CONF_TO_DOMXML_PPC64)
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 2b6162b..c4b21b7 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -351,7 +351,7 @@
                implicitBonding=False, _netinfo=_netinfo)
 
 
-def _validateDelNetwork(network, vlan, bonding, nics, bridged,  _netinfo):
+def _validateDelNetwork(network, vlan, bonding, nics, bridged, _netinfo):
     if bonding:
         if set(nics) != set(_netinfo.bondings[bonding]["slaves"]):
             raise ConfigNetworkError(ne.ERR_BAD_NIC, 'delNetwork: %s are '
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 5666108..0ebe129 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -2369,7 +2369,7 @@
                     doms = self.__prefetchDomains(domType, conObj)
                 except:
                     self.log.debug("prefetch failed: %s",
-                                   sdCache.knownSDs,  exc_info=True)
+                                   sdCache.knownSDs, exc_info=True)
                 else:
                     # Any pre-existing domains in sdCache stand the chance of
                     # being invalid, since there is no way to know what happens
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index b9faa1a..dda919b 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -3947,9 +3947,9 @@
         def _vmConfForMemorySnapshot():
             """Returns the needed vm configuration with the memory
snapshot"""
 
-            return {'restoreFromSnapshot':   True,
-                    '_srcDomXML':            self._dom.XMLDesc(0),
-                    'elapsedTimeOffset':     time.time() - self._startTime}
+            return {'restoreFromSnapshot': True,
+                    '_srcDomXML': self._dom.XMLDesc(0),
+                    'elapsedTimeOffset': time.time() - self._startTime}
 
         def _padMemoryVolume(memoryVolPath, spType, sdUUId):
             if spType == sd.NFS_DOMAIN:


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaa71ec0adc2fdeff4f5530220d0f55c619bd726
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011