Merge lp:~widelands-dev/widelands-website/pyformat_util into lp:widelands-website

[GunChleoc]

Added script to run pyformat over the code base.

In the future, when merging branches into trunk, this could be run before the bzr commit.

[kaputtnik (franku)]

Is this meant to run with python3 or python2?

I put some comments in the diff.

[kaputtnik (franku)]

Ah, forgotton: Wouldn't it be better to have this script in the _ops directory?

[GunChleoc (gunchleoc)]

If that directory does the same job as utils does on Widelands, yes.

[kaputtnik (franku)]

I think '_ops' is meant as 'operators', or as https://de.wikipedia.org/wiki/Ops ?

In both cases it would fit to have this script in '_ops', i believe :-)

[lp:~widelands-dev/widelands-website/pyformat_util]

440. By GunChleoc on 2016-12-07

Merged trunk.

441. By GunChleoc on 2016-12-07

Addressed code review.

[GunChleoc (gunchleoc)]

OK, moved :)

[kaputtnik (franku)]

Runs with python3 and python2 now. :-)

I don't know why the PYTHON3=... is still in there? Maybe i miss something here?

review: Approve

[SirVer (sirver)]

same nit as kaputtnik had, otherwise lgtm.

review: Approve

[lp:~widelands-dev/widelands-website/pyformat_util]

442. By GunChleoc on 2016-12-12

Removed superfluous line.

[GunChleoc (gunchleoc)]

Thanks for the nit - fixed :)

[kaputtnik (franku)]

Merged with trunk, ran the script, merged into trunk, deployed.

Thanks for the tool :-)

[GunChleoc (gunchleoc)]

You're welcome :)

I wanted it for Widelands, so why not have it for the website as well. You made me aware of pyformat in the first place!

=== added file '_ops/fix_formatting.py'
--- _ops/fix_formatting.py	1970-01-01 00:00:00 +0000
+++ _ops/fix_formatting.py	2016-12-12 15:39:05 +0000
@@ -0,0 +1,46 @@
+#!/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
+
+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('_ops'):
+        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.')
+
+    print ('Formatting finished.')
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())