Merge lp:~jelmer/brz/gpg into lp:brz

[Jelmer Vernooij]

Switch to using python-gpg (part of gpgme) rather than deprecated python-gpgme.

Switch to using python-gpg (part of gpgme) rather than deprecated python-gpgme.

Also, switch to using gpgme for signing, while we're at it.

[Martin Packman (gz)]

Changes look good mostly, a couple of comments inline.

review: Approve

=== modified file 'breezy/config.py'
--- breezy/config.py	2017-06-15 01:07:35 +0000
+++ breezy/config.py	2017-07-04 21:30:36 +0000
@@ -27,7 +27,6 @@
 email=Your Name <[e-mail]>
 check_signatures=require|ignore|check-available(default)
 create_signatures=always|never|when-required(default)
-gpg_signing_command=name-of-program
 log_format=name-of-format
 validate_signatures_in_log=true|false(default)
 acceptable_keys=pattern1,pattern2
@@ -798,10 +797,6 @@
         else:
             return None
 
-    def _gpg_signing_command(self):
-        """See Config.gpg_signing_command."""
-        return self._get_user_option('gpg_signing_command')
-
     def _log_format(self):
         """See Config.log_format."""
         return self._get_user_option('log_format')
@@ -1314,10 +1309,6 @@
     def remove_user_option(self, option_name, section_name=None):
         self._get_branch_data_config().remove_option(option_name, section_name)
 
-    def _gpg_signing_command(self):
-        """See Config.gpg_signing_command."""
-        return self._get_safe_value('_gpg_signing_command')
-
     def _post_commit(self):
         """See Config.post_commit."""
         return self._get_safe_value('_post_commit')
