diff options
| author | Dan Goldsmith <djgoldsmith@googlemail.com> | 2014-04-11 16:22:29 +0100 |
|---|---|---|
| committer | Dan Goldsmith <djgoldsmith@googlemail.com> | 2014-04-11 16:22:29 +0100 |
| commit | fe36ec0486cfc9aba10d8d87b0f42077ad1e78db (patch) | |
| tree | 046fbf0baf2ae392120ed930aeafe63a6df83cb2 /config.py | |
| parent | 3804162e9a3f0e320867ffb45e09a43f9d0156c2 (diff) | |
| parent | 3965c47e53a1c06c709048d932fe01dcf947c032 (diff) | |
| download | pylint-fe36ec0486cfc9aba10d8d87b0f42077ad1e78db.tar.gz | |
Merge with trunk
Diffstat (limited to 'config.py')
| -rw-r--r-- | config.py | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -10,7 +10,7 @@ # # You should have received a copy of the GNU General Public License along with # this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """utilities for Pylint configuration : * pylintrc @@ -97,6 +97,8 @@ def find_pylintrc(): pylintrc = ".pylintrc" else: pylintrc = join(user_home, '.pylintrc') + if not isfile(pylintrc): + pylintrc = join(user_home, '.config', 'pylintrc') if not isfile(pylintrc): if isfile('/etc/pylintrc'): pylintrc = '/etc/pylintrc' |