Not entirely stable for random templates as input, but good enough for our

    single template.

    >>> template = '''

    ... [first-section]

    ...

    ... variable=${mako_variable}

    ... variable2  =\tvalue after tab

    ... ## This section had some whitespace and stuff

    ...

    ...

    ... # ${mako_function()}

    ... [second-section]

    ... %if conditional_options == 'option-a':

    ... # option a was chosen

    ... %elif conditional_options == 'option-b':

    ... some_variable = "never mind - option-b will not be used anyway ..."

    ... %endif

    ... '''

    >>> selected_mako_conditionals = []

    >>> mako_variable_values = {'mako_variable': 'VALUE', 'mako_function': (lambda: 'FUNCTION RESULT'),

    ...                         'conditional_options': 'option-a'}

    >>> settings = { # only partially used

    ...     '[first-section]': {'variable2': 'VAL2', 'first_extra': 'EXTRA'},

    ...     '[third-section]': {'third_extra': ' 3'},

    ...     '[fourth-section]': {'fourth_extra': '4', 'fourth': '"four"'},

    ... }

    >>> print expand(template, mako_variable_values, settings)

    <BLANKLINE>

    [first-section]

    <BLANKLINE>

    variable=VALUE

    #variable2  =    value after tab

    variable2 = VAL2

    <BLANKLINE>

    first_extra = EXTRA

    <BLANKLINE>

    <BLANKLINE>

    # FUNCTION RESULT

    [second-section]

    # option a was chosen

    <BLANKLINE>

    [fourth-section]

    fourth = "four"

    fourth_extra = 4

    <BLANKLINE>

    [third-section]

    third_extra =  3

    <BLANKLINE>

    """

    mako_variables = dict(default_variables)

    mako_variables.update(mako_variable_values or {})

    settings = dict((k, dict(v)) for k, v in settings.items()) # deep copy before mutating

    ini_lines = mako.template.Template(template).render(**mako_variables)

    def process_section(m):

        """process a ini section, replacing values as necessary"""

        sectionname, lines = m.groups()

        if sectionname in settings:

            section_settings = settings.pop(sectionname)

            def process_line(m):

                """process a section line and update value if necessary"""

                key, value = m.groups()

                line = m.group(0)

                if key in section_settings:

                    new_line = '%s = %s' % (key, section_settings.pop(key))

                    if new_line != line:

                        # keep old entry as example - comments might refer to it

                        line = '#%s\n%s' % (line, new_line)

                return line.rstrip()

            # process lines that not are comments or empty and look like name=value

            lines = re.sub(r'^([^#\n\s]*)[ \t]*=[ \t]*(.*)$', process_line, lines, flags=re.MULTILINE)

            # add unused section settings

            if section_settings:

                lines += '\n' + ''.join('%s = %s\n' % (key, value) for key, value in sorted(section_settings.items()))

        return sectionname + '\n' + lines

    # process sections until comments before next section or end

    ini_lines = re.sub(r'''^

        (\[.*\])\n

        # after the section name, a number of chunks with:

        (

            (?:

                # a number of comments or empty lines

                (?:[#].*\n|\n)*

                # one or more non-empty non-comments non-section-start lines

                (?:[^\n#[].*\n)+

                # a number of comments - not empty lines

                (?:[#].*\n)*

            )*

        )

        ''',

        + \

        ''.join(

            '\n' + sectionname + '\n' + ''.join('%s = %s\n' % (key, value) for key, value in sorted(section_settings.items()))

            for sectionname, section_settings in sorted(settings.items())

            if section_settings)

    return ini_lines

def create(dest_file, mako_variable_values, settings):

    """Create an ini file at dest_file"""

    with open(template_file, 'rb') as f:

        template = f.read().decode('utf-8')

    ini_lines = expand(template, mako_variable_values, settings)

    with open(dest_file, 'wb') as f:

        f.write(ini_lines.encode('utf-8'))

#!/usr/bin/env python2

import re

import sys

logre = r'''

(log\.(?:error|info|warning|debug)

[(][ \n]*

)

%s

(

[ \n]*[)]

)

'''

res = [

    # handle % () - keeping spaces around the old %

    # handle % without () - keeping spaces around the old %

    # remove extra space if it is on next line

    # remove extra space if it is on same line

    # remove trailing , and space

    ]

def rewrite(f):

    s = open(f).read()

    for r, t in res:

        s = r.sub(t, s)

    open(f, 'w').write(s)

if __name__ == '__main__':

    if len(sys.argv) < 2:

        print 'Cleanup of superfluous % formatting of log statements.'

        print 'Usage:'

        print '''  hg revert `hg loc '*.py'|grep -v logformat.py` && scripts/logformat.py `hg loc '*.py'` && hg diff'''

        raise SystemExit(1)

    for f in sys.argv[1:]:

        rewrite(f)