@@ -2706,14 +2697,6 @@
     Option('email', override_from_env=['BRZ_EMAIL'], default=default_email,
            help='The users identity'))
 option_registry.register(
-    Option('gpg_signing_command',
-           default='gpg',
-           help="""\
-Program to use use for creating signatures.
-
-This should support at least the -u and --clearsign options.
-"""))
-option_registry.register(
     Option('gpg_signing_key',
            default=None,
            help="""\

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2017-06-10 18:39:27 +0000
+++ breezy/errors.py	2017-07-04 21:30:36 +0000
@@ -1771,22 +1771,6 @@
         self.username = username
 
 
-class SigningFailed(BzrError):
-
-    _fmt = 'Failed to GPG sign data with command "%(command_line)s"'
-
-    def __init__(self, command_line):
-        BzrError.__init__(self, command_line=command_line)
-
-
-class SignatureVerificationFailed(BzrError):
-
-    _fmt = 'Failed to verify GPG signature data with error "%(error)s"'
-
-    def __init__(self, error):
-        BzrError.__init__(self, error=error)
-
-
 class DependencyNotPresent(BzrError):
 
     _fmt = 'Unable to import library "%(library)s": %(error)s'
@@ -1795,14 +1779,6 @@
         BzrError.__init__(self, library=library, error=error)
 
 
-class GpgmeNotInstalled(DependencyNotPresent):
-
-    _fmt = 'python-gpgme is not installed, it is needed to verify signatures'
-
-    def __init__(self, error):
-        DependencyNotPresent.__init__(self, 'gpgme', error)
-
-
 class WorkingTreeNotRevision(BzrError):
 
     _fmt = ("The working tree for %(basedir)s has changed since"

=== modified file 'breezy/gpg.py'
--- breezy/gpg.py	2017-06-05 20:48:31 +0000
+++ breezy/gpg.py	2017-07-04 21:30:36 +0000
@@ -29,7 +29,6 @@
 
 from breezy import (
     config,
-    errors,
     trace,
     ui,
     )
@@ -39,6 +38,9 @@
     )
 """)
 
+from . import (
+    errors,
+    )
 from .sixish import (
     BytesIO,
     )
@@ -51,6 +53,30 @@
 SIGNATURE_EXPIRED = 4
 
 
+class GpgNotInstalled(errors.DependencyNotPresent):
+
+    _fmt = 'python-gpg is not installed, it is needed to verify signatures'
+
+    def __init__(self, error):
+        errors.DependencyNotPresent.__init__(self, 'gpg', error)
+
+
+class SigningFailed(errors.BzrError):
+
+    _fmt = 'Failed to GPG sign data: "%(error)s"'
+
+    def __init__(self, error):
+        errors.BzrError.__init__(self, error=error)
+
+
+class SignatureVerificationFailed(errors.BzrError):
+
+    _fmt = 'Failed to verify GPG signature data with error "%(error)s"'
+
+    def __init__(self, error):
+        errors.BzrError.__init__(self, error=error)
+
+
 def bulk_verify_signatures(repository, revids, strategy,
         process_events_callback=None):
     """Do verifications on a set of revisions
@@ -101,10 +127,10 @@
         """Real strategies take a configuration."""
 
     def sign(self, content):
-        raise errors.SigningFailed('Signing is disabled.')
+        raise SigningFailed('Signing is disabled.')
 
     def verify(self, content, testament):
-        raise errors.SignatureVerificationFailed('Signature verification is \
+        raise SignatureVerificationFailed('Signature verification is \
 disabled.')
 
     def set_acceptable_keys(self, command_line_input):
@@ -162,11 +188,32 @@
     def __init__(self, config_stack):
         self._config_stack = config_stack
         try:
-            import gpgme
-            self.context = gpgme.Context()
+            import gpg
+            self.context = gpg.Context()
         except ImportError as error:
             pass # can't use verify()
 
+        self.context.signers = self._get_signing_keys()
+
+    def _get_signing_keys(self):
+        import gpg
+        keyname = self._config_stack.get('gpg_signing_key')
+        if keyname:
+            try:
+                return [self.context.get_key(keyname)]
+            except gpg.errors.KeyNotFound:
+                pass
+
+        if keyname is None or keyname == 'default':
+            # 'default' or not setting gpg_signing_key at all means we should
+            # use the user email address
+            keyname = config.extract_email_address(self._config_stack.get('email'))
+        possible_keys = self.context.keylist(keyname, secret=True)
+        try:
+            return [next(possible_keys)]
+        except StopIteration:
+            return []
+
     @staticmethod
     def verify_signatures_available():
         """
@@ -175,55 +222,24 @@
         :return: boolean if this strategy can verify signatures
         """
         try:
-            import gpgme
+            import gpg
             return True
         except ImportError as error:
             return False
 
-    def _command_line(self):
-        key = self._config_stack.get('gpg_signing_key')
-        if key is None or key == 'default':
-            # 'default' or not setting gpg_signing_key at all means we should
-            # use the user email address
-            key = config.extract_email_address(self._config_stack.get('email'))
-        return [self._config_stack.get('gpg_signing_command'), '--clearsign',
-                '-u', key]
-
     def sign(self, content):
+        import gpg
         if isinstance(content, unicode):
             raise errors.BzrBadParameterUnicode('content')
-        ui.ui_factory.clear_term()
 
-        preexec_fn = _set_gpg_tty
-        if sys.platform == 'win32':
-            # Win32 doesn't support preexec_fn, but wouldn't support TTY anyway.
-            preexec_fn = None
+        plain_text = gpg.Data(content)
         try:
-            process = subprocess.Popen(self._command_line(),
-                                       stdin=subprocess.PIPE,
-                                       stdout=subprocess.PIPE,
-                                       preexec_fn=preexec_fn)
-            try:
-                result = process.communicate(content)[0]
-                if process.returncode is None:
-                    process.wait()
-                if process.returncode != 0:
-                    raise errors.SigningFailed(self._command_line())
-                return result
-            except OSError as e:
-                if e.errno == errno.EPIPE:
-                    raise errors.SigningFailed(self._command_line())
-                else:
-                    raise
-        except ValueError:
-            # bad subprocess parameters, should never happen.
-            raise
-        except OSError as e:
-            if e.errno == errno.ENOENT:
-                # gpg is not installed
-                raise errors.SigningFailed(self._command_line())
-            else:
-                raise
+            output, result = self.context.sign(
+                plain_text, mode=gpg.constants.sig.mode.CLEAR)
+        except gpg.errors.GPGMEError as error:
+            raise SigningFailed(str(error))
+
+        return output
 
     def verify(self, content, testament):
         """Check content has a valid signature.
@@ -234,74 +250,75 @@
         :return: SIGNATURE_VALID or a failed SIGNATURE_ value, key uid if valid
         """
         try:
-            import gpgme
+            import gpg
         except ImportError as error:
-            raise errors.GpgmeNotInstalled(error)
+            raise errors.GpgNotInstalled(error)
 
-        signature = BytesIO(content)
-        plain_output = BytesIO()
+        signature = gpg.Data(content)
+        sink = gpg.Data()
         try:
-            result = self.context.verify(signature, None, plain_output)
-        except gpgme.GpgmeError as error:
-            raise errors.SignatureVerificationFailed(error[2])
+            plain_output, result = self.context.verify(signature)
+        except gpg.errors.BadSignatures as error:
+            signatures = error.result.signatures
+            fingerprint = signatures[0].fpr
+            if signatures[0].summary & gpg.constants.SIGSUM_KEY_EXPIRED:
+                expires = self.context.get_key(signatures[0].fpr).subkeys[0].expires
+                if expires > signatures[0].timestamp:
+                    # The expired key was not expired at time of signing.
+                    # test_verify_expired_but_valid()
+                    return SIGNATURE_EXPIRED, fingerprint[-8:]
+                else:
+                    # I can't work out how to create a test where the signature
+                    # was expired at the time of signing.
+                    return SIGNATURE_NOT_VALID, None
+
+            # GPG does not know this key.
+            # test_verify_unknown_key()
+            if signatures[0].summary & gpg.constants.SIGSUM_KEY_MISSING:
+                return SIGNATURE_KEY_MISSING, fingerprint[-8:]
+
+            return SIGNATURE_NOT_VALID, None
+        except gpg.errors.GPGMEError as error:
+            raise SignatureVerificationFailed(error[2])
 
         # No result if input is invalid.
         # test_verify_invalid()
-        if len(result) == 0:
+        if len(result.signatures) == 0:
             return SIGNATURE_NOT_VALID, None
         # User has specified a list of acceptable keys, check our result is in
         # it.  test_verify_unacceptable_key()
-        fingerprint = result[0].fpr
+        fingerprint = result.signatures[0].fpr
         if self.acceptable_keys is not None:
             if not fingerprint in self.acceptable_keys:
                 return SIGNATURE_KEY_MISSING, fingerprint[-8:]
         # Check the signature actually matches the testament.
         # test_verify_bad_testament()
-        if testament != plain_output.getvalue():
+        if testament != plain_output:
             return SIGNATURE_NOT_VALID, None
-        # Yay gpgme set the valid bit.
+        # Yay gpg set the valid bit.
         # Can't write a test for this one as you can't set a key to be
-        # trusted using gpgme.
-        if result[0].summary & gpgme.SIGSUM_VALID:
+        # trusted using gpg.
+        if result.signatures[0].summary & gpg.constants.SIGSUM_VALID:
             key = self.context.get_key(fingerprint)
             name = key.uids[0].name
             email = key.uids[0].email
             return SIGNATURE_VALID, name + " <" + email + ">"
         # Sigsum_red indicates a problem, unfortunatly I have not been able
         # to write any tests which actually set this.
-        if result[0].summary & gpgme.SIGSUM_RED:
+        if result.signatures[0].summary & gpg.constants.SIGSUM_RED:
             return SIGNATURE_NOT_VALID, None
-        # GPG does not know this key.
-        # test_verify_unknown_key()
-        if result[0].summary & gpgme.SIGSUM_KEY_MISSING:
-            return SIGNATURE_KEY_MISSING, fingerprint[-8:]
         # Summary isn't set if sig is valid but key is untrusted but if user
         # has explicity set the key as acceptable we can validate it.
-        if result[0].summary == 0 and self.acceptable_keys is not None:
+        if result.signatures[0].summary == 0 and self.acceptable_keys is not None:
             if fingerprint in self.acceptable_keys:
                 # test_verify_untrusted_but_accepted()
                 return SIGNATURE_VALID, None
         # test_verify_valid_but_untrusted()
-        if result[0].summary == 0 and self.acceptable_keys is None:
-            return SIGNATURE_NOT_VALID, None
-        if result[0].summary & gpgme.SIGSUM_KEY_EXPIRED:
-            expires = self.context.get_key(result[0].fpr).subkeys[0].expires
-            if expires > result[0].timestamp:
-                # The expired key was not expired at time of signing.
-                # test_verify_expired_but_valid()
-                return SIGNATURE_EXPIRED, fingerprint[-8:]
-            else:
-                # I can't work out how to create a test where the signature
-                # was expired at the time of signing.
-                return SIGNATURE_NOT_VALID, None
-        # A signature from a revoked key gets this.
-        # test_verify_revoked_signature()
-        if ((result[0].summary & gpgme.SIGSUM_SYS_ERROR
-             or result[0].status.strerror == 'Certificate revoked')):
+        if result.signatures[0].summary == 0 and self.acceptable_keys is None:
             return SIGNATURE_NOT_VALID, None
         # Other error types such as revoked keys should (I think) be caught by
         # SIGSUM_RED so anything else means something is buggy.
-        raise errors.SignatureVerificationFailed(
+        raise SignatureVerificationFailed(
             "Unknown GnuPG key verification result")
 
     def set_acceptable_keys(self, command_line_input):

=== modified file 'breezy/help_topics/en/configuration.txt'
--- breezy/help_topics/en/configuration.txt	2017-06-12 23:25:04 +0000
+++ breezy/help_topics/en/configuration.txt	2017-07-04 21:30:36 +0000
@@ -498,16 +498,6 @@
     This section only applies to the branch at this directory and not
     branches below it.
 
-gpg_signing_command
-~~~~~~~~~~~~~~~~~~~
-
-(Default: "gpg"). Which program should be used to sign and check revisions.
-For example::
-
-    gpg_signing_command = /usr/bin/gnpg
-
-The specified command must accept the options "--clearsign" and "-u <email>".
-
 bzr_remote_path
 ~~~~~~~~~~~~~~~
 

=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py	2017-06-22 01:52:28 +0000
+++ breezy/tests/blackbox/test_log.py	2017-07-04 21:30:36 +0000
@@ -17,6 +17,9 @@
 
 """Black-box tests for brz log."""
 
+from __future__ import absolute_import
+
+
 import os
 
 from breezy import (
@@ -474,7 +477,7 @@
 class TestLogSignatures(TestLog):
 
     def test_log_with_signatures(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
 
         tree = self.make_linear_branch(format='dirstate-tags')
 
@@ -482,7 +485,7 @@
         self.assertTrue('signature: no signature' in log)
 
     def test_log_without_signatures(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
 
         tree = self.make_linear_branch(format='dirstate-tags')
 

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2017-06-17 12:58:29 +0000
+++ breezy/tests/features.py	2017-07-04 21:30:36 +0000
@@ -17,6 +17,8 @@
 """A collection of commonly used 'Features' to optionally run tests.
 """
 
+from __future__ import absolute_import
+
 import os
 import subprocess
 import stat
@@ -373,7 +375,7 @@
 not_running_as_root = _NotRunningAsRoot()
 
 apport = ModuleAvailableFeature('apport')
-gpgme = ModuleAvailableFeature('gpgme')
+gpg = ModuleAvailableFeature('gpg')
 lzma = ModuleAvailableFeature('lzma')
 meliae = ModuleAvailableFeature('meliae.scanner')
 paramiko = ModuleAvailableFeature('paramiko')

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2017-06-18 22:23:02 +0000
+++ breezy/tests/test_commit.py	2017-07-04 21:30:36 +0000
@@ -33,7 +33,6 @@
 from ..errors import (
     PointlessCommit,
     BzrError,
-    SigningFailed,
     LockContention,
     )
 from . import (
@@ -53,7 +52,6 @@
 
     def __init__(self):
         super(MustSignConfig, self).__init__('''
-gpg_signing_command=cat -
 create_signatures=always
 ''')
 
@@ -431,7 +429,6 @@
             # monkey patch gpg signing mechanism
             breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
             conf = config.MemoryStack('''
-gpg_signing_command=cat -
 create_signatures=always
 ''')
             commit.Commit(config_stack=conf).commit(
@@ -457,10 +454,9 @@
             # monkey patch gpg signing mechanism
             breezy.gpg.GPGStrategy = breezy.gpg.DisabledGPGStrategy
             conf = config.MemoryStack('''
-gpg_signing_command=cat -
 create_signatures=always
 ''')
-            self.assertRaises(SigningFailed,
+            self.assertRaises(breezy.gpg.SigningFailed,
                               commit.Commit(config_stack=conf).commit,
                               message="base",
                               allow_pointless=True,

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2017-06-12 23:25:04 +0000
+++ breezy/tests/test_config.py	2017-07-04 21:30:36 +0000
@@ -176,7 +176,6 @@
 email=Erik B\u00e5gfors <[e-mail]>
 editor=vim
 change_editor=vimdiff -of @new_path @old_path
-gpg_signing_command=gnome-gpg
 gpg_signing_key=DD4D5088
 log_format=short
 validate_signatures_in_log=true
@@ -232,7 +231,6 @@
 # test trailing / matching with no children
 [/a/]
 check_signatures=check-available
-gpg_signing_command=false
 gpg_signing_key=default
 user_local_option=local
 # test trailing / matching

=== modified file 'breezy/tests/test_gpg.py'
--- breezy/tests/test_gpg.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_gpg.py	2017-07-04 21:30:36 +0000
@@ -43,90 +43,17 @@
         if content is None:
             content = '''
 gpg_signing_key=[e-mail]
-gpg_signing_command=false'''
+'''
         super(FakeConfig, self).__init__(content)
 
 
-class TestCommandLine(tests.TestCase):
-
-    def setUp(self):
-        super(TestCommandLine, self).setUp()
-        self.my_gpg = gpg.GPGStrategy(FakeConfig())
-
-    def test_signing_command_line(self):
-        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]'],
-                         self.my_gpg._command_line())
-
-    def test_signing_command_line_from_default(self):
-        # Using 'default' for gpg_signing_key will use the mail part of 'email'
-        my_gpg = gpg.GPGStrategy(FakeConfig('''
-email=Amy <[e-mail]>
-gpg_signing_key=default
-gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]'],
-                         my_gpg._command_line())
-
-    def test_signing_command_line_from_email(self):
-        # Not setting gpg_signing_key will use the mail part of 'email'
-        my_gpg = gpg.GPGStrategy(FakeConfig('''
-email=Amy <[e-mail]>
-gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', '[e-mail]'],
-                         my_gpg._command_line())
-
-    def test_checks_return_code(self):
-        # This test needs a unix like platform - one with 'false' to run.
-        # if you have one, please make this work :)
-        self.assertRaises(errors.SigningFailed, self.my_gpg.sign, 'content')
-
-    def assertProduces(self, content):
-        # This needs a 'cat' command or similar to work.
-        if sys.platform == 'win32':
-            # Windows doesn't come with cat, and we don't require it
-            # so lets try using python instead.
-            # But stupid windows and line-ending conversions.
-            # It is too much work to make sys.stdout be in binary mode.
-            # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65443
-            self.my_gpg._command_line = lambda:[sys.executable, '-c',
-                    'import sys; sys.stdout.write(sys.stdin.read())']
-            new_content = content.replace('\n', '\r\n')
-
-            self.assertEqual(new_content, self.my_gpg.sign(content))
-        else:
-            self.my_gpg._command_line = lambda:['cat', '-']
-            self.assertEqual(content, self.my_gpg.sign(content))
-
-    def test_returns_output(self):
-        content = "some content\nwith newlines\n"
-        self.assertProduces(content)
-
-    def test_clears_progress(self):
-        content = "some content\nwith newlines\n"
-        old_clear_term = ui.ui_factory.clear_term
-        clear_term_called = []
-        def clear_term():
-            old_clear_term()
-            clear_term_called.append(True)
-        ui.ui_factory.clear_term = clear_term
-        try:
-            self.assertProduces(content)
-        finally:
-            ui.ui_factory.clear_term = old_clear_term
-        self.assertEqual([True], clear_term_called)
-
-    def test_aborts_on_unicode(self):
-        """You can't sign Unicode text; it must be encoded first."""
-        self.assertRaises(errors.BzrBadParameterUnicode,
-                          self.assertProduces, u'foo')
-
-
 class TestVerify(TestCase):
 
     def import_keys(self):
-        import gpgme
-        context = gpgme.Context()
+        import gpg
+        context = gpg.Context()
 
-        key = BytesIO(b"""-----BEGIN PGP PUBLIC KEY BLOCK-----
+        key = gpg.Data(b"""-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 mQENBE343IgBCADwzPW7kmKb2bjB+UU+1ER/ABMZspvtoZMPusUw7bk6coXHF/0W
@@ -158,7 +85,7 @@
 -----END PGP PUBLIC KEY BLOCK-----
 """)
 
-        secret_key = BytesIO(b"""-----BEGIN PGP PRIVATE KEY BLOCK-----
+        secret_key = gpg.Data(b"""-----BEGIN PGP PRIVATE KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 lQOYBE343IgBCADwzPW7kmKb2bjB+UU+1ER/ABMZspvtoZMPusUw7bk6coXHF/0W
@@ -217,7 +144,7 @@
 -----END PGP PRIVATE KEY BLOCK-----
 """)
 
-        revoked_key = BytesIO(b"""-----BEGIN PGP PUBLIC KEY BLOCK-----
+        revoked_key = gpg.Data(b"""-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 mI0ETjlW5gEEAOb/6P+TVM59E897wRtatxys2BhsHCXM4T7xjIiANfDwejDdifqh
@@ -242,7 +169,7 @@
 -----END PGP PUBLIC KEY BLOCK-----
 """)
 
-        expired_key = BytesIO(b"""-----BEGIN PGP PUBLIC KEY BLOCK-----
+        expired_key = gpg.Data(b"""-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 mI0ETjZ6PAEEALkR4GcFQidCCxV7pgQwQd5MZua0YO2l92fVqHX+PhnZ6egCLKdD
@@ -263,14 +190,14 @@
 =p0gt
 -----END PGP PUBLIC KEY BLOCK-----
 """)
-        context.import_(key)
-        context.import_(secret_key)
-        context.import_(revoked_key)
-        context.import_(expired_key)
+        context.op_import(key)
+        context.op_import(secret_key)
+        context.op_import(revoked_key)
+        context.op_import(expired_key)
 
     def test_verify_untrusted_but_accepted(self):
         #untrusted by gpg but listed as acceptable_keys by user
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
 
         content = """-----BEGIN PGP SIGNED MESSAGE-----
@@ -301,7 +228,7 @@
                             plain))
 
     def test_verify_unacceptable_key(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
 
         content = """-----BEGIN PGP SIGNED MESSAGE-----
@@ -332,7 +259,7 @@
                          my_gpg.verify(content, plain))
 
     def test_verify_valid_but_untrusted(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
 
         content = """-----BEGIN PGP SIGNED MESSAGE-----
@@ -362,7 +289,7 @@
                             plain))
 
     def test_verify_bad_testament(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
 
         content = """-----BEGIN PGP SIGNED MESSAGE-----
@@ -394,7 +321,7 @@
 
 
     def test_verify_revoked_signature(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
 
         content = """-----BEGIN PGP SIGNED MESSAGE-----
@@ -418,7 +345,7 @@
                             plain))
 
     def test_verify_invalid(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
         content = """-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
@@ -443,7 +370,7 @@
                             my_gpg.verify(content, plain))
 
     def test_verify_expired_but_valid(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
         content = """-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
@@ -470,7 +397,7 @@
                             my_gpg.verify(content, plain))
 
     def test_verify_unknown_key(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
         content = """-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
@@ -494,7 +421,7 @@
                             my_gpg.verify(content, plain))
 
     def test_set_acceptable_keys(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
         my_gpg = gpg.GPGStrategy(FakeConfig())
         my_gpg.set_acceptable_keys("[e-mail]")
@@ -502,7 +429,7 @@
                          [u'B5DEED5FCB15DAE6ECEF919587681B1EE3080E45'])
 
     def test_set_acceptable_keys_from_config(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         self.import_keys()
         my_gpg = gpg.GPGStrategy(FakeConfig(
                 'acceptable_keys=[e-mail]'))
@@ -511,7 +438,7 @@
                          [u'B5DEED5FCB15DAE6ECEF919587681B1EE3080E45'])
 
     def test_set_acceptable_keys_unknown(self):
-        self.requireFeature(features.gpgme)
+        self.requireFeature(features.gpg)
         my_gpg = gpg.GPGStrategy(FakeConfig())
         self.notes = []
         def note(*args):
@@ -526,10 +453,10 @@
 class TestDisabled(TestCase):
 
     def test_sign(self):
-        self.assertRaises(errors.SigningFailed,
+        self.assertRaises(gpg.SigningFailed,
                           gpg.DisabledGPGStrategy(None).sign, 'content')
 
     def test_verify(self):
-        self.assertRaises(errors.SignatureVerificationFailed,
+        self.assertRaises(gpg.SignatureVerificationFailed,
                           gpg.DisabledGPGStrategy(None).verify, 'content',
                           'testament')

=== modified file 'breezy/tests/test_merge_directive.py'
--- breezy/tests/test_merge_directive.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/test_merge_directive.py	2017-07-04 21:30:36 +0000
@@ -464,8 +464,6 @@
         class FakeBranch(object):
             def get_config_stack(self):
                 return self
-            def gpg_signing_command(self):
-                return 'loopback'
         md = self.make_merge_directive('example:', 'sha', time, timezone,
             'http://example.com', source_branch="http://example.org",
             patch='booga', patch_type='diff')

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-06-22 01:52:28 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-07-04 21:30:36 +0000
@@ -56,6 +56,13 @@
    This simplifies ``brz init --help``.
    (Neil Martinsen-Burrell, #330494)
 
+ * ``python-gpg`` is now used for checking GPG signatures rather than
+   ``python-gpgme``. (Jelmer Vernooij, #1702308)
+
+ * ``python-gpg`` is now used for signing commits, rather than shelling
+   out to the gnupg command. The ``gpg_signing_command`` option has been
+   removed.  (Jelmer Vernooij, #847388)
+
 New Features
 ************