/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/grep.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/grep.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
from io import BytesIO
20
19
import re
21
20
 
22
21
from .lazy_import import lazy_import
41
40
    RevisionSpec_revid,
42
41
    RevisionSpec_revno,
43
42
    )
 
43
from .sixish import (
 
44
    BytesIO,
 
45
    )
44
46
 
45
47
_user_encoding = osutils.get_user_encoding()
46
48