← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands-website/pyformat_util into lp:widelands-website

 

Is this meant to run with python3 or python2?

I put some comments in the diff.

Diff comments:

> === added directory 'utils'
> === added file 'utils/fix_formatting.py'
> --- utils/fix_formatting.py	1970-01-01 00:00:00 +0000
> +++ utils/fix_formatting.py	2016-12-04 06:57:43 +0000
> @@ -0,0 +1,51 @@
> +#!/usr/bin/env python
> +# -*- coding: utf-8 -*-
> +
> +
> +"""This script runs pyformat over the code base.
> +"""
> +
> +import argparse
> +import os
> +import re
> +import sys
> +from subprocess import call
> +

What are the following variables/constants used for?

> +LEADING_TABS = re.compile(r'^\s*\t+\s*')
> +PYTHON3 = sys.version_info >= (3, 0)
> +SPACES_PER_TAB = 3
> +
> +
> +def parse_args():
> +    p = argparse.ArgumentParser(
> +        description='Run pyformat over the code base.'
> +        ' Recurses over all relevant files.')
> +    return p.parse_args()
> +
> +
> +def find_files(startpath, extensions):
> +    for (dirpath, _, filenames) in os.walk(startpath):
> +        for filename in filenames:
> +            if os.path.splitext(filename)[-1].lower() in extensions:
> +                yield os.path.join(dirpath, filename)
> +
> +
> +def main():
> +    parse_args()
> +
> +    if not os.path.isdir('pybb') or not os.path.isdir('utils'):
> +        print('CWD is not the root of the repository.')
> +        return 1
> +
> +    sys.stdout.write('\nFormatting Python code ')
> +    for filename in find_files('.', ['.py']):
> +        sys.stdout.write('.')
> +        sys.stdout.flush()
> +        call(['pyformat', '-i', filename])
> +    print(' done.')
> +

Following print through an error when running with python3... missing parentheses.

> +    print 'Formatting finished.'
> +    return 0
> +
> +if __name__ == '__main__':
> +    sys.exit(main())


-- 
https://code.launchpad.net/~widelands-dev/widelands-website/pyformat_util/+merge/312427
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pyformat_util into lp:widelands-website.


References