Merge pull request #6 from Steve-V/master

Some commands use input without checking if it's actually been provided
master
Sean B. Palmer 2011-06-17 08:48:39 -07:00
commit bbd2c7f943
5 changed files with 12 additions and 0 deletions

View File

@ -69,6 +69,8 @@ calc.example = '.calc 5 + 3'
def c(phenny, input):
"""Google calculator."""
if not input.group(2):
return phenny.reply("Nothing to calculate.")
q = input.group(2).encode('utf-8')
q = q.replace('\xcf\x95', 'phi') # utf-8 U+03D5
q = q.replace('\xcf\x80', 'pi') # utf-8 U+03C0
@ -99,6 +101,8 @@ def py(phenny, input):
py.commands = ['py']
def wa(phenny, input):
if not input.group(2):
return phenny.reply("No search term.")
query = input.group(2).encode('utf-8')
uri = 'http://tumbolia.appspot.com/wa/'
answer = web.get(uri + web.urllib.quote(query))

View File

@ -22,6 +22,8 @@ r_info = re.compile(
)
def dict(phenny, input):
if not input.group(2):
return phenny.reply("Nothing to define.")
word = input.group(2)
word = urllib.quote(word.encode('utf-8'))

View File

@ -69,6 +69,8 @@ r_query = re.compile(
)
def gcs(phenny, input):
if not input.group(2):
return phenny.reply("Nothing to compare.")
queries = r_query.findall(input.group(2))
if len(queries) > 6:
return phenny.reply('Sorry, can only compare up to six things.')

View File

@ -11,6 +11,8 @@ import web
def val(phenny, input):
"""Check a webpage using the W3C Markup Validator."""
if not input.group(2):
return phenny.reply("Nothing to validate.")
uri = input.group(2)
if not uri.startswith('http://'):
uri = 'http://' + uri

View File

@ -72,6 +72,8 @@ def format(word, definitions, number=2):
return result.strip(' .,')
def w(phenny, input):
if not input.group(2):
return phenny.reply("Nothing to define.")
word = input.group(2)
etymology, definitions = wiktionary(word)
if not definitions: