diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-27 10:45:52 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-27 10:45:52 -0700 |
| commit | c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce (patch) | |
| tree | 88b7dabe06edbbfeb45403c06628230c18301458 /sleekxmpp/plugins/xep_0027 | |
| parent | c9b2cf60431f415584c1d12a7855e0d2ac148ec4 (diff) | |
| parent | e3fab66dfb27abdd8aa28a8d15367a490d4b42dd (diff) | |
| download | slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.gz slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.bz2 slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.xz slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0027')
| -rw-r--r-- | sleekxmpp/plugins/xep_0027/gpg.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/xep_0027/gpg.py b/sleekxmpp/plugins/xep_0027/gpg.py index 3ca9c36d..2aa6e5a0 100644 --- a/sleekxmpp/plugins/xep_0027/gpg.py +++ b/sleekxmpp/plugins/xep_0027/gpg.py @@ -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, |