/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-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bedding.py
17
17
 
18
18
"""Functions for deriving user configuration from system environment."""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
import os
23
21
import sys
24
22
 
33
31
from . import (
34
32
    errors,
35
33
    )
36
 
from .sixish import (
37
 
    PY3,
38
 
    )
39
34
 
40
35
 
41
36
def ensure_config_dir_exists(path=None):
213
208
def default_email():
214
209
    v = os.environ.get('BRZ_EMAIL')
215
210
    if v:
216
 
        if not PY3:
217
 
            v = v.decode(osutils.get_user_encoding())
218
211
        return v
219
212
    v = os.environ.get('EMAIL')
220
213
    if v:
221
 
        if not PY3:
222
 
            v = v.decode(osutils.get_user_encoding())
223
214
        return v
224
215
    name, email = _auto_user_id()
225
216
    if name and email: