diff options
Diffstat (limited to 'pyreverse')
| -rw-r--r-- | pyreverse/diadefslib.py | 6 | ||||
| -rw-r--r-- | pyreverse/diagrams.py | 8 | ||||
| -rw-r--r-- | pyreverse/main.py | 3 | ||||
| -rw-r--r-- | pyreverse/utils.py | 5 |
4 files changed, 12 insertions, 10 deletions
diff --git a/pyreverse/diadefslib.py b/pyreverse/diadefslib.py index 46d0f19..0b42065 100644 --- a/pyreverse/diadefslib.py +++ b/pyreverse/diadefslib.py @@ -99,8 +99,8 @@ class DiaDefGenerator(object): """return associated nodes of a class node""" if level == 0: return - for ass_nodes in klass_node.instance_attrs_type.values() + \ - klass_node.locals_type.values(): + for ass_nodes in list(klass_node.instance_attrs_type.values()) + \ + list(klass_node.locals_type.values()): for ass_node in ass_nodes: if isinstance(ass_node, astroid.Instance): ass_node = ass_node._proxied @@ -198,7 +198,7 @@ class ClassDiadefGenerator(DiaDefGenerator): else: module = project.modules[0] klass = klass.split('.')[-1] - klass = module.ilookup(klass).next() + klass = next(module.ilookup(klass)) anc_level, ass_level = self._get_levels() self.extract_classes(klass, anc_level, ass_level) diff --git a/pyreverse/diagrams.py b/pyreverse/diagrams.py index 28cc500..f0d7a92 100644 --- a/pyreverse/diagrams.py +++ b/pyreverse/diagrams.py @@ -77,8 +77,8 @@ class ClassDiagram(Figure, FilterMixIn): 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) @@ -170,8 +170,8 @@ class ClassDiagram(Figure, FilterMixIn): 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 diff --git a/pyreverse/main.py b/pyreverse/main.py index d4991b5..408c172 100644 --- a/pyreverse/main.py +++ b/pyreverse/main.py @@ -18,6 +18,7 @@ create UML diagrams for classes and modules in <packages> """ +from __future__ import print_function import sys, os from logilab.common.configuration import ConfigurationMixIn @@ -99,7 +100,7 @@ class Run(ConfigurationMixIn): def run(self, args): """checking arguments and run project""" if not args: - print self.help() + print(self.help()) return 1 # insert current working directory to the python path to recognize # dependencies to local modules even if cwd is not in the PYTHONPATH diff --git a/pyreverse/utils.py b/pyreverse/utils.py index 3d12d41..58559d7 100644 --- a/pyreverse/utils.py +++ b/pyreverse/utils.py @@ -16,6 +16,7 @@ """ generic classes/functions for pyreverse core/extensions """ +from __future__ import print_function import sys import re @@ -118,8 +119,8 @@ class FilterMixIn(object): for nummod in mode.split('+'): try: __mode += MODES[nummod] - except KeyError, ex: - print >> sys.stderr, 'Unknown filter mode %s' % ex + except KeyError as ex: + print('Unknown filter mode %s' % ex, file=sys.stderr) self.__mode = __mode |