/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/repository.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repository.py
40
40
from .decorators import only_raises
41
41
from .inter import InterObject
42
42
from .lock import _RelockDebugMixin, LogicalLockResult
43
 
from .sixish import (
44
 
    text_type,
45
 
    viewitems,
46
 
    )
47
43
from .trace import (
48
44
    log_exception_quietly, note, mutter, mutter_callsite, warning)
49
45
 
110
106
 
111
107
        if committer is None:
112
108
            self._committer = self._config_stack.get('email')
113
 
        elif not isinstance(committer, text_type):
 
109
        elif not isinstance(committer, str):
114
110
            self._committer = committer.decode()  # throw if non-ascii
115
111
        else:
116
112
            self._committer = committer
152
148
            raise ValueError('Invalid value for %s: %r' % (context, text))
153
149
 
154
150
    def _validate_revprops(self, revprops):
155
 
        for key, value in viewitems(revprops):
 
151
        for key, value in revprops.items():
156
152
            # We know that the XML serializers do not round trip '\r'
157
153
            # correctly, so refuse to accept them
158
 
            if not isinstance(value, (text_type, str)):
 
154
            if not isinstance(value, str):
159
155
                raise ValueError('revision property (%s) is not a valid'
160
156
                                 ' (unicode) string: %r' % (key, value))
161
157
            # TODO(jelmer): Make this repository-format specific
1052
1048
            else:
1053
1049
                query_keys.append((revision_id,))
1054
1050
        vf = self.revisions.without_fallbacks()
1055
 
        for (revision_id,), parent_keys in viewitems(
1056
 
                vf.get_parent_map(query_keys)):
 
1051
        for (revision_id,), parent_keys in (
 
1052
                vf.get_parent_map(query_keys).items()):
1057
1053
            if parent_keys:
1058
1054
                result[revision_id] = tuple([parent_revid
1059
1055
                                             for (parent_revid,) in parent_keys])
1184
1180
        # weave repositories refuse to store revisionids that are non-ascii.
1185
1181
        if revision_id is not None:
1186
1182
            # weaves require ascii revision ids.
1187
 
            if isinstance(revision_id, text_type):
 
1183
            if isinstance(revision_id, str):
1188
1184
                try:
1189
1185
                    revision_id.encode('ascii')
1190
1186
                except UnicodeEncodeError:
1620
1616
    # Filter ghosts, and null:
1621
1617
    if _mod_revision.NULL_REVISION in revision_graph:
1622
1618
        del revision_graph[_mod_revision.NULL_REVISION]
1623
 
    for key, parents in viewitems(revision_graph):
 
1619
    for key, parents in revision_graph.items():
1624
1620
        revision_graph[key] = tuple(parent for parent in parents if parent
1625
1621
                                    in revision_graph)
1626
1622
    return revision_graph