mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-31 19:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use OrderedDict instead of reinventing it

Browse Source
This commit is contained in:
Gilles Peskine 2020-01-28 18:57:47 +01:00
parent c26479c1af
commit d8b6c77388
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/assemble_changelog.py
View File

@ -21,6 +21,7 @@
# This file is part of Mbed Crypto (https://tls.mbed.org) # This file is part of Mbed Crypto (https://tls.mbed.org)
import argparse import argparse
from collections import OrderedDict
import glob import glob
import os import os
import re import re
@ -78,16 +79,6 @@ class ChangeLog:
level = re.match(self._title_re, line).end() level = re.match(self._title_re, line).end()
return level, line[level:].strip() return level, line[level:].strip()
def add_sections(self, *sections):
"""Add the specified section titles to the list of known sections.
Sections will be printed back out in the order they were added.
"""
for section in sections:
if section not in self.section_content:
self.section_list.append(section)
self.section_content[section] = []
def __init__(self, input_stream): def __init__(self, input_stream):
"""Create a changelog object. """Create a changelog object.
@ -96,9 +87,9 @@ class ChangeLog:
can be any generator returning the lines to read. can be any generator returning the lines to read.
""" """
self.header = [] self.header = []
self.section_list = [] self.section_content = OrderedDict()
self.section_content = {} for section in STANDARD_SECTIONS:
self.add_sections(*STANDARD_SECTIONS) self.section_content[section] = []
self.trailer = [] self.trailer = []
self.read_main_file(input_stream) self.read_main_file(input_stream)
@ -121,7 +112,7 @@ class ChangeLog:
self.trailer.append(line) self.trailer.append(line)
elif level == 3 and level_2_seen == 1: elif level == 3 and level_2_seen == 1:
current_section = content current_section = content
self.add_sections(current_section) self.section_content.setdefault(content, [])
elif level_2_seen == 1 and current_section != None: elif level_2_seen == 1 and current_section != None:
if line.strip(): if line.strip():
self.section_content[current_section].append(line) self.section_content[current_section].append(line)
@ -169,8 +160,7 @@ class ChangeLog:
with open(filename, 'wb') as out: with open(filename, 'wb') as out:
for line in self.header: for line in self.header:
out.write(line) out.write(line)
for section in self.section_list: for section, lines in self.section_content.items():
lines = self.section_content[section]
while lines and not lines[0].strip(): while lines and not lines[0].strip():
del lines[0] del lines[0]
while lines and not lines[-1].strip(): while lines and not lines[-1].strip():