# 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)