Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-u1lint into lp:ubuntuone-dev-tools

[Brian Curtin]

- Prepare u1lint for Python 3 usage. Update imports for 3x and use the print function.

Update u1lint for Python 3. Rearrange some imports which changed in Python 3 (configparser/winreg) and use the print_function future import.

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'bin/u1lint'
--- bin/u1lint	2012-06-08 11:55:53 +0000
+++ bin/u1lint	2012-08-22 15:54:18 +0000
@@ -28,7 +28,15 @@
 # files in the program, then also delete it here.
 """Wrapper script for pylint command."""
 
-import ConfigParser
+from __future__ import print_function
+
+# pylint: disable=F0401
+try:
+    import configparser
+except ImportError:
+    import ConfigParser as configparser
+# pylint: disable=F0401
+
 import os
 import subprocess
 import sys
@@ -54,31 +62,34 @@
             return path
 
     # pylint: disable=F0401
-    import _winreg
+    try:
+        import winreg
+    except ImportError:
+        import _winreg as winreg
     # pylint: enable=F0401
-    software_key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, 'Software')
+    software_key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'Software')
     python_key = None
     try:
-        python_key = _winreg.OpenKey(software_key, 'Python')
+        python_key = winreg.OpenKey(software_key, 'Python')
     # pylint: disable=E0602
     except WindowsError:
     # pylint: enable=E0602
         try:
             # look in the WoW6432node, we are running python
             # 32 on a 64 machine
-            wow6432node_key = _winreg.OpenKey(software_key, 'WoW6432Node')
-            python_key = _winreg.OpenKey(wow6432node_key, 'Python')
+            wow6432node_key = winreg.OpenKey(software_key, 'WoW6432Node')
+            python_key = winreg.OpenKey(wow6432node_key, 'Python')
         # pylint: disable=E0602
         except WindowsError:
         # pylint: enable=E0602
             raise InvalidSetupException(
                 'Could not located python installation path.')
     try:
-        core_key = _winreg.OpenKey(python_key, 'PythonCore')
+        core_key = winreg.OpenKey(python_key, 'PythonCore')
         # pylint: disable=E1101
-        version_key = _winreg.OpenKey(core_key, sys.winver)
+        version_key = winreg.OpenKey(core_key, sys.winver)
         # pylint: enable=E1101
-        return _winreg.QueryValue(version_key, 'InstallPath')
+        return winreg.QueryValue(version_key, 'InstallPath')
     # pylint: disable=E0602
     except WindowsError:
     # pylint: enable=E0602
@@ -139,13 +150,13 @@
 def _read_pylintrc_ignored():
     """Get the ignored files list from pylintrc"""
     try:
-        config = ConfigParser.ConfigParser()
+        config = configparser.ConfigParser()
         config.read([PYLINTRC])
 
         # pylint: disable=E1103
         return [os.path.join(SRCDIR, item) for item in
                     config.get("MASTER", "ignore").split(",")]
-    except (TypeError, ConfigParser.NoOptionError):
+    except (TypeError, configparser.NoOptionError):
         return []
     # pylint: enable=E1103
 
@@ -245,10 +256,9 @@
 
     output = "".join(notices.readlines())
     if output != "":
-        print "== Python Lint Notices =="
+        print("== Python Lint Notices ==")
         (failed, grouped) = _group_lines_by_file(output)
-        print grouped
-        print ""
+        print(grouped, end="\n\n")
 
     returncode = sp.wait()
     # XXX Testing that W0511 does not cause a failure