Breezy

Merge lp:~jelmer/brz/create-ssls into lp:brz/3.1

  1. create-ssls
  2. Merge into 3.1
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/create-ssls
Merge into: lp:brz/3.1
Diff against target: 18 lines (+2/-2)
1 file modified
breezy/tests/ssl_certs/create_ssls.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/create-ssls
Reviewer Review Type Date Requested Status
Bernhard M. Wiedemann (community) Approve
Jelmer Vernooij Approve
Review via email: mp+395224@code.launchpad.net

Commit message

Port create_ssls.py to Python 3.

Description of the change

Import patch from https://patch-diff.githubusercontent.com/raw/breezy-team/breezy/pull/119.patch

Port create_ssls.py to Python 3.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
Bernhard M. Wiedemann (ubuntubmw) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/ssl_certs/create_ssls.py'
2--- breezy/tests/ssl_certs/create_ssls.py 2018-11-23 02:12:35 +0000
3+++ breezy/tests/ssl_certs/create_ssls.py 2020-12-11 13:02:25 +0000
4@@ -1,4 +1,4 @@
5-#! /usr/bin/env python
6+#! /usr/bin/env python3
7
8 # Copyright (C) 2007, 2008, 2009, 2017 Canonical Ltd
9 #
10@@ -84,7 +84,7 @@
11 """
12 cmd = ['openssl'] + args
13 proc = Popen(cmd, stdin=PIPE)
14- (stdout, stderr) = proc.communicate(input)
15+ (stdout, stderr) = proc.communicate(input.encode('utf-8'))
16 if proc.returncode:
17 # Basic error handling, all commands should succeed
18 raise CalledProcessError(proc.returncode, cmd)

Subscribers

People subscribed via source and target branches