/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/plugins/propose/launchpad.py

  • Committer: Jelmer Vernooij
  • Date: 2019-07-25 23:22:30 UTC
  • mfrom: (7374 work)
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190725232230-9b4x1nn0m19j1oh0
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/launchpad.py
118
118
                self._mp.source_git_path.encode('utf-8'))
119
119
            return urlutils.join_segment_parameters(
120
120
                self._mp.source_git_repository.git_identity,
121
 
                {"branch": branch_name})
 
121
                {"branch": str(branch_name)})
122
122
 
123
123
    def get_target_branch_url(self):
124
124
        if self._mp.target_branch:
128
128
                self._mp.target_git_path.encode('utf-8'))
129
129
            return urlutils.join_segment_parameters(
130
130
                self._mp.target_git_repository.git_identity,
131
 
                {"branch": branch_name})
 
131
                {"branch": str(branch_name)})
132
132
 
133
133
    @property
134
134
    def url(self):
541
541
                commit_message=commit_message,
542
542
                reviewers=[self.launchpad.people[reviewer].self_link
543
543
                           for reviewer in reviewers],
544
 
                review_types=[None for reviewer in reviewers])
 
544
                review_types=['' for reviewer in reviewers])
545
545
        except WebserviceFailure as e:
546
546
            # Urgh.
547
547
            if (b'There is already a branch merge proposal '