Merge lp:~dobey/ubuntuone-client/lint-fixes into lp:ubuntuone-client

[dobey]

Remove the pylintrc as we don't need it any longer.
Ignore the pyinotify_agnostic.py when running lint checks.
Don't re-export tools/credentials in the same namespace.

[Roberto Alsina (ralsina)]

review: Approve

[Mike McCracken (mikemc)]

this doesn't appear to break any new tests on osx, and it's nice to get rid of those imports in platform

thanks for cleaning things up!

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-02-21 20:59:11 +0000
+++ Makefile.am	2013-05-29 13:51:24 +0000
@@ -38,18 +38,11 @@
 	-e 's|\@SSO_PING_URL\@|$(SSO_PING_URL)|g' \
 	-e 's|\@VERSION\@|$(VERSION)|g' < $< > $@
 
-pylintrc: Makefile
-	if test "x$(builddir)" != "x$(srcdir)"; then \
-		if [ ! -e pylintrc -a ! -h pylintrc ]; then \
-			$(LN_S) $(srcdir)/pylintrc; \
-		fi; \
-	fi
-
 logging.conf: data/logging.conf.in Makefile
 	$(MAKE) -C data logging.conf
 
-lint: pylintrc $(clientdefs_DATA) Makefile
-	PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" USE_PYFLAKES="true" u1lint
+lint: $(clientdefs_DATA) Makefile
+	PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" USE_PYFLAKES="true" u1lint -i ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py
 
 test: logging.conf $(clientdefs_DATA) Makefile
 	echo "$(PYTHONPATH)"
@@ -90,7 +83,7 @@
 		(cd tests && $(LNDIR) $(srcdir)/../tests > /dev/null); \
 	fi
 
-all-local: pylintrc logging.conf $(clientdefs_DATA)
+all-local: logging.conf $(clientdefs_DATA)
 
 sd_path = ubuntuone/syncdaemon
 
@@ -141,8 +134,7 @@
 	VERSION	\
 	bin		\
 	contrib		\
-	tests		\
-	pylintrc
+	tests
 
 CLEANFILES =	\
 	$(clientdefs_DATA)

=== removed file 'pylintrc'
--- pylintrc	2012-05-14 20:38:23 +0000
+++ pylintrc	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-# lint Python modules using external checkers.
-#
-# This is the main checker controling 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]
-# Set the cache size for astng objects.
-cache-size=500
-
-# ignore these specific files
-# pylint has no idea what to do with this, but our wrapper does some magic
-ignore=contrib/mocker.py,ubuntuone/syncdaemon/u1fsfsm.py,ubuntuone/platform/linux/__init__.py,ubuntuone/platform/__init__.py,ubuntuone/platform/windows/__init__.py,ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py
-
-[MESSAGES CONTROL]
-# Disable some checkers
-disable-checker=typecheck,design,similarities
-
-# Disable all messages in the listed categories.
-disable-msg-cat=R,I
-
-# Disable the message(s) with the given id(s).
-# :E0101: *Explicit return in __init__*
-# :E0202: An attribute inherited from %s hide this method
-# :W0142: *Used * or ** magic*
-# :W0201: Attribute '%s' defined outside __init__
-# :W0221: *Arguments number differs from %s method* (pylint is confused by * and **)
-# :W0613: *Unused argument %r* (We get lots of these from interfaces)
-# :W0621: *Redefining name %r from outer scope (line %s)* (pylint does a poor evaluation)
-# :W0622: *Redefining built-in '%r'
-disable-msg=E0101,E0202,W0142,W0201,W0221,W0613,W0621,W0622,C0322
-
-
-[REPORTS]
-# Tells wether to display a full report or only the messages
-reports=no
-
-
-# checks for :
-# * doc strings
-# * modules / classes / functions / methods / arguments / variables name
-# * number of arguments, local variables, branchs, 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]
-enable-basic=yes
-
-# 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_]*|[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-zA-Z0-9_]*$
-
-# Regular expression which should only match correct method names
-method-rgx=[a-z_][a-zA-Z0-9_]*$
-
-# Regular expression which should only match correct instance attribute names
-attr-rgx=[a-z_][a-zA-Z0-9_]*$
-
-# Regular expression which should only match correct argument names
-argument-rgx=[a-z_][a-zA-Z0-9_]{1,30}$
-
-# Regular expression which should only match correct variable names
-# They are normally all lowercase, but when a constant, they are all uppercase.
-variable-rgx=([a-z_][a-z0-9_]*|[A-Z_][A-Z0-9_]*)$
-
-# 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
-# Update this to supress warnings about inherrited names (C0103)
-good-names=_,a,b,c,i,j,k,v,d,f,s,t,l,ex,_,orderBy,getByName,clauseTables
-
-# 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:
-# * 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,todo
-
-
-# checks for :
-# * unauthorized constructions
-# * strict indentation
-# * line length
-# * use of <> instead of !=
-#
-[FORMAT]
-enable-format=yes
-
-# Maximum number of characters on a single line.
-max-line-length=80
-
-# 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='    '

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2013-02-10 22:54:07 +0000
+++ ubuntuone/platform/__init__.py	2013-05-29 13:51:24 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# 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
@@ -46,10 +46,6 @@
 from ubuntuone.platform import logger
 from ubuntuone.platform import os_helper
 
-# This imports needs to be here in order to be included in this namespace
-from ubuntuone.platform import credentials
-from ubuntuone.platform import tools
-
 
 def expand_user(path):
     """Fix Python expanduser for weird chars in windows."""