pylint: upgrade to 1.4.0

third_party/pylint/pyreverse/diagrams.py

 # Copyright (c) 2004-2013 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ skipping 59 matching lines @@
         """return a relation ship or None
         """
         for rel in self.relationships.get(relation_type, ()):
             if rel.from_object is from_object:
                 return rel
         raise KeyError(relation_type)
 
     def get_attrs(self, node):
         """return visible attributes, possibly with class name"""
         attrs = []
-        for node_name, ass_nodes in node.instance_attrs_type.items() + \
-                                node.locals_type.items():
+        for node_name, ass_nodes in list(node.instance_attrs_type.items()) + \
+                                list(node.locals_type.items()):
             if not self.show_attr(node_name):
                 continue
             names = self.class_names(ass_nodes)
             if names:
                 node_name = "%s : %s" % (node_name, ", ".join(names))
             attrs.append(node_name)
         return sorted(attrs)
 
     def get_methods(self, node):
         """return visible methods"""
@@ skipping 71 matching lines @@
                 except KeyError:
                     continue
             # implements link
             for impl_node in node.implements:
                 try:
                     impl_obj = self.object_from_node(impl_node)
                     self.add_relationship(obj, impl_obj, 'implements')
                 except KeyError:
                     continue
             # associations link
-            for name, values in node.instance_attrs_type.items() + \
-                                node.locals_type.items():
+            for name, values in list(node.instance_attrs_type.items()) + \
+                                list(node.locals_type.items()):
                 for value in values:
                     if value is astroid.YES:
                         continue
                     if isinstance(value, astroid.Instance):
                         value = value._proxied
                     try:
                         ass_obj = self.object_from_node(value)
                         self.add_relationship(ass_obj, obj, 'association', name)
                     except KeyError:
                         continue
@@ skipping 53 matching lines @@
                 continue
         for obj in self.modules():
             obj.shape = 'package'
             # dependencies
             for dep_name in obj.node.depends:
                 try:
                     dep = self.get_module(dep_name, obj.node)
                 except KeyError:
                     continue
                 self.add_relationship(obj, dep, 'depends')