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

[Martin Packman]

Followup change from using future_builtins to importing via sixish

Bot cunningly didn't land unapproved changes from unmapped branch. But I wanted these changes. :)

Updated proposal avoiding criss-cross merge conflict.

[Martin Packman (gz)]

Self approving as simple tweaks.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/8/

[Martin Packman (gz)]

Trying again.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/10/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/11/

[Martin Packman (gz)]

Had misresolved a conflict in versionedfile, now fixed.

=== modified file 'breezy/btree_index.py'
--- breezy/btree_index.py	2017-05-24 19:44:00 +0000
+++ breezy/btree_index.py	2017-05-25 21:59:40 +0000
@@ -19,8 +19,6 @@
 
 from __future__ import absolute_import
 
-from future_builtins import map
-
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 import bisect
@@ -44,6 +42,7 @@
 from .index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN
 from .sixish import (
     BytesIO,
+    map,
     )
 
 

=== modified file 'breezy/groupcompress.py'
--- breezy/groupcompress.py	2017-05-24 19:44:00 +0000
+++ breezy/groupcompress.py	2017-05-25 21:59:40 +0000
@@ -18,7 +18,6 @@
 
 from __future__ import absolute_import
 
-from future_builtins import map
 import time
 import zlib
 
@@ -43,6 +42,9 @@
 
 from .btree_index import BTreeBuilder
 from .lru_cache import LRUSizeCache
+from .sixish import (
+    map,
+    )
 from .versionedfile import (
     _KeyRefs,
     adapter_registry,

=== modified file 'breezy/log.py'
--- breezy/log.py	2017-05-24 20:47:30 +0000
+++ breezy/log.py	2017-05-25 21:59:40 +0000
@@ -51,7 +51,6 @@
 
 import codecs
 import itertools
-from future_builtins import zip
 import re
 import sys
 from warnings import (
@@ -88,7 +87,7 @@
     )
 from breezy.sixish import (
     BytesIO,
-    PY3,
+    zip,
     )
 
 

=== modified file 'breezy/plugins/changelog_merge/changelog_merge.py'
--- breezy/plugins/changelog_merge/changelog_merge.py	2017-05-24 19:44:00 +0000
+++ breezy/plugins/changelog_merge/changelog_merge.py	2017-05-25 21:59:40 +0000
@@ -18,8 +18,6 @@
 
 from __future__ import absolute_import
 
-from future_builtins import map
-
 import difflib
 
 from ... import (

=== modified file 'breezy/repofmt/knitpack_repo.py'
--- breezy/repofmt/knitpack_repo.py	2017-05-24 16:21:50 +0000
+++ breezy/repofmt/knitpack_repo.py	2017-05-25 21:59:40 +0000
@@ -18,8 +18,6 @@
 
 from __future__ import absolute_import
 
-from future_builtins import zip
-
 from ..lazy_import import lazy_import
 lazy_import(globals(), """
 import time
@@ -69,6 +67,9 @@
     PackRootCommitBuilder,
     RepositoryPackCollection,
     )
+from ..sixish import (
+    zip
+    )
 from ..vf_repository import (
     StreamSource,
     )

=== modified file 'breezy/versionedfile.py'
--- breezy/versionedfile.py	2017-05-24 19:44:00 +0000
+++ breezy/versionedfile.py	2017-05-25 21:59:40 +0000
@@ -19,7 +19,6 @@
 from __future__ import absolute_import
 
 from copy import copy
-from future_builtins import zip
 import itertools
 import os
 import struct
@@ -45,6 +44,7 @@
 from .registry import Registry
 from .sixish import (
     BytesIO,
+    zip,
     )
 from .textmerge import TextMerge