--- a/mercurial/lock.py Sat Aug 08 19:28:49 2015 -0700
+++ b/mercurial/lock.py Sat Aug 08 19:30:17 2015 -0700
@@ -5,10 +5,19 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-import util, error
-import errno, os, socket, time
+from __future__ import absolute_import
+
+import errno
+import os
+import socket
+import time
import warnings
+from . import (
+ error,
+ util,
+)
+
class lock(object):
'''An advisory lock held by one process to control access to a set
of files. Non-cooperating processes or incorrectly written scripts