Merge lp:~dobey/ubuntuone-dev-tools/no-more-pylint into lp:ubuntuone-dev-tools

[dobey]

Drop all usage of pylint in u1lint and only use pyflakes instead.

We don't use pylint in the projects any more, so lets get rid of it here too, and make pyflakes the default.

[Roberto Alsina (ralsina)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'bin/u1lint'
--- bin/u1lint	2012-11-28 21:45:47 +0000
+++ bin/u1lint	2013-05-16 17:44:27 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2009-2012 Canonical Ltd.
+# Copyright 2009-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -26,22 +26,14 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Wrapper script for pylint command."""
+"""Wrapper script for pyflakes command."""
 
 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
 
-from dirspec.basedir import xdg_data_dirs
 
 SRCDIR = os.environ.get('SRCDIR', os.getcwd())
 
@@ -68,38 +60,28 @@
         if os.path.exists(os.path.join(path, "python.exe")):
             return path
 
-    # pylint: disable=F0401
     try:
         import winreg
     except ImportError:
         import _winreg as winreg
-    # pylint: enable=F0401
     software_key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'Software')
     python_key = None
     try:
         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')
-        # pylint: disable=E0602
         except WindowsError:
-        # pylint: enable=E0602
             raise InvalidSetupException(
                 'Could not located python installation path.')
     try:
         core_key = winreg.OpenKey(python_key, 'PythonCore')
-        # pylint: disable=E1101
         version_key = winreg.OpenKey(core_key, sys.winver)
-        # pylint: enable=E1101
         return winreg.QueryValue(version_key, 'InstallPath')
-    # pylint: disable=E0602
     except WindowsError:
-    # pylint: enable=E0602
         raise InvalidSetupException(
             'Could not located python installation path.')
 
@@ -135,39 +117,6 @@
         return [script, ]
 
 
-def find_pylintrc():
-    """Return the first pylintrc found."""
-    # Use the pylintrc in the source tree if there is one
-    full_name = os.path.join(SRCDIR, 'pylintrc')
-    if os.path.exists(full_name):
-        return full_name
-
-    # If no pylintrc in the source tree, use the first in $XDG_DATA_DIRS
-    # Hopefully this is the one we installed, and hasn't been overridden
-    for name in xdg_data_dirs:
-        full_name = os.path.join(name, 'ubuntuone-dev-tools', 'pylintrc')
-        if os.path.exists(full_name):
-            return full_name
-    return None
-
-
-PYLINTRC = find_pylintrc()
-
-
-def _read_pylintrc_ignored():
-    """Get the ignored files list from pylintrc"""
-    try:
-        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):
-        return []
-    # pylint: enable=E1103
-
-
 def _group_lines_by_file(data):
     """Format file:line:message output as lines grouped by file."""
     did_fail = False
@@ -180,7 +129,6 @@
         elif line.startswith("build/") or len(current) < 3:
             pass
         elif filename == current[0]:
-            # pylint warning W0511 is a custom note
             if not "[W0511]" in current[2]:
                 did_fail = True
             outputs.append("    " + current[1] + ": " + current[2])
@@ -188,7 +136,6 @@
             filename = current[0]
             outputs.append("")
             outputs.append(filename + ":")
-            # pylint warning W0511 is a custom note
             if not "[W0511]" in current[2]:
                 did_fail = True
             outputs.append("    " + current[1] + ": " + current[2])
@@ -199,7 +146,6 @@
 def _find_files():
     """Find all Python files under the current tree."""
     pyfiles = []
-    # pylint: disable=W0612
     for root, dirs, files in os.walk(SRCDIR, topdown=False):
         for filename in files:
             filepath = root + os.path.sep
@@ -233,20 +179,12 @@
     (options, args) = parser.parse_args()
 
     failed = False
-    ignored = _read_pylintrc_ignored()
+    ignored = []
     if options.ignored:
         ignored.extend([os.path.join(SRCDIR, item) for item in
                         map(str.strip, options.ignored.split(','))])
 
