summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <cpopa@cloudbasesolutions.com>2015-06-01 19:15:25 +0300
committerClaudiu Popa <cpopa@cloudbasesolutions.com>2015-06-01 19:15:25 +0300
commitf246d61867473451c73fba171f15981e771138d8 (patch)
treee39e92ed70bd0de3f9ce629235eeae7dfa7f0717
parent76fd96d9a3a2ecee16505694d5d88280633def85 (diff)
downloadpylint-f246d61867473451c73fba171f15981e771138d8.tar.gz
Add ChangeLog entry, new test and documentation for searching .pylintrc in the current folder.
-rw-r--r--ChangeLog4
-rw-r--r--doc/run.rst1
-rw-r--r--pylint/test/unittest_lint.py4
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index da8cc9a..29cbc87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -151,6 +151,10 @@ ChangeLog for Pylint
to assume that the user knows what he is doing rather than emitting
a message which can be considered a false positive.
+ * Look for a .pylintrc configuration file in the current folder,
+ if pylintrc is not found. Dotted pylintrc files will not be searched
+ in the parents of the current folder, as it is done for pylintrc.
+
2015-03-14 -- 1.4.3
diff --git a/doc/run.rst b/doc/run.rst
index 85db098..68bc8fd 100644
--- a/doc/run.rst
+++ b/doc/run.rst
@@ -95,6 +95,7 @@ command line using the ``--rcfile`` option. Otherwise, Pylint searches for a
configuration file in the following order and uses the first one it finds:
#. ``pylintrc`` in the current working directory
+# ``.pylintrc`` in the current working directory
#. If the current working directory is in a Python module, Pylint searches \
up the hierarchy of Python modules until it finds a ``pylintrc`` file. \
This allows you to specify coding standards on a module-by-module \
diff --git a/pylint/test/unittest_lint.py b/pylint/test/unittest_lint.py
index 80c242f..92a5c1e 100644
--- a/pylint/test/unittest_lint.py
+++ b/pylint/test/unittest_lint.py
@@ -538,7 +538,8 @@ class ConfigTC(unittest.TestCase):
with tempdir() as chroot:
create_files(['a/pylintrc', 'a/b/__init__.py', 'a/b/pylintrc',
- 'a/b/c/__init__.py', 'a/b/c/d/__init__.py'])
+ 'a/b/c/__init__.py', 'a/b/c/d/__init__.py',
+ 'a/b/c/d/e/.pylintrc'])
fake_home = tempfile.mkdtemp('fake-home')
home = os.environ[HOME]
try:
@@ -551,6 +552,7 @@ class ConfigTC(unittest.TestCase):
'a/b' : join(chroot, 'a', 'b', 'pylintrc'),
'a/b/c' : join(chroot, 'a', 'b', 'pylintrc'),
'a/b/c/d' : join(chroot, 'a', 'b', 'pylintrc'),
+ 'a/b/c/d/e' : join(chroot, 'a', 'b', 'c', 'd', 'e', '.pylintrc'),
}
for basedir, expected in results.items():
os.chdir(join(chroot, basedir))