[ovs-dev] [PATCH] python: Fix E117 over-indented.

Ilya Maximets i.maximets at samsung.com
Tue Feb 12 15:34:02 UTC 2019


New check was added to recent pycodestyle-2.5.0 and flake8
complains while building on Travis:

  ../utilities/bugtool/ovs-bugtool.in:767:17: E117 over-indented
  ../utilities/bugtool/ovs-bugtool.in:771:17: E117 over-indented
  ../utilities/bugtool/ovs-bugtool.in:774:17: E117 over-indented
  ../utilities/bugtool/ovs-bugtool.in:778:17: E117 over-indented
  ../python/ovs/db/error.py:33:17: E117 over-indented
  ../python/ovs/poller.py:118:21: E117 over-indented
  ../python/ovs/reconnect.py:244:17: E117 over-indented

Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
---
 python/ovs/db/error.py           |  2 +-
 python/ovs/poller.py             |  2 +-
 python/ovs/reconnect.py          |  2 +-
 utilities/bugtool/ovs-bugtool.in | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/python/ovs/db/error.py b/python/ovs/db/error.py
index d9217e411..4d192839b 100644
--- a/python/ovs/db/error.py
+++ b/python/ovs/db/error.py
@@ -30,5 +30,5 @@ class Error(Exception):
         # Compose message.
         syntax = ""
         if self.json is not None:
-                syntax = 'syntax "%s": ' % ovs.json.to_string(self.json)
+            syntax = 'syntax "%s": ' % ovs.json.to_string(self.json)
         Exception.__init__(self, "%s%s: %s" % (syntax, self.tag, self.msg))
diff --git a/python/ovs/poller.py b/python/ovs/poller.py
index 9c6892d98..3624ec865 100644
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -115,7 +115,7 @@ class _SelectSelect(object):
                     False,  # Wait all
                     timeout)
             except winutils.pywintypes.error:
-                    return [(0, POLLERR)]
+                return [(0, POLLERR)]
 
             if retval == winutils.winerror.WAIT_TIMEOUT:
                 return []
diff --git a/python/ovs/reconnect.py b/python/ovs/reconnect.py
index 34cc76987..4392bcea1 100644
--- a/python/ovs/reconnect.py
+++ b/python/ovs/reconnect.py
@@ -241,7 +241,7 @@ class Reconnect(object):
 
         if (self.state == Reconnect.Backoff and
             self.backoff > self.max_backoff):
-                self.backoff = self.max_backoff
+            self.backoff = self.max_backoff
 
     def set_backoff_free_tries(self, backoff_free_tries):
         """Sets the number of connection attempts that will be made without
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index 288c34f98..f3657dc96 100755
--- a/utilities/bugtool/ovs-bugtool.in
+++ b/utilities/bugtool/ovs-bugtool.in
@@ -764,18 +764,18 @@ def dump_scsi_hosts(cap):
     for h in scsi_list:
         procname = ''
         try:
-                f = open('/sys/class/scsi_host/%s/proc_name' % h)
-                procname = f.readline().strip("\n")
-                f.close()
+            f = open('/sys/class/scsi_host/%s/proc_name' % h)
+            procname = f.readline().strip("\n")
+            f.close()
         except:
-                pass
+            pass
         modelname = None
         try:
-                f = open('/sys/class/scsi_host/%s/model_name' % h)
-                modelname = f.readline().strip("\n")
-                f.close()
+            f = open('/sys/class/scsi_host/%s/model_name' % h)
+            modelname = f.readline().strip("\n")
+            f.close()
         except:
-                pass
+            pass
 
         output += "%s:\n" % h
         output += "    %s%s\n" \
-- 
2.17.1



More information about the dev mailing list