More pylint fixes

salt/modules/dockerng.py

@@ -1221,7 +1221,7 @@ def _validate_input(kwargs,
             kwargs['memory_swap'] = \
                 salt.utils.human_size_to_bytes(kwargs['memory_swap'])
         except ValueError:
-            if kwargs['memory_swap'] in -1:
+            if kwargs['memory_swap'] == -1:
                 # memory_swap of -1 means swap is disabled
                 return
             raise SaltInvocationError(

salt/payload.py

@@ -211,7 +211,7 @@ class Serial(object):
                     return obj
                 return obj
             return msgpack.dumps(odict_encoder(msg))
-        except (SystemError, TypeError) as exc:
+        except (SystemError, TypeError) as exc:  # pylint: disable=W0705
             log.critical('Unable to serialize message! Consider upgrading msgpack. '
                          'Message which failed was {failed_message} '
                          'with exception {exception_message}').format(msg, exc)

salt/transport/local.py

@@ -43,4 +43,7 @@ class LocalChannel(ReqChannel):
         return ret
 
     def crypted_transfer_decode_dictentry(self, load, dictkey=None, tries=3, timeout=60):
-        super(LocalChannel, self).crypted_transfer_decode_dictentry()
+        super(LocalChannel, self).crypted_transfer_decode_dictentry(load,
+                                                                    dictkey=dictkey,
+                                                                    tries=tries,
+                                                                    timeout=timeout)

salt/utils/schema.py

@@ -549,7 +549,7 @@ class Schema(six.with_metaclass(SchemaMeta, object)):
         cls.after_items_update = []
         for name in cls._order:
             skip_order = False
-            if name in cls._sections:
+            if name in cls._sections:  # pylint: disable=E1133
                 section = cls._sections[name]
                 serialized_section = section.serialize(None if section.__flatten__ is True else name)
                 if section.__flatten__ is True:
@@ -567,7 +567,7 @@ class Schema(six.with_metaclass(SchemaMeta, object)):
                     # Store it as a configuration section
                     properties[name] = serialized_section
 
-            if name in cls._items:
+            if name in cls._items:  # pylint: disable=E1133
                 config = cls._items[name]
                 # Handle the configuration items defined in the class instance
                 if config.__flatten__ is True:

tests/unit/modules/etcd_mod_test.py

@@ -54,7 +54,7 @@ class EtcdModTestCase(TestCase):
                 if key == '':
                     raise KeyError
                 elif key == 'err':
-                    raise
+                    raise ValueError
                 return MockEtcd
 
         with patch.object(etcd_util, 'get_conn',
@@ -66,7 +66,7 @@ class EtcdModTestCase(TestCase):
 
             self.assertEqual(etcd_mod.get_(''), '')
 
-            self.assertRaises(Exception, etcd_mod.get_, 'err')
+            self.assertRaises(ValueError, etcd_mod.get_, 'err')
 
     # 'set_' function tests: 1
 
@@ -93,7 +93,7 @@ class EtcdModTestCase(TestCase):
                 if key == '':
                     raise KeyError
                 elif key == 'err':
-                    raise
+                    raise ValueError
                 return MockEtcd
 
         with patch.object(etcd_util, 'get_conn',
@@ -102,7 +102,7 @@ class EtcdModTestCase(TestCase):
 
             self.assertEqual(etcd_mod.set_('', 'stack'), '')
 
-            self.assertRaises(Exception, etcd_mod.set_, 'err', 'stack')
+            self.assertRaises(ValueError, etcd_mod.set_, 'err', 'stack')
 
     # 'ls_' function tests: 1
 
@@ -127,7 +127,7 @@ class EtcdModTestCase(TestCase):
                 if path == '':
                     raise KeyError
                 elif path == 'err':
-                    raise
+                    raise ValueError
                 return MockEtcd
 
         with patch.object(etcd_util, 'get_conn',
@@ -136,7 +136,7 @@ class EtcdModTestCase(TestCase):
 
             self.assertDictEqual(etcd_mod.ls_(''), {})
 
-            self.assertRaises(Exception, etcd_mod.ls_, 'err')
+            self.assertRaises(ValueError, etcd_mod.ls_, 'err')
 
     # 'rm_' function tests: 1
 
@@ -163,7 +163,7 @@ class EtcdModTestCase(TestCase):
                 if key == '':
                     raise KeyError
                 elif key == 'err':
-                    raise
+                    raise ValueError
                 if recursive:
                     return True
                 else:
@@ -178,7 +178,7 @@ class EtcdModTestCase(TestCase):
 
             self.assertFalse(etcd_mod.rm_(''))
 
-            self.assertRaises(Exception, etcd_mod.rm_, 'err')
+            self.assertRaises(ValueError, etcd_mod.rm_, 'err')
 
     # 'tree' function tests: 1
 

tests/unit/utils/config_test.py

@@ -1840,7 +1840,7 @@ class ConfigTestCase(TestCase):
         )
         self.assertEqual(
             item.serialize(), {
-                'anyOf': [i.serialize() for i in item.items]
+                'anyOf': [i.serialize() for i in item.items]  # pylint: disable=E1133
             }
         )
 
@@ -1892,7 +1892,7 @@ class ConfigTestCase(TestCase):
         )
         self.assertEqual(
             item.serialize(), {
-                'allOf': [i.serialize() for i in item.items]
+                'allOf': [i.serialize() for i in item.items]  # pylint: disable=E1133
             }
         )