Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-09 11:04:07 +01:00
Code Issues Projects Releases Wiki Activity

Remove overly complicated code.

Browse Source
This commit is contained in:
Valentin Lorentz 2017-09-19 00:34:25 +02:00
parent 53b6acd2f4
commit 4a0ad92e58
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gpg.py
View File

@ -39,7 +39,7 @@ try:
except ImportError: except ImportError:
# As we do not want Supybot to depend on GnuPG, we will use it only if # As we do not want Supybot to depend on GnuPG, we will use it only if
# it is available. Otherwise, we just don't allow user auth through GPG. # it is available. Otherwise, we just don't allow user auth through GPG.
log.debug('Cannot import gnupg, using fallback.') log.debug('Cannot import gnupg, disabling GPG support.')
gnupg = None gnupg = None
try: try:
if gnupg: if gnupg:
@ -60,22 +60,9 @@ except OSError:
available = (gnupg is not None) available = (gnupg is not None)
def fallback(default_return=None):
"""Decorator.
Does nothing if gnupg is loaded. Otherwise, returns the supplied
default value."""
def decorator(f):
if available:
def newf(*args, **kwargs):
return f(*args, **kwargs)
else:
def newf(*args, **kwargs):
return default_return
return newf
return decorator
@fallback()
def loadKeyring(): def loadKeyring():
if not available:
return
global keyring global keyring
path = os.path.abspath(conf.supybot.directories.data.dirize('GPGkeyring')) path = os.path.abspath(conf.supybot.directories.data.dirize('GPGkeyring'))
if not os.path.isdir(path): if not os.path.isdir(path):