Merge pull request #18108 from thatch45/lint_py3

some lint disables for lint shortcomings wrt python six

salt/cli/__init__.py

@@ -486,7 +486,8 @@ class SaltSSH(parsers.SaltSSHOptionParser):
         ssh.run()
 
 
-class SaltAPI(six.with_metaclass(parsers.OptionParserMeta, parsers.OptionParser, parsers.ConfigDirMixIn,
+class SaltAPI(six.with_metaclass(parsers.OptionParserMeta,  # pylint: disable=W0232
+        parsers.OptionParser, parsers.ConfigDirMixIn,
         parsers.LogLevelMixIn, parsers.PidfileMixin, parsers.DaemonMixIn,
         parsers.MergeConfigMixIn)):
     '''

salt/log/setup.py

@@ -96,8 +96,8 @@ LOGGING_TEMP_HANDLER = StreamHandler(sys.stderr)
 LOGGING_STORE_HANDLER = TemporaryLoggingHandler()
 
 
-class SaltLoggingClass(six.with_metaclass(LoggingMixInMeta, LOGGING_LOGGER_CLASS, NewStyleClassMixIn)):
-    def __new__(cls, *args):  # pylint: disable=W0613
+class SaltLoggingClass(six.with_metaclass(LoggingMixInMeta, LOGGING_LOGGER_CLASS, NewStyleClassMixIn)):  # pylint: disable=W0232
+    def __new__(cls, *args):  # pylint: disable=W0613, E1002
         '''
         We override `__new__` in our logging logger class in order to provide
         some additional features like expand the module name padding if length

salt/scripts.py

@@ -324,7 +324,7 @@ def salt_api():
     '''
     The main function for salt-api
     '''
-    sapi = salt.cli.SaltAPI()
+    sapi = salt.cli.SaltAPI()  # pylint: disable=E1120
     sapi.run()
 
 

salt/utils/pyobjects.py

@@ -362,7 +362,7 @@ def need_salt(*a, **k):
     return {}
 
 
-class Map(six.with_metaclass(MapMeta, object)):
+class Map(six.with_metaclass(MapMeta, object)):  # pylint: disable=W0232
     __salt__ = {
         'grains.filter_by': need_salt,
         'pillar.get': need_salt