From 09baa7aa7623356c9365e8a116af15459f66a47c Mon Sep 17 00:00:00 2001 From: FichteFoll Date: Sun, 12 Jan 2014 18:33:00 +0100 Subject: [PATCH] Fix problems when rearranging I'm 100% sure I fixed these already, must've gotten lost somewhere. --- Lib/ordereddict_yaml.py | 2 +- syntax_def_dev.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/ordereddict_yaml.py b/Lib/ordereddict_yaml.py index eb69b334..527e1748 100644 --- a/Lib/ordereddict_yaml.py +++ b/Lib/ordereddict_yaml.py @@ -78,7 +78,7 @@ class OrderedDictSafeDumper(SafeDumper): def represent_ordereddict(self, data): # Bypass the sorting in represent_mapping - return self.represent_mapping(u'tag:yaml.org,2002:map', data.items()) + return self.represent_mapping(u'tag:yaml.org,2002:map', list(data.items())) OrderedDictSafeDumper.add_representer( OrderedDict, diff --git a/syntax_def_dev.py b/syntax_def_dev.py index fbe3c993..a6048fab 100644 --- a/syntax_def_dev.py +++ b/syntax_def_dev.py @@ -190,8 +190,7 @@ def do_sort(obj): od[key] = obj[key] del obj[key] # The remaining stuff (in alphabetical order) - keys = obj.keys() - keys.sort() + keys = sorted(obj.keys()) for key in keys: od[key] = obj[key] del obj[key] @@ -365,7 +364,7 @@ def filter_pattern_regs(reg): select(find('meta.patterns - meta.repository-block')) + select(find('meta.repository-block')) + select(find('meta.repository-block meta.repository-key'), False) - + select(filter(filter_pattern_regs, find('meta')), False) + + select(list(filter(filter_pattern_regs, find('meta'))), False) ) # Iterate in reverse order to not clash the regions because we will be modifying the source