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

Proposed by Martin Packman on 2017-05-25
Status: Merged
Approved by: Martin Packman on 2017-05-25
Approved revision: 6635
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~gz/brz/unmapped_extra
Merge into: lp:brz
Diff against target: 118 lines (+9/-10)
6 files modified
breezy/btree_index.py (+1/-2)
breezy/groupcompress.py (+3/-1)
breezy/log.py (+1/-2)
breezy/plugins/changelog_merge/changelog_merge.py (+0/-2)
breezy/repofmt/knitpack_repo.py (+3/-2)
breezy/versionedfile.py (+1/-1)
To merge this branch: bzr merge lp:~gz/brz/unmapped_extra
Reviewer Review Type Date Requested Status
Martin Packman Approve on 2017-05-25
Review via email: mp+324580@code.launchpad.net

This proposal supersedes a proposal from 2017-05-25.

Commit message

Followup change from using future_builtins to importing via sixish

Description of the change

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

Updated proposal avoiding criss-cross merge conflict.

To post a comment you must log in.
Martin Packman (gz) wrote : Posted in a previous version of this proposal

Self approving as simple tweaks.

review: Approve
The Breezy Bot (the-breezy-bot) wrote : Posted in a previous version of this proposal

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

Martin Packman (gz) wrote :

Trying again.

review: Approve
The Breezy Bot (the-breezy-bot) wrote :

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

The Breezy Bot (the-breezy-bot) wrote :

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

lp:~gz/brz/unmapped_extra updated on 2017-05-25
6635. By Martin Packman on 2017-05-25

Remove direct use of future_builtins module

Martin Packman (gz) wrote :

Had misresolved a conflict in versionedfile, now fixed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/btree_index.py'
2--- breezy/btree_index.py 2017-05-24 19:44:00 +0000
3+++ breezy/btree_index.py 2017-05-25 21:59:40 +0000
4@@ -19,8 +19,6 @@
5
6 from __future__ import absolute_import
7
8-from future_builtins import map
9-
10 from .lazy_import import lazy_import
11 lazy_import(globals(), """
12 import bisect
13@@ -44,6 +42,7 @@
14 from .index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN
15 from .sixish import (
16 BytesIO,
17+ map,
18 )
19
20
21
22=== modified file 'breezy/groupcompress.py'
23--- breezy/groupcompress.py 2017-05-24 19:44:00 +0000
24+++ breezy/groupcompress.py 2017-05-25 21:59:40 +0000
25@@ -18,7 +18,6 @@
26
27 from __future__ import absolute_import
28
29-from future_builtins import map
30 import time
31 import zlib
32
33@@ -43,6 +42,9 @@
34
35 from .btree_index import BTreeBuilder
36 from .lru_cache import LRUSizeCache
37+from .sixish import (
38+ map,
39+ )
40 from .versionedfile import (
41 _KeyRefs,
42 adapter_registry,
43
44=== modified file 'breezy/log.py'
45--- breezy/log.py 2017-05-24 20:47:30 +0000
46+++ breezy/log.py 2017-05-25 21:59:40 +0000
47@@ -51,7 +51,6 @@
48
49 import codecs
50 import itertools
51-from future_builtins import zip
52 import re
53 import sys
54 from warnings import (
55@@ -88,7 +87,7 @@
56 )
57 from breezy.sixish import (
58 BytesIO,
59- PY3,
60+ zip,
61 )
62
63
64
65=== modified file 'breezy/plugins/changelog_merge/changelog_merge.py'
66--- breezy/plugins/changelog_merge/changelog_merge.py 2017-05-24 19:44:00 +0000
67+++ breezy/plugins/changelog_merge/changelog_merge.py 2017-05-25 21:59:40 +0000
68@@ -18,8 +18,6 @@
69
70 from __future__ import absolute_import
71
72-from future_builtins import map
73-
74 import difflib
75
76 from ... import (
77
78=== modified file 'breezy/repofmt/knitpack_repo.py'
79--- breezy/repofmt/knitpack_repo.py 2017-05-24 16:21:50 +0000
80+++ breezy/repofmt/knitpack_repo.py 2017-05-25 21:59:40 +0000
81@@ -18,8 +18,6 @@
82
83 from __future__ import absolute_import
84
85-from future_builtins import zip
86-
87 from ..lazy_import import lazy_import
88 lazy_import(globals(), """
89 import time
90@@ -69,6 +67,9 @@
91 PackRootCommitBuilder,
92 RepositoryPackCollection,
93 )
94+from ..sixish import (
95+ zip
96+ )
97 from ..vf_repository import (
98 StreamSource,
99 )
100
101=== modified file 'breezy/versionedfile.py'
102--- breezy/versionedfile.py 2017-05-24 19:44:00 +0000
103+++ breezy/versionedfile.py 2017-05-25 21:59:40 +0000
104@@ -19,7 +19,6 @@
105 from __future__ import absolute_import
106
107 from copy import copy
108-from future_builtins import zip
109 import itertools
110 import os
111 import struct
112@@ -45,6 +44,7 @@
113 from .registry import Registry
114 from .sixish import (
115 BytesIO,
116+ zip,
117 )
118 from .textmerge import TextMerge
119

Subscribers

People subscribed via source and target branches