diff -r 52ee1b5ac277 -r 2e48c776a874 mercurial/lock.py
--- a/mercurial/lock.py	Sun Mar 12 03:33:38 2017 -0400
+++ b/mercurial/lock.py	Sun Mar 12 16:26:34 2017 -0700
@@ -28,8 +28,9 @@
     confidence. Typically it's just hostname. On modern linux, we include an
     extra Linux-specific pid namespace identifier.
     """
-    result = socket.gethostname().encode(
-        pycompat.sysstr(encoding.encoding), 'replace')
+    result = socket.gethostname()
+    if pycompat.ispy3:
+        result = result.encode(pycompat.sysstr(encoding.encoding), 'replace')
     if pycompat.sysplatform.startswith('linux'):
         try:
             result += '/%x' % os.stat('/proc/self/ns/pid').st_ino