/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/bedding.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/bedding.py
33
33
from . import (
34
34
    errors,
35
35
    )
 
36
from .sixish import (
 
37
    PY3,
 
38
    )
36
39
 
37
40
 
38
41
def ensure_config_dir_exists(path=None):
210
213
def default_email():
211
214
    v = os.environ.get('BRZ_EMAIL')
212
215
    if v:
 
216
        if not PY3:
 
217
            v = v.decode(osutils.get_user_encoding())
213
218
        return v
214
219
    v = os.environ.get('EMAIL')
215
220
    if v:
 
221
        if not PY3:
 
222
            v = v.decode(osutils.get_user_encoding())
216
223
        return v
217
224
    name, email = _auto_user_id()
218
225
    if name and email: