diff -r 61bec5d96adc mercurial/pure/mpatch.py
--- a/mercurial/pure/mpatch.py	Wed Jun 08 09:59:17 2016 +0200
+++ b/mercurial/pure/mpatch.py	Wed Jun 22 09:05:27 2016 +0200
@@ -9,9 +9,8 @@
 
 import struct
 
-from .. import modulepolicy, policynocffi
+from . import policy, pycompat
 
-from . import pycompat
 stringio = pycompat.stringio
 
 class mpatchError(Exception):
@@ -128,11 +127,11 @@
     outlen += orig - last
     return outlen
 
-if modulepolicy not in policynocffi:
+if policy.policy not in policy.policynocffi:
     try:
         from _mpatch_cffi import ffi, lib
     except ImportError:
-        if modulepolicy == 'cffi': # strict cffi import
+        if policy.policy == 'cffi': # strict cffi import
             raise
     else:
         @ffi.def_extern()