--- a/mod_util.py Sat Sep 05 05:25:36 2015 +0300 +++ b/mod_util.py Mon Oct 05 21:55:53 2015 +0300 @@ -32,10 +32,11 @@ import re import modulecore import utility -import calc +import calculator import urllib.parse import datetime from munge import munge +from math import pi as π @modulecore.irc_command (args='<value> as <valuetype>') def convert (bot, args, reply, error, **rest): @@ -46,18 +47,18 @@ error (str (e)) valuetype = args['valuetype'] - + if valuetype in ['radians', 'degrees']: if valuetype == 'radians': radvalue = value - degvalue = (value * 180.) / math.pi + degvalue = (value * 180.) / π else: - radvalue = (value * math.pi) / 180. + radvalue = (value * π) / 180. degvalue = value - + reply ('%s radians, %s degrees (%s)' % (radvalue, degvalue, degvalue % 360.)) return - + if valuetype in ['celsius', 'fahrenheit']: if valuetype == 'celsius': celvalue = value @@ -65,10 +66,10 @@ else: celvalue = (value - 32) / 1.8 fahrvalue = value - + reply ('%s degrees celsius, %s degrees fahrenheit' % (celvalue, fahrvalue)) return - + error ('unknown valuetype %s, expected one of: degrees, radians (angle conversion), ' + 'celsius, fahrenheit (temperature conversion)' % valuetype) @@ -129,7 +130,7 @@ @modulecore.irc_command (args='<expression...>') def calc (bot, reply, args, **rest): '''Calculates a mathematical expression.''' - reply (calc.Calculator().calc (args['expression'])) + reply (calculator.calc (args['expression'])) @modulecore.irc_command() def more (commandObject, **rest): @@ -171,10 +172,4 @@ @modulecore.irc_command (args='<format...>') def strftime (reply, args, **rest): - '''Formats current time.''' reply ('\x0f' + datetime.datetime.utcnow().strftime (args['format'])) - -@modulecore.irc_command (name='munge', args='<string...>') -def mungecmd (reply, args, **rest): - '''Tests text munging.''' - reply ('\x0f' + munge (args['string'])) \ No newline at end of file