diff --git a/modules/test/test_tfw.py b/modules/test/test_tfw.py index 18c7621..f1e9e8c 100644 --- a/modules/test/test_tfw.py +++ b/modules/test/test_tfw.py @@ -42,7 +42,7 @@ class TestTfw(unittest.TestCase): def test_mev(self): input = Mock(group=lambda x: '24060') - tfw.tfweV(self.phenny, input) + tfw.tfwev(self.phenny, input) out = self.phenny.say.call_args[0][0] m = re.match('^[\-\d\.]+ meV‽ .* \- .* \- [A-Z]{4} \d{2}:\d{2}Z$', out, diff --git a/modules/tfw.py b/modules/tfw.py index 130b301..8b2d891 100644 --- a/modules/tfw.py +++ b/modules/tfw.py @@ -15,7 +15,7 @@ import metar import web -def tfw(phenny, input, fahrenheit=False, celsius=False, meV=False): +def tfw(phenny, input, fahrenheit=False, celsius=False, mev=False): """.tfw - Show the fucking weather at the specified location.""" where = input.group(2) @@ -50,7 +50,7 @@ def tfw(phenny, input, fahrenheit=False, celsius=False, meV=False): temp = "{0:d}°F‽".format(int(tempf)) elif celsius: temp = "{0:d}°C‽".format(w.temperature) - elif meV: + elif mev: tempev = (w.temperature + 273.15) * 8.617343e-5 * 1000 temp = "%f meV‽" % tempev else: @@ -208,10 +208,10 @@ def tfwc(phenny, input): return tfw(phenny, input, celsius=True) tfwc.rule = (['tfwc'], r'(.*)') -def tfweV(phenny, input): +def tfwev(phenny, input): """.tfwc - The fucking weather, in fucking degrees celsius.""" - return tfw(phenny, input, meV=True) -tfweV.rule = (['tfweV', 'tfwev'], r'(.*)') + return tfw(phenny, input, mev=True) +tfwev.rule = (['tfwev'], r'(.*)') if __name__ == '__main__': print(__doc__.strip())