Merge "Enable Flake8 E12X Errors"

ceph/ceph-manager/ceph-manager/ceph_manager/exception.py

@@ -33,13 +33,13 @@ class CephManagerException(Exception):
 
 class CephPoolSetQuotaFailure(CephManagerException):
     message = _("Error seting the OSD pool "
-                "quota %(name)s for %(pool)s to %(value)s") \
-                + ": %(reason)s"
+                "quota %(name)s for %(pool)s to "
+                "%(value)s") + ": %(reason)s"
 
 
 class CephPoolGetQuotaFailure(CephManagerException):
-    message = _("Error geting the OSD pool quota for %(pool)s") \
-                + ": %(reason)s"
+    message = _("Error geting the OSD pool quota for "
+                "%(pool)s") + ": %(reason)s"
 
 
 class CephPoolCreateFailure(CephManagerException):

logging/logmgmt/logmgmt/logmgmt/logmgmt.py

@@ -147,10 +147,10 @@ class LogMgmtDaemon():
                     continue
 
                 # Ignore some files
-                if '/var/log/puppet' in fname \
-                    or '/var/log/dmesg' in fname \
-                    or '/var/log/rabbitmq' in fname \
-                    or '/var/log/lastlog' in fname:
+                if ('/var/log/puppet' in fname
+                        or '/var/log/dmesg' in fname
+                        or '/var/log/rabbitmq' in fname
+                        or '/var/log/lastlog' in fname):
                     continue
 
                 if os.path.exists(fname):

logging/logmgmt/logmgmt/setup.py

@@ -14,6 +14,5 @@ setuptools.setup(name='logmgmt',
                  description='logmgmt',
                  license='Apache-2.0',
                  packages=['logmgmt'],
-      entry_points={
-      }
+                 entry_points={}
                  )

tox.ini

@@ -37,13 +37,6 @@ commands =
 
 [flake8]
 # E series are pep8
-# E121 continuation line under-indented for hanging indent
-# E123 closing bracket does not match indentation of opening bracket's line
-# E124 closing bracket does not match visual indentation
-# E125 continuation line with same indent as next logical line
-# E126 continuation line over-indented for hanging indent
-# E127 continuation line over-indented for visual indent
-# E128 continuation line under-indented for visual indent
 # E265 block comment should start with '# '
 # E266 too many leading '#' for block comment
 # E302 expected 2 blank lines, found 1
@@ -76,8 +69,7 @@ commands =
 # B301 Python 3 does not include `.iter*` methods on dictionaries.
 # F series
 # F401 'module' imported but unused
-ignore = E121,E123,E124,E125,E126,E127,E128,E265,E266,
-         E302,E303,E305,E402,E501,E722
+ignore = E265,E266,E302,E303,E305,E402,E501,E722
          H101,H102,H104,H201,H238,H237,H306,H401,H404,H405,
          W191,W291,W391,W503,
          B001,B007,B009,B010,B301,