From 45c7138907f7289a2f34394d4ca0a7bbccdcbec0 Mon Sep 17 00:00:00 2001 From: Florian Rathgeber Date: Sun, 23 Mar 2014 18:35:08 +0000 Subject: [PATCH] Disable mercurial demandimport in _pyflakes module Disabling in hooks is too late since mercurial already imports _pyflakes before. Fixes #88 --- flake8/_pyflakes.py | 6 ++++++ flake8/hooks.py | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake8/_pyflakes.py b/flake8/_pyflakes.py index daf2749..fabcfbd 100644 --- a/flake8/_pyflakes.py +++ b/flake8/_pyflakes.py @@ -1,4 +1,10 @@ # -*- coding: utf-8 -*- +try: + # The 'demandimport' breaks pyflakes and flake8._pyflakes + from mercurial import demandimport + demandimport.disable() +except ImportError: + pass import pyflakes import pyflakes.checker diff --git a/flake8/hooks.py b/flake8/hooks.py index 5173883..a84c312 100644 --- a/flake8/hooks.py +++ b/flake8/hooks.py @@ -6,12 +6,6 @@ import stat from subprocess import Popen, PIPE import shutil from tempfile import mkdtemp -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