From 7a4094389a3bd27c7cb13259cafce76f31aff9d1 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 7 Jan 2016 14:15:23 -0800
Subject: [PATCH] Updating lint rules to account for new generated files.

---
 scripts/pylintrc_default | 6 ++----
 scripts/run_pylint.py    | 6 +++---
 tox.ini                  | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/pylintrc_default b/scripts/pylintrc_default
index 79c31cf9a83cc..79586b614d566 100644
--- a/scripts/pylintrc_default
+++ b/scripts/pylintrc_default
@@ -27,10 +27,8 @@
 # DEFAULT:  ignore=CVS
 # NOTE: This path must be relative due to the use of
 #       os.walk in astroid.modutils.get_module_files.
-# RATIONALE:
-#   _datastore_v1_pb2.py:   protobuf-generated code.
-ignore =
-    _datastore_v1_pb2.py
+# RATIONALE: No files to ignore.
+ignore=
 
 # Pickle collected data for later comparisons.
 # DEFAULT:  persistent=yes
diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py
index 8e2c7d302d9e2..89975a3047ee5 100644
--- a/scripts/run_pylint.py
+++ b/scripts/run_pylint.py
@@ -29,11 +29,11 @@
 
 
 IGNORED_DIRECTORIES = [
-    'gcloud/bigtable/_generated',
+    os.path.join('gcloud', 'bigtable', '_generated'),
+    os.path.join('gcloud', 'datastore', '_generated'),
 ]
 IGNORED_FILES = [
-    'gcloud/datastore/_datastore_v1_pb2.py',
-    'docs/conf.py',
+    os.path.join('docs', 'conf.py'),
     'setup.py',
 ]
 SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
diff --git a/tox.ini b/tox.ini
index bd1b0773f4efe..f35c8f8f1c81d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,7 @@ deps = {[testenv:docs]deps}
 passenv = {[testenv:docs]passenv}
 
 [pep8]
-exclude = gcloud/datastore/_datastore_v1_pb2.py,gcloud/bigtable/_generated/*,docs/conf.py
+exclude = docs/conf.py,gcloud/bigtable/_generated/*,gcloud/datastore/_generated/*
 verbose = 1
 
 [testenv:lint]