diff options
| author | Brett Cannon <brett@python.org> | 2014-08-29 12:37:55 -0400 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2014-08-29 12:37:55 -0400 |
| commit | 45172520702065f9eb36e346be4b3c2f17c1c62b (patch) | |
| tree | ae86fc6a2d5a59e9fa1f6f04e29f9fe0a2d541db | |
| parent | bff72cfd4b2e1dda68fdc4be1abcb3f56d36e1e3 (diff) | |
| download | pylint-45172520702065f9eb36e346be4b3c2f17c1c62b.tar.gz | |
Wrap dict.items() et. al. in list()
| -rw-r--r-- | checkers/format.py | 3 | ||||
| -rw-r--r-- | pyreverse/diadefslib.py | 4 | ||||
| -rw-r--r-- | pyreverse/diagrams.py | 8 | ||||
| -rw-r--r-- | utils.py | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/checkers/format.py b/checkers/format.py index 073eadf..134999e 100644 --- a/checkers/format.py +++ b/checkers/format.py @@ -345,7 +345,8 @@ class ContinuedLineState(object): # current indent level paren_align = self._cont_stack[-1].valid_outdent_offsets next_align = self._cont_stack[-1].valid_continuation_offsets.copy() - next_align[next_align.keys()[0] + self._continuation_size] = True + next_align_keys = list(next_align.keys()) + next_align[next_align_keys[0] + self._continuation_size] = True # Note that the continuation of # d = { # 'a': 'b' diff --git a/pyreverse/diadefslib.py b/pyreverse/diadefslib.py index f0456ff..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 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 @@ -505,7 +505,7 @@ class FileState(object): else: firstchildlineno = last for msgid, lines in six.iteritems(msg_state): - for lineno, state in lines.items(): + for lineno, state in list(lines.items()): original_lineno = lineno if first <= lineno <= last: # Set state for all lines for this block, if the @@ -560,7 +560,7 @@ class FileState(object): yield 'useless-suppression', line, \ (msgs_store.get_msg_display_string(warning),) # don't use iteritems here, _ignored_msgs may be modified by add_message - for (warning, from_), lines in self._ignored_msgs.items(): + for (warning, from_), lines in list(self._ignored_msgs.items()): for line in lines: yield 'suppressed-message', line, \ (msgs_store.get_msg_display_string(warning), from_) |