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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/gpg.py
17
17
 
18
18
"""GPG signing and checking logic."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
import os
21
23
 
22
24
from breezy.lazy_import import lazy_import
35
37
from . import (
36
38
    errors,
37
39
    )
 
40
from .sixish import (
 
41
    text_type,
 
42
    )
38
43
 
39
44
# verification results
40
45
SIGNATURE_VALID = 0
238
243
            raise GpgNotInstalled(
239
244
                'Set create_signatures=no to disable creating signatures.')
240
245
 
241
 
        if isinstance(content, str):
 
246
        if isinstance(content, text_type):
242
247
            raise errors.BzrBadParameterUnicode('content')
243
248
 
244
249
        plain_text = gpg.Data(content)