Merge lp:~gz/brz/py3_lockdir into lp:brz

[Martin Packman]

Make lockdir module Python 3 compatible

Fixes the lockdir module and tests. Not totally sure about the __eq__ __ne__ implementations but seems to be all that's needed.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/lockdir.py'
--- breezy/lockdir.py	2017-05-22 00:56:52 +0000
+++ breezy/lockdir.py	2017-06-16 23:18:17 +0000
@@ -136,9 +136,13 @@
         ResourceBusy,
         TransportError,
         )
+from .i18n import gettext
+from .osutils import format_delta, rand_chars, get_host_name
+from .sixish import (
+    PY3,
+    text_type,
+    )
 from .trace import mutter, note
-from .osutils import format_delta, rand_chars, get_host_name
-from .i18n import gettext
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
@@ -301,7 +305,7 @@
                     ui.ui_factory.show_user_warning(
                         'locks_steal_dead',
                         lock_url=urlutils.join(self.transport.base, self.path),
-                        other_holder_info=unicode(other_holder))
+                        other_holder_info=text_type(other_holder))
                     self.force_break(other_holder)
                     self._trace("stole lock from dead holder")
                     return
@@ -408,7 +412,7 @@
             if ui.ui_factory.confirm_action(
                 u"Break %(lock_info)s",
                 'breezy.lockdir.break',
-                dict(lock_info=unicode(holder_info))):
+                dict(lock_info=text_type(holder_info))):
                 result = self.force_break(holder_info)
                 ui.ui_factory.show_message(
                     "Broke lock %s" % result.lock_url)
@@ -739,6 +743,9 @@
             u'held by %(user)s on %(hostname)s (process #%(pid)s), '
             u'acquired %(time_ago)s') % d)
 
+    if PY3:
+        __str__ = __unicode__
+
     def to_readable_dict(self):
         """Turn the holder info into a dict of human-readable attributes.
 
@@ -804,11 +811,17 @@
         else:
             return cls(stanza.as_dict())
 
-    def __cmp__(self, other):
-        """Value comparison of lock holders."""
-        return (
-            cmp(type(self), type(other))
-            or cmp(self.info_dict, other.info_dict))
+    def __hash__(self):
+        return id(self)
+
+    def __eq__(self, other):
+        """Equality check for lock holders."""
+        if type(self) != type(other):
+            return False
+        return self.info_dict == other.info_dict
+
+    def __ne__(self, other):
+        return not self == other
 
     def is_locked_by_this_process(self):
         """True if this process seems to be the current lock holder."""

=== modified file 'breezy/tests/test_lockdir.py'
--- breezy/tests/test_lockdir.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_lockdir.py	2017-06-16 23:18:17 +0000
@@ -40,6 +40,9 @@
     LockDir,
     LockHeldInfo,
     )
+from ..sixish import (
+    text_type,
+    )
 from . import (
     features,
     TestCase,
@@ -346,7 +349,7 @@
         ld2 = self.get_lock()
         ld.create()
         ld.lock_write()
-        ld.transport.put_bytes_non_atomic('test_lock/held/info', '\0')
+        ld.transport.put_bytes_non_atomic('test_lock/held/info', b'\0')
 
         class LoggingUIFactory(breezy.ui.SilentUIFactory):
             def __init__(self):
@@ -508,7 +511,7 @@
         t = self.get_transport()
         t.mkdir('test_lock')
         t.mkdir('test_lock/held')
-        t.put_bytes('test_lock/held/info', '')
+        t.put_bytes('test_lock/held/info', b'')
         lf = LockDir(t, 'test_lock')
         info = lf.peek()
         formatted_info = info.to_readable_dict()
@@ -526,7 +529,7 @@
         t = self.get_transport()
         t.mkdir('test_lock')
         t.mkdir('test_lock/held')
-        t.put_bytes('test_lock/held/info', '\0')
+        t.put_bytes('test_lock/held/info', b'\0')
         lf = LockDir(t, 'test_lock')
         self.assertRaises(errors.LockCorrupt, lf.peek)
         # Currently attempt_lock gives LockContention, but LockCorrupt would be
@@ -665,7 +668,7 @@
 
     def test_unicode(self):
         info = LockHeldInfo.for_this_process(None)
-        self.assertContainsRe(unicode(info),
+        self.assertContainsRe(text_type(info),
             r'held by .* on .* \(process #\d+\), acquired .* ago')
 
     def test_is_locked_by_this_process(self):