pylint: adjust for arguments-renamed, consider-using-dict-items

Either apply suggestion, or disable warning, depending on context.

Author: marmarek

qubes/__init__.py

@@ -576,10 +576,9 @@ def property_dict(cls, load_stage=None):
             props = dict()
             if load_stage is None:
                 for class_ in cls.__mro__:
-                    for name in class_.__dict__:
+                    for name, prop in class_.__dict__.items():
                         # don't overwrite props with those from base classes
                         if name not in props:
-                            prop = class_.__dict__[name]
                             if isinstance(prop, property):
                                 assert name == prop.__name__
                                 props[name] = prop

qubes/api/__init__.py

@@ -241,7 +241,8 @@ def connection_lost(self, exc):
         self.transport = None
         self.connections.remove(self)
 
-    def data_received(self, untrusted_data):  # pylint: disable=arguments-differ
+    # pylint: disable=arguments-differ,arguments-renamed
+    def data_received(self, untrusted_data):
         if self.len_untrusted_buffer + len(untrusted_data) > self.buffer_size:
             self.app.log.warning('request too long')
             self.transport.abort()
@@ -250,6 +251,7 @@ def data_received(self, untrusted_data):  # pylint: disable=arguments-differ
 
         self.len_untrusted_buffer += \
             self.untrusted_buffer.write(untrusted_data)
+    # pylint: enable=arguments-differ,arguments-renamed
 
     def eof_received(self):
         try:

qubes/features.py

@@ -112,8 +112,8 @@ def update(self, other=None, **kwargs):
                 for key, value in other:
                     self[key] = value
 
-        for key in kwargs:
-            self[key] = kwargs[key]
+        for key, value in kwargs.items():
+            self[key] = value
 
     #
     # end of overriding

qubes/vm/mix/dvmtemplate.py

@@ -22,6 +22,8 @@
 
 class DVMTemplateMixin(qubes.events.Emitter):
     '''VM class capable of being DVM template'''
+    # pylint doesn't see event handlers being registered via decorator
+    # pylint: disable=unused-private-member
 
     template_for_dispvms = qubes.property('template_for_dispvms',
         type=bool,