From c1db99e4f21ff27596023e51423c3e01444f2cb9 Mon Sep 17 00:00:00 2001
From: Florian Rathgeber <florian.rathgeber@gmail.com>
Date: Thu, 27 Mar 2014 10:40:26 +0000
Subject: [PATCH] Use try/except/else to disable demandimport

---
 flake8/_pyflakes.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flake8/_pyflakes.py b/flake8/_pyflakes.py
index fabcfbd..cf80612 100644
--- a/flake8/_pyflakes.py
+++ b/flake8/_pyflakes.py
@@ -2,9 +2,10 @@
 try:
     # The 'demandimport' breaks pyflakes and flake8._pyflakes
     from mercurial import demandimport
-    demandimport.disable()
 except ImportError:
     pass
+else:
+    demandimport.disable()
 import pyflakes
 import pyflakes.checker