Skip to content

Commit

Permalink
Fix problems when rearranging
Browse files Browse the repository at this point in the history
I'm 100% sure I fixed these already, must've gotten lost somewhere.
  • Loading branch information
FichteFoll committed Jan 12, 2014
1 parent 2eca3cd commit 09baa7a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Lib/ordereddict_yaml.py
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions syntax_def_dev.py
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 09baa7a

Please sign in to comment.