Merge lp:~jelmer/loggerhead/sixish into lp:loggerhead

[Jelmer Vernooij]

Avoid breezy.sixish, which is not available in newer versions of Breezy.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'loggerhead/apps/branch.py'
--- loggerhead/apps/branch.py	2018-10-20 15:14:09 +0000
+++ loggerhead/apps/branch.py	2020-05-06 19:28:25 +0000
@@ -24,7 +24,6 @@
 import breezy.errors
 from breezy.hooks import Hooks
 import breezy.lru_cache
-from breezy.sixish import viewitems
 from breezy import urlutils
 
 from paste import request
@@ -103,7 +102,7 @@
         if isinstance(args[0], list):
             args = args[0]
         qs = []
-        for k, v in viewitems(kw):
+        for k, v in kw.items():
             if v is not None:
                 qs.append('%s=%s' % (k, urlutils.quote(v)))
         qs = '&'.join(qs)
@@ -115,7 +114,7 @@
         if isinstance(args[0], list):
             args = args[0]
         qs = []
-        for k, v in viewitems(kw):
+        for k, v in kw.items():
             if v is not None:
                 qs.append('%s=%s' % (k, urlutils.quote(v)))
         qs = '&'.join(qs)

=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2020-01-19 20:09:08 +0000
+++ loggerhead/history.py	2020-05-06 19:28:25 +0000
@@ -42,10 +42,6 @@
 import breezy.foreign
 import breezy.osutils
 import breezy.revision
-from breezy.sixish import (
-    text_type,
-    viewvalues,
-    )
 
 from . import search
 from . import util
@@ -469,7 +465,7 @@
         # if a "revid" is actually a dotted revno, convert it to a revid
         if revid is None:
             return revid
-        if not isinstance(revid, (str, text_type)):
+        if not isinstance(revid, (str, util.text_type)):
             raise TypeError(revid)
         if revid == 'head:':
             return self.last_revid
@@ -640,7 +636,7 @@
             else:
                 d[revnos] = (revnolast, revid)
 
-        return [revid for (_, revid) in viewvalues(d)]
+        return [revid for (_, revid) in d.values()]
 
     def add_branch_nicks(self, change):
         """

=== modified file 'loggerhead/load_test.py'
--- loggerhead/load_test.py	2018-10-20 12:15:22 +0000
+++ loggerhead/load_test.py	2020-05-06 19:28:25 +0000
@@ -77,7 +77,6 @@
     transport,
     urlutils,
     )
-from breezy.sixish import viewvalues
 
 # This code will be doing multi-threaded requests against breezy.transport
 # code. We want to make sure to load everything ahead of time, so we don't get
@@ -193,7 +192,7 @@
 
     def finish_queues(self):
         """Wait for all queues of all children to finish."""
-        for h, t in viewvalues(self._threads):
+        for h, t in self._threads.values():
             h.queue.join()
 
     def stop_and_join(self):
@@ -202,7 +201,7 @@
         This will stop even if workers still have work items.
         """
         self.stop_event.set()
-        for h, t in viewvalues(self._threads):
+        for h, t in self._threads.values():
             # Signal the queue that it should stop blocking, we don't have to
             # wait for the queue to empty, because we may see stop_event before
             # we see the <noop>

=== modified file 'loggerhead/util.py'
--- loggerhead/util.py	2018-10-20 16:06:44 +0000
+++ loggerhead/util.py	2020-05-06 19:28:25 +0000
@@ -32,11 +32,6 @@
 import os
 import subprocess
 
-from breezy.sixish import (
-    text_type,
-    viewitems,
-    )
-
 try:
     from xml.etree import ElementTree as ET
 except ImportError:
@@ -140,14 +135,14 @@
     def __init__(self, _dict=None, **kw):
         self._properties = {}
         if _dict is not None:
-            for key, value in viewitems(_dict):
+            for key, value in _dict.items():
                 setattr(self, key, value)
-        for key, value in viewitems(kw):
+        for key, value in kw.items():
             setattr(self, key, value)
 
     def __repr__(self):
         out = '{ '
-        for key, value in viewitems(self.__dict__):
+        for key, value in self.__dict__.items():
             if key.startswith('_') or (getattr(self.__dict__[key],
                                        '__call__', None) is not None):
                 continue
@@ -565,7 +560,7 @@
 
 
 def set_context(map):
-    t_context.map = dict((k, v) for (k, v) in viewitems(map) if k in _valid)
+    t_context.map = dict((k, v) for (k, v) in map.items() if k in _valid)
 
 
 def get_context(**overrides):
@@ -584,7 +579,7 @@
         map['remember'] = t_context.map.get('remember', None)
     else:
         map.update(t_context.map)
-    overrides = dict((k, v) for (k, v) in viewitems(overrides) if k in _valid)
+    overrides = dict((k, v) for (k, v) in overrides.items() if k in _valid)
     map.update(overrides)
     return map
 
@@ -678,3 +673,9 @@
     elif isinstance(obj, datetime.datetime):
         return tuple(obj.utctimetuple())
     raise TypeError(repr(obj) + " is not JSON serializable")
+
+
+if sys.version_info[0] > 2:
+    text_type = str
+else:
+    text_type = unicode  # noqa: F821

=== modified file 'loggerhead/wholehistory.py'
--- loggerhead/wholehistory.py	2018-10-20 13:45:31 +0000
+++ loggerhead/wholehistory.py	2020-05-06 19:28:25 +0000
@@ -21,10 +21,6 @@
 import time
 
 from breezy.revision import is_null, NULL_REVISION
-from breezy.sixish import (
-    viewitems,
-    viewkeys,
-    )
 from breezy.tsort import merge_sort
 
 
@@ -36,7 +32,7 @@
     # Filter ghosts, and null:
     if NULL_REVISION in revision_graph:
         del revision_graph[NULL_REVISION]
-    for key, parents in viewitems(revision_graph):
+    for key, parents in revision_graph.items():
         revision_graph[key] = tuple(parent for parent in parents if parent
             in revision_graph)
     return revision_graph
@@ -76,7 +72,7 @@
         _rev_indices[revid] = len(_rev_info)
         _rev_info.append([(seq, revid, merge_depth, revno_str, end_of_merge), (), parents])
 
-    for revid in viewkeys(_revision_graph):
+    for revid in _revision_graph.keys():
         if _rev_info[_rev_indices[revid]][0][2] == 0:
             continue
         for parent in _revision_graph[revid]:

=== modified file 'loggerhead/zptsupport.py'
--- loggerhead/zptsupport.py	2018-10-20 13:45:31 +0000
+++ loggerhead/zptsupport.py	2020-05-06 19:28:25 +0000
@@ -21,8 +21,6 @@
 import re
 from io import StringIO
 
-from breezy.sixish import viewitems
-
 from simpletal import simpleTAL, simpleTALES
 
 _zpt_cache = {}
@@ -50,7 +48,7 @@
 
     def expand(self, **info):
         context = simpleTALES.Context(allowPythonPath=1)
-        for k, v in viewitems(info):
+        for k, v in info.items():
             context.addGlobal(k, v)
         s = StringIO()
         self.template.expandInline(context, s)
@@ -58,7 +56,7 @@
 
     def expand_into(self, f, **info):
         context = simpleTALES.Context(allowPythonPath=1)
-        for k, v in viewitems(info):
+        for k, v in info.items():
             context.addGlobal(k, v)
         self.template.expand(context, f, outputEncoding='utf-8')