Skip to content

Commit

Permalink
Added error checking for empty parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve-V committed Apr 19, 2011
1 parent 6c00d59 commit 482161e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions modules/calc.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ def calc(phenny, input):

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
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 2 additions & 0 deletions modules/dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
)

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'))

Expand Down
2 changes: 2 additions & 0 deletions modules/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ def gc(phenny, input):
)

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.')
Expand Down
2 changes: 2 additions & 0 deletions modules/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

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
Expand Down
2 changes: 2 additions & 0 deletions modules/wiktionary.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 482161e

Please sign in to comment.