--- a/mercurial/debugcommands.py	Fri Aug 12 11:35:17 2016 +0900
+++ b/mercurial/debugcommands.py	Sat Aug 13 12:08:23 2016 +0900
@@ -1026,11 +1026,11 @@
         err = None
         try:
             from . import (
-                base85,
                 bdiff,
                 mpatch,
             )
             from .cext import (
+                base85,
                 osutil,
             )
             dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes