--- a/hgext3rd/evolve/serveronly.py	Tue Feb 28 14:31:28 2017 +0100
+++ b/hgext3rd/evolve/serveronly.py	Tue Feb 28 16:12:34 2017 +0100
@@ -11,28 +11,26 @@
 testedwith = '3.3 3.4-rc'
 buglink = 'https://bz.mercurial-scm.org/'
 
-import mercurial.obsolete
-
 import hashlib
 import struct
-from mercurial import error
-from mercurial import util
-from mercurial import wireproto
-from mercurial import extensions
-from mercurial import obsolete
 from cStringIO import StringIO
-from mercurial import node
+
+
+from mercurial import (
+    error,
+    exchange,
+    extensions,
+    localrepo,
+    node,
+    obsolete,
+    util,
+    wireproto
+)
 from mercurial.hgweb import hgweb_mod
-from mercurial import bundle2
-from mercurial import localrepo
-from mercurial import exchange
-from mercurial import node
 _pack = struct.pack
 
 gboptslist = gboptsmap = None
 try:
-    from mercurial import obsolete
-    from mercurial import wireproto
     gboptslist = getattr(wireproto, 'gboptslist', None)
     gboptsmap = getattr(wireproto, 'gboptsmap', None)
 except (ImportError, AttributeError):