--- a/hgext/convert/cvs.py	Thu May 19 00:20:38 2016 +0900
+++ b/hgext/convert/cvs.py	Sat May 14 14:03:12 2016 +0900
@@ -11,12 +11,12 @@
 import re
 import socket
 
+from mercurial.i18n import _
 from mercurial import (
     encoding,
     error,
     util,
 )
-from mercurial.i18n import _
 
 from . import (
     common,