--- a/mercurial/fileset.py	Sun Jan 14 21:28:12 2018 +0100
+++ b/mercurial/fileset.py	Sun Jan 14 13:28:20 2018 +0900
@@ -12,6 +12,7 @@
 from .i18n import _
 from . import (
     error,
+    match as matchmod,
     merge,
     parser,
     pycompat,
@@ -508,8 +509,6 @@
     if x:
         # i18n: "subrepo" is a keyword
         pat = getstring(x, _("subrepo requires a pattern or no arguments"))
-
-        from . import match as matchmod # avoid circular import issues
         fast = not matchmod.patkind(pat)
         if fast:
             def m(s):