--- a/hgext/obsolete.py	Fri Oct 28 17:15:57 2016 -0700
+++ b/hgext/obsolete.py	Fri Oct 28 17:25:06 2016 -0700
@@ -13,7 +13,7 @@
 were such user.
 """
 
-from mercurial import util
+from mercurial import error
 
 try:
     from mercurial import obsolete
@@ -24,9 +24,9 @@
 import json
 
 from mercurial import cmdutil
-from mercurial import error
 from mercurial.i18n import _
 from mercurial.node import bin, nullid
+from mercurial import util
 
 
 #####################################################################

--- a/hgext/pushexperiment.py	Fri Oct 28 17:15:57 2016 -0700
+++ b/hgext/pushexperiment.py	Fri Oct 28 17:25:06 2016 -0700
@@ -12,6 +12,7 @@
 from StringIO import StringIO
 
 from mercurial.i18n import _
+from mercurial import error
 from mercurial import extensions
 from mercurial import wireproto
 from mercurial import obsolete

--- a/hgext/simple4server.py	Fri Oct 28 17:15:57 2016 -0700
+++ b/hgext/simple4server.py	Fri Oct 28 17:25:06 2016 -0700
@@ -15,6 +15,7 @@
 
 import hashlib
 import struct
+from mercurial import error
 from mercurial import util
 from mercurial import wireproto
 from mercurial import extensions