summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0027/gpg.py
diff options
context:
space:
mode:
Diffstat (limited to 'sleekxmpp/plugins/xep_0027/gpg.py')
-rw-r--r--sleekxmpp/plugins/xep_0027/gpg.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/sleekxmpp/plugins/xep_0027/gpg.py b/sleekxmpp/plugins/xep_0027/gpg.py
index 9c6ca078..52c1c461 100644
--- a/sleekxmpp/plugins/xep_0027/gpg.py
+++ b/sleekxmpp/plugins/xep_0027/gpg.py
@@ -24,7 +24,7 @@ def _extract_data(data, kind):
if not begin_headers and 'BEGIN PGP %s' % kind in line:
begin_headers = True
continue
- if begin_headers and line == '':
+ if begin_headers and line.strip() == '':
begin_data = True
continue
if 'END PGP %s' % kind in line:
@@ -40,14 +40,15 @@ class XEP_0027(BasePlugin):
description = 'XEP-0027: Current Jabber OpenPGP Usage'
dependencies = set()
stanza = stanza
+ default_config = {
+ 'gpg_binary': 'gpg',
+ 'gpg_home': '',
+ 'use_agent': True,
+ 'keyring': None,
+ 'key_server': 'pgp.mit.edu'
+ }
def plugin_init(self):
- self.gpg_binary = self.config.get('gpg_binary', 'gpg')
- self.gpg_home = self.config.get('gpg_home', '')
- self.use_agent = self.config.get('use_agent', True)
- self.keyring = self.config.get('keyring', None)
- self.key_server = self.config.get('key_server', 'pgp.mit.edu')
-
self.gpg = GPG(gnupghome=self.gpg_home,
gpgbinary=self.gpg_binary,
use_agent=self.use_agent,