summaryrefslogtreecommitdiff
path: root/flake8/hooks.py
diff options
context:
space:
mode:
authorIan Cordasco <icordasc+bitbucket@coglib.com>2013-04-01 09:50:13 -0400
committerIan Cordasco <icordasc+bitbucket@coglib.com>2013-04-01 09:50:13 -0400
commit57417b435af0133b7fb1b7ccc4492bfa89091411 (patch)
tree5413b98571a01c6946cbe0a69929ec58c3445fb0 /flake8/hooks.py
parentd6c73b454bba83859fb2068f99c11b6106c11af7 (diff)
parent53f907b1d26f5f91d0b292c00576ce120594b368 (diff)
downloadflake8-57417b435af0133b7fb1b7ccc4492bfa89091411.tar.gz
Merged in develop (pull request #35)
Fix mercurial hook, issue #88
Diffstat (limited to 'flake8/hooks.py')
-rw-r--r--flake8/hooks.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/flake8/hooks.py b/flake8/hooks.py
index 690aeed..6473c55 100644
--- a/flake8/hooks.py
+++ b/flake8/hooks.py
@@ -4,6 +4,12 @@ import os
import sys
from subprocess import Popen, PIPE
try:
+ # The 'demandimport' breaks pyflakes and flake8._pyflakes
+ from mercurial import demandimport
+ demandimport.disable()
+except ImportError:
+ pass
+try:
from configparser import ConfigParser
except ImportError: # Python 2
from ConfigParser import ConfigParser