Merge lp:~mars/launchpad/add-py25-lint into lp:launchpad

[Māris Fogels]

This branch adds a test for Python 2.5 incompatible code to the bin/lint.sh script.

I manually tested all of the execution paths in this patch. Python2.5 is not a
Launchpad development dependency, so a branch was included to make this check
conditional. pyflakes is used for the check, and pyflakes is in
launchpad-developer-dependencies.

--
Māris Fogels -- https://launchpad.net/~mars
Launchpad.net -- cross-project collaboration and hosting

[Robert Collins (lifeless)]

Seems useful if we have two things:
 - python 2.5 on the lucid builders
 - it hooked into make check.

In the absence of both these things, I wouldn't bother.

[Brad Crittenden (bac)]

Maris,

I think the check you've added is good and will be useful if developers actually use 'make lint', but we know that not everyone does all of the time.

Robert's suggestions are good and you agreed on IRC that the needed steps are:

I would a) make it a stand-alone script; call that script from lint; call that script from 'make check'; add Py2.5 to the lucid builders.

What you have ready to land now does add value, so I'd *not* defer landing it until the additional changes are made. So, please add an XXX comment to make the agreed changes but go ahead and land what you have.

Thanks for coming up with a solution to an issue that has bitten us recently.

review: Approve (code)

[Māris Fogels (mars)]

I am taking this proposal off the table as we are "Almost there" for a complete Python2.6 conversion, and because the best type of code is code that does not exist.

Unmerged revisions

11620. By Māris Fogels on 2010-09-23

Added a check for Python 2.5 incompatible code to bin/lint.sh

=== modified file 'buildout-templates/bin/lint.sh.in'
--- buildout-templates/bin/lint.sh.in	2010-07-17 21:42:06 +0000
+++ buildout-templates/bin/lint.sh.in	2010-09-23 20:26:03 +0000
@@ -152,3 +152,32 @@
 
 echo ""
 pocketlint $pocketlint_files 2>&1
+
+
+# Check the changed files with Python 2.5, if possible
+if [ -e '/usr/bin/python2.5' ]; then
+    pyfiles=$(echo "$files" | grep '.py')
+    if [ "$pyfiles" ]; then
+        echo
+        echo "Checking changed sources for Python 2.5 incompatible code... "
+        problems=$(/usr/bin/python2.5 /usr/bin/pyflakes $pyfiles |& grep -e 'invalid')
+        if [ "$problems" ]; then
+            echo
+            echo $problems
+            echo
+            echo "  *********************************************************"
+            echo "  *** CRITICAL: Python 2.5 incompatible code was found! ***"
+            echo "  *********************************************************"
+            echo
+            echo "      You should fix this before committing the code!"
+            echo
+            exit 1
+        fi
+        echo "Done"
+    fi
+else
+    echo
+    echo "  Python 2.5 is not installed!"
+    echo "  Skipped checking for Python 2.5 incompatible code."
+    echo
+fi