Hashes: remove duplicate check for hashlib.algorithms_available

This code is never wrap()'ed if the attribute is unavailable, so it isn't necessary to check for it in runtime twice.
This commit is contained in:
James Lu 2017-11-09 09:05:58 -08:00
parent 287610b776
commit fffe1efa9b
1 changed files with 3 additions and 10 deletions

View File

@ -84,10 +84,8 @@ class Hashes(callbacks.Plugin):
"""<takes no arguments>
Returns the list of available algorithms."""
try:
irc.reply(utils.str.format("%L", hashlib.algorithms_available))
except AttributeError:
pass # allow building but not using, usually python <2.7
irc.reply(utils.str.format("%L", hashlib.algorithms_available))
if hasattr(hashlib, 'algorithms_available'):
algorithms = wrap(algorithms)
@ -96,12 +94,7 @@ class Hashes(callbacks.Plugin):
"""<algorithm> <text>
Returns TEXT after it has been hashed with ALGORITHM. See the 'algorithms' command in this plugin to return the algorithms available on this system."""
algos = []
try:
algos = hashlib.algorithms_available
except:
pass # allow building but not using, usually python <2.7
if algorithm not in algos:
if algorithm not in hashlib.algorithms_available:
irc.error("Algorithm not available.")
else:
irc.reply(hashlib.new(algorithm, text.encode('utf8')).hexdigest())