-    if os.environ.get('USE_PYFLAKES'):
-        pylint_args = get_subprocess_start_info('pyflakes')
-    else:
-        pylint_args = get_subprocess_start_info('pylint')
-        # append the extra args to the start info
-        pylint_args.extend(['--output-format=parseable',
-                            '--include-ids=yes'])
-        if PYLINTRC:
-            pylint_args.append("--rcfile=" + PYLINTRC)
+    pylint_args = get_subprocess_start_info('pyflakes')
 
     for path in _find_files():
         is_build = path.startswith(os.path.join(SRCDIR, "_build"))
@@ -272,7 +210,7 @@
         print(grouped, end="\n\n")
 
     returncode = sp.wait()
-    # XXX Testing that W0511 does not cause a failure
+
     if failed:
         if returncode != 0:
             exit(returncode)
 
=== removed file 'pylintrc'
--- pylintrc	2011-04-13 14:44:11 +0000
+++ pylintrc	1970-01-01 00:00:00 +0000
@@ -1,307 +0,0 @@
-# lint Python modules using external checkers.
-#
-# This is the main checker controlling the other ones and the reports
-# generation. It is itself both a raw checker and an astng checker in order
-# to:
-# * handle message activation / deactivation at the module level
-# * handle some basic but necessary stats'data (number of classes, methods...)
-#
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Profiled execution.
-profile=no
-
-# Add <file or directory> to the black list. It should be a base name, not a
-# path. You may set this option multiple times.
-#ignore=<somedir>
-
-# Pickle collected data for later comparisons.
-persistent=no
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-
-[MESSAGES CONTROL]
-
-# Enable only checker(s) with the given id(s). This option conflicts with the
-# disable-checker option
-#enable-checker=
-
-# Enable all checker(s) except those with the given id(s). This option
-# conflicts with the enable-checker option
-#disable-checker=
-
-# Enable all messages in the listed categories.
-#enable-cat=
-
-# Disable all messages in the listed categories.
-#disable-cat=
-
-# Disable the message(s) with the given id(s) or categories
-# W0142: Used * or ** magic
-# W0221: Arguments number differs from %s method (pylint is confused by * and **)
-# W0613: Unused argument %r (We get lots of these from interfaces)
-# W0404: Erroneous re-import warning: MM: X Reimported (line MM)
-disable=R,I,W0142,W0221,W0613,W0404
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html
-output-format=colorized
-
-# Include message's id in output
-include-ids=yes
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (R0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation report (R0004).
-comment=no
-
-# Enable the report(s) with the given id(s).
-#enable-report=
-
-# Disable the report(s) with the given id(s).
-#disable-report=
-
-
-# try to find bugs in the code using type inference
-#
-[TYPECHECK]
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of classes names for which member attributes should not be checked
-# (useful for classes with attributes dynamically set).
-ignored-classes=
-
-# When zope mode is activated, add a predefined set of Zope acquired attributes
-# to generated-members.
-zope=no
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E0201 when accessed.
-generated-members=REQUEST,acl_users,aq_parent
-
-
-# checks for
-# * unused variables / imports
-# * undefined variables
-# * redefinition of variable from builtins or from an outer scope
-# * use of variable before assignment
-#
-[VARIABLES]
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=yes
-
-# A regular expression matching names used for dummy variables (i.e. not used).
-dummy-variables-rgx=_|dummy
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-
-# checks for :
-# * doc strings
-# * modules / classes / functions / methods / arguments / variables name
-# * number of arguments, local variables, branches, returns and statements in
-# functions, methods
-# * required module attributes
-# * dangerous default values as arguments
-# * redefinition of function / method / class
-# * uses of the global statement
-#
-[BASIC]
-
-# Required attributes for module, separated by a comma
-required-attributes=
-
-# Regular expression which should only match functions or classes name which do
-# not require a docstring
-no-docstring-rgx=(__.*__|setUp|tearDown)
-
-# Regular expression which should only match correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression which should only match correct module level names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression which should only match correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
-
-# Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]{2,79}$
-
-# Regular expression which should only match correct method names
-method-rgx=([a-z_][a-z0-9_]{2,79}$|setUp|tearDown)
-
-# Regular expression which should only match correct instance attribute names
-attr-rgx=[a-z_][a-z0-9_]{1,30}$
-
-# Regular expression which should only match correct argument names
-argument-rgx=[a-z_][a-z0-9_]{1,30}$
-
-# Regular expression which should only match correct variable names
-variable-rgx=[a-z_][a-z0-9_]{1,30}$
-
-# Regular expression which should only match correct list comprehension /
-# generator expression variable names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=d,e,f,g,i,j,k,ex,logger,Run,_
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# List of builtins function names that should not be used, separated by a comma
-bad-functions=apply,input,reduce
-
-
-# checks for sign of poor/misdesign:
-# * number of methods, attributes, local variables...
-# * size, complexity of functions, methods
-#
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of branch for function / method body
-max-branchs=12
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-
-# checks for :
-# * methods without self as first argument
-# * overridden methods signature
-# * access only to existent members via self
-# * attributes not defined in the __init__ method
-# * supported interfaces implementation
-# * unreachable code
-#
-[CLASSES]
-
-# List of interface methods to ignore, separated by a comma. This is used for
-# instance to not check methods defines in Zopes Interface base class.
-#ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by,providedBy
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-
-# checks for
-# * external modules dependencies
-# * relative / wildcard imports
-# * cyclic imports
-# * uses of deprecated modules
-#
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-
-# checks for :
-# * unauthorized constructions
-# * strict indentation
-# * line length
-# * use of <> instead of !=
-#
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=79
-
-# Maximum number of lines in a module
-max-module-lines=2000
-
-# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-
-# checks for similarities and duplicated code. This computation may be
-# memory / CPU intensive, so you should disable it if you experiments some
-# problems.
-#
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-
-# checks for:
-# * warning notes in the code like FIXME, XXX
-# * PEP 263: source code with non ascii character but no encoding declaration
-#
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO,fixme,xxx,todo
 
=== modified file 'run-tests'
--- run-tests	2012-10-18 21:17:22 +0000
+++ run-tests	2013-05-16 17:44:27 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2010-2012 Canonical Ltd.
+# Copyright 2010-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -26,8 +26,6 @@
 $PYTHON bin/u1trial --reactor=twisted -i "test_squid_windows.py" ubuntuone
 echo "Running style checks..."
 $PYTHON bin/u1lint
-# Run with pyflakes as well as pylint
-USE_PYFLAKES="1" $PYTHON bin/u1lint
 
 pep8 --repeat . bin/* --exclude=*.bat,.pc
 rm -rf _trial_temp
 
=== modified file 'setup.py'
--- setup.py	2012-11-28 21:45:47 +0000
+++ setup.py	2013-05-16 17:44:27 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2010-2012 Canonical Ltd.
+# Copyright 2010-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -59,23 +59,19 @@
         if retcode != 0:
             sys.exit(retcode)
 
-# pylint: disable=C0103
 scripts = ['bin/u1lint',
            'bin/u1trial']
-# pylint: enable=C0103
 
 if sys.platform == 'win32':
     # lets add the .bat so that windows users are happy
     scripts.extend(['bin/u1lint.bat', 'bin/u1trial.bat'])
     DATA_FILES = [(os.path.join(basedir.default_data_path, PACKAGE),
-                  ['pylintrc',
-                   'data/dbus-session.conf.in',
+                  ['data/dbus-session.conf.in',
                    'data/squid.conf.in']),
                   ]
 else:
     DATA_FILES = [('share/%s' % PACKAGE,
-                  ['pylintrc',
-                   'data/dbus-session.conf.in',
+                  ['data/dbus-session.conf.in',
                    'data/squid.conf.in']),
                   ('share/man/man1',
                    ['man/u1lint.1',