Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Slight cleanup.

This commit is contained in:
Jeremy Fincher 2004-03-30 08:32:17 +00:00
parent 71ea32c811
commit cc9522e833
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Weather.py
View File

@ -60,7 +60,7 @@ class WeatherUnit(registry.String):
s = s.capitalize()
if s not in unitAbbrevs:
raise registry.InvalidRegistryValue,\
'Unit must be one of Fahrenheit, Celsius, or Kelvin.'
'Unit must be one of Fahrenheit, Celsius, or Kelvin.'
s = unitAbbrevs[s]
registry.String.setValue(self, s)
@ -69,12 +69,14 @@ class WeatherCommand(registry.String):
m = Weather.weatherCommands
if s not in m:
raise registry.InvalidRegistryValue,\
'Command must be one of %s' % utils.commaAndify(m)
'Command must be one of %s' % utils.commaAndify(m)
else:
method = getattr(Weather, s)
Weather.weather.im_func.__doc__ = method.__doc__
registry.String.setValue(self, s)
# Registry variables moved to the bottom to use Weather.weatherCommands.
class Weather(callbacks.Privmsg):
weatherCommands = ['ham', 'cnn']
threaded = True
@ -326,7 +328,8 @@ conf.registerChannelValue(conf.supybot.plugins.Weather, 'temperatureUnit',
reporting the weather."""))
conf.registerChannelValue(conf.supybot.plugins.Weather, 'command',
WeatherCommand('cnn', """Sets the default command to use when retrieving
the weather."""))
the weather. Command must be one of %s.""" %
utils.commaAndify(Weather.weatherCommands, And='or')))
Class = Weather