Merge lp:~jelmer/brz/paramiko-compat into lp:brz/3.0

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the revision history of the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/paramiko-compat
Merge into: lp:brz/3.0
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/tests/stub_sftp.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/paramiko-compat
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+378479@code.launchpad.net

Commit message

Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Description of the change

Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

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 :
lp:~jelmer/brz/paramiko-compat updated
7479. By Jelmer Vernooij

Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/stub_sftp.py'
2--- breezy/tests/stub_sftp.py 2018-11-11 04:08:32 +0000
3+++ breezy/tests/stub_sftp.py 2020-02-03 23:02:39 +0000
4@@ -262,7 +262,7 @@
5
6 # ------------- server test implementation --------------
7
8-STUB_SERVER_KEY = """
9+STUB_SERVER_KEY = """\
10 -----BEGIN RSA PRIVATE KEY-----
11 MIICWgIBAAKBgQDTj1bqB4WmayWNPB+8jVSYpZYk80Ujvj680pOTh2bORBjbIAyz
12 oWGW+GUjzKxTiiPvVmxFgx5wdsFvF03v34lEVVhMpouqPAYQ15N37K/ir5XY+9m/

Subscribers

People subscribed via source and target branches