Merge lp:~joel-pythonica/phatch/pep8 into lp:phatch

[Joel Pearson]

[Joel Pearson (joel-pythonica)]

I've converted both run_pep8_test and run_pep8_doc_test to Python, and they appear to produce the same results as the corresponding shell scripts.

[Stani (stani)]

Great! For Phatch source code we use LF (\n not \r\n) as line endings otherwise I can't make it run when the file is executable:

$ ./run_pep8_test.py
bash: ./run_pep8_test.py: /usr/bin/python^M: bad interpreter: No such file or directory

I have fixed this now for you, but please change your editor to use LF line endings in the future.

I've updated the blueprint with tasks:
- convert the "...".split() commands to lists to make them more dynamic
- exclude linux tests on windows (-e linux) for nose
- do not exclude windows tests on windows (-e windows) for nose
- let it report the files which are not yet converted to PEP8, if possible with percentage

Please update the blueprint as you progress: put DONE after each subtask as you progress.
Before you continue make sure to merge from trunk first:
bzr merge lp:phatch

As I merged in the new pep8.py many new pep8 errors are reported which need fixing. I am working on them, but feel free to help. I'd like to have the trunk as soon as possible again to be pep8 clean.

Thanks for your work!

review: Needs Fixing

=== added file 'tests/run_pep8_doc_test.py'
--- tests/run_pep8_doc_test.py	1970-01-01 00:00:00 +0000
+++ tests/run_pep8_doc_test.py	2010-02-24 22:20:30 +0000
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/
+#
+# Follows PEP8
+
+import os
+import subprocess
+
+import run_pep8_test
+
+TEST_ARGS = """nosetests --with-doctest -e windows --noexe -v
+                         core lib lib/pyWx/*.py lib/linux/*.py""".split()
+
+
+def main():
+    os.chdir('../phatch')
+    os.rename('__init__.py', '__init__.py.test')
+    subprocess.call(TEST_ARGS)
+    os.rename('__init__.py.test', '__init__.py')
+    os.chdir('../tests')
+    run_pep8_test.main()
+    print
+    print "For logging type:"
+    print "./test > test.txt 2>&1"
+
+if __name__ == '__main__':
+    main()

=== added file 'tests/run_pep8_test.py'
--- tests/run_pep8_test.py	1970-01-01 00:00:00 +0000
+++ tests/run_pep8_test.py	2010-02-24 22:20:30 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/
+#
+# Follows PEP8
+
+import os
+import subprocess
+
+PEP8_ARGS = 'python test_suite/pep8.py --show-source --repeat'.split()
+
+
+def main(dirname='..'):
+    for root, dirs, files in os.walk(dirname):
+        for name in files:
+            filename = os.path.join(root, name)
+            if filename.endswith('.py') and 'PEP8' in file(filename).read():
+                subprocess.call(PEP8_ARGS + [filename])
+
+if __name__ == '__main__':
+    main()