Breezy

Merge lp:~jelmer/brz/pypy3 into lp:brz

  1. pypy3
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/pypy3
Merge into: lp:brz
Diff against target: 17 lines (+4/-3)
1 file modified
breezy/bzr/xml8.py (+4/-3)
To merge this branch: bzr merge lp:~jelmer/brz/pypy3
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+385611@code.launchpad.net

Commit message

Avoid deprecated behaviour in ElementTree.

Description of the change

Avoid deprecated behaviour in ElementTree.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/763/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/764/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/xml8.py'
2--- breezy/bzr/xml8.py 2020-02-18 01:57:45 +0000
3+++ breezy/bzr/xml8.py 2020-06-12 00:29:11 +0000
4@@ -241,9 +241,10 @@
5 revision_id=get_cached(elt.get('revision_id')),
6 inventory_sha1=elt.get('inventory_sha1').encode('ascii')
7 )
8- parents = elt.find('parents') or []
9- for p in parents:
10- rev.parent_ids.append(get_cached(p.get('revision_id')))
11+ parents = elt.find('parents')
12+ if parents is not None:
13+ for p in parents:
14+ rev.parent_ids.append(get_cached(p.get('revision_id')))
15 self._unpack_revision_properties(elt, rev)
16 v = elt.get('timezone')
17 if v is None:

Subscribers

People subscribed via source and target branches