From c92cd051a1d598f83de03c4135c800b17fd46a9a Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 24 Jan 2014 14:47:28 -0500
Subject: pep8/pylint fixes

tools/run-pep8 wasn't checking all python files.
tools/run-pylint wasnt checking bin/cloud-init

fixed resultant pep8 issues after finding them.
---
 tools/run-pep8   | 11 +----------
 tools/run-pylint |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/run-pep8 b/tools/run-pep8
index 20e594bc..cfce5edd 100755
--- a/tools/run-pep8
+++ b/tools/run-pep8
@@ -1,15 +1,7 @@
 #!/bin/bash
 
-ci_files='cloudinit/*.py cloudinit/config/*.py'
-test_files=$(find tests -name "*.py")
-def_files="$ci_files $test_files"
-
 if [ $# -eq 0 ]; then
-   files=( )
-   for f in $def_files; do
-      [ -f "$f" ] || { echo "failed, $f not a file" 1>&2; exit 1; }
-      files[${#files[@]}]=${f}
-   done
+   files=( bin/cloud-init $(find * -name "*.py" -type f) )
 else
    files=( "$@" );
 fi
@@ -44,4 +36,3 @@ cmd=(
 echo -e "\nRunning 'cloudinit' pep8:"
 echo "${cmd[@]}"
 "${cmd[@]}"
-
diff --git a/tools/run-pylint b/tools/run-pylint
index b74efda9..0b7c16d4 100755
--- a/tools/run-pylint
+++ b/tools/run-pylint
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
-   files=( $(find * -name "*.py" -type f) )
+   files=( bin/cloud-init $(find * -name "*.py" -type f) )
 else
    files=( "$@" );
 fi 
-- 
cgit v1.2.3


From 6d474342163b05a29c198964ececd57db8658365 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 24 Jan 2014 15:28:06 -0500
Subject: add --dummy-variables-rgx= param when calling pylint

new pylint in trusty complains about '_' variables if we don't do this.
This seems to be ok in older versions of pylint also.
---
 tools/run-pylint | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/run-pylint b/tools/run-pylint
index 0b7c16d4..0fe0c64a 100755
--- a/tools/run-pylint
+++ b/tools/run-pylint
@@ -16,6 +16,7 @@ cmd=(
     --rcfile=$RC_FILE
     --disable=R
     --disable=I
+    --dummy-variables-rgx="_"
     "${files[@]}"
 )
 
-- 
cgit v1.2.3