From f236a203df71ad92d142205acedef13b8cef87db Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Wed, 21 Dec 2011 01:32:16 -0500 Subject: [PATCH] remove execute permissions from modules (unneeded) --- modules/__init__.py | 0 modules/admin.py | 0 modules/archwiki.py | 0 modules/botfun.py | 0 modules/botsnack.py | 0 modules/calc.py | 0 modules/clock.py | 0 modules/codepoints.py | 0 modules/etymology.py | 0 modules/fcc.py | 4 ++-- modules/head.py | 0 modules/hs.py | 0 modules/info.py | 0 modules/nsfw.py | 0 modules/oblique.py | 0 modules/ping.py | 0 modules/reload.py | 0 modules/remind.py | 0 modules/search.py | 0 modules/seen.py | 0 modules/slogan.py | 0 modules/startup.py | 0 modules/tell.py | 0 modules/tfw.py | 0 modules/translate.py | 0 modules/uncyclopedia.py | 0 modules/validate.py | 0 modules/vtluugwiki.py | 0 modules/weather.py | 0 modules/wikipedia.py | 0 modules/wiktionary.py | 0 31 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 modules/__init__.py mode change 100755 => 100644 modules/admin.py mode change 100755 => 100644 modules/archwiki.py mode change 100755 => 100644 modules/botfun.py mode change 100755 => 100644 modules/botsnack.py mode change 100755 => 100644 modules/calc.py mode change 100755 => 100644 modules/clock.py mode change 100755 => 100644 modules/codepoints.py mode change 100755 => 100644 modules/etymology.py mode change 100755 => 100644 modules/fcc.py mode change 100755 => 100644 modules/head.py mode change 100755 => 100644 modules/hs.py mode change 100755 => 100644 modules/info.py mode change 100755 => 100644 modules/nsfw.py mode change 100755 => 100644 modules/oblique.py mode change 100755 => 100644 modules/ping.py mode change 100755 => 100644 modules/reload.py mode change 100755 => 100644 modules/remind.py mode change 100755 => 100644 modules/search.py mode change 100755 => 100644 modules/seen.py mode change 100755 => 100644 modules/slogan.py mode change 100755 => 100644 modules/startup.py mode change 100755 => 100644 modules/tell.py mode change 100755 => 100644 modules/tfw.py mode change 100755 => 100644 modules/translate.py mode change 100755 => 100644 modules/uncyclopedia.py mode change 100755 => 100644 modules/validate.py mode change 100755 => 100644 modules/vtluugwiki.py mode change 100755 => 100644 modules/weather.py mode change 100755 => 100644 modules/wikipedia.py mode change 100755 => 100644 modules/wiktionary.py diff --git a/modules/__init__.py b/modules/__init__.py old mode 100755 new mode 100644 diff --git a/modules/admin.py b/modules/admin.py old mode 100755 new mode 100644 diff --git a/modules/archwiki.py b/modules/archwiki.py old mode 100755 new mode 100644 diff --git a/modules/botfun.py b/modules/botfun.py old mode 100755 new mode 100644 diff --git a/modules/botsnack.py b/modules/botsnack.py old mode 100755 new mode 100644 diff --git a/modules/calc.py b/modules/calc.py old mode 100755 new mode 100644 diff --git a/modules/clock.py b/modules/clock.py old mode 100755 new mode 100644 diff --git a/modules/codepoints.py b/modules/codepoints.py old mode 100755 new mode 100644 diff --git a/modules/etymology.py b/modules/etymology.py old mode 100755 new mode 100644 diff --git a/modules/fcc.py b/modules/fcc.py old mode 100755 new mode 100644 index 8cd4df6..a87cfd2 --- a/modules/fcc.py +++ b/modules/fcc.py @@ -15,11 +15,11 @@ def fcc(phenny, input): try: req = web.get("http://callook.info/{0}/json".format(web.quote(callsign))) - except (HTTPError, IOError): + data = json.loads(req) + except (HTTPError, IOError, ValueError): phenny.say("THE INTERNET IS FUCKING BROKEN. Please try again later.") return - data = json.loads(req) if len(data) <= 0 or data['status'] == 'INVALID': phenny.reply('No results found for {0}'.format(callsign)) return diff --git a/modules/head.py b/modules/head.py old mode 100755 new mode 100644 diff --git a/modules/hs.py b/modules/hs.py old mode 100755 new mode 100644 diff --git a/modules/info.py b/modules/info.py old mode 100755 new mode 100644 diff --git a/modules/nsfw.py b/modules/nsfw.py old mode 100755 new mode 100644 diff --git a/modules/oblique.py b/modules/oblique.py old mode 100755 new mode 100644 diff --git a/modules/ping.py b/modules/ping.py old mode 100755 new mode 100644 diff --git a/modules/reload.py b/modules/reload.py old mode 100755 new mode 100644 diff --git a/modules/remind.py b/modules/remind.py old mode 100755 new mode 100644 diff --git a/modules/search.py b/modules/search.py old mode 100755 new mode 100644 diff --git a/modules/seen.py b/modules/seen.py old mode 100755 new mode 100644 diff --git a/modules/slogan.py b/modules/slogan.py old mode 100755 new mode 100644 diff --git a/modules/startup.py b/modules/startup.py old mode 100755 new mode 100644 diff --git a/modules/tell.py b/modules/tell.py old mode 100755 new mode 100644 diff --git a/modules/tfw.py b/modules/tfw.py old mode 100755 new mode 100644 diff --git a/modules/translate.py b/modules/translate.py old mode 100755 new mode 100644 diff --git a/modules/uncyclopedia.py b/modules/uncyclopedia.py old mode 100755 new mode 100644 diff --git a/modules/validate.py b/modules/validate.py old mode 100755 new mode 100644 diff --git a/modules/vtluugwiki.py b/modules/vtluugwiki.py old mode 100755 new mode 100644 diff --git a/modules/weather.py b/modules/weather.py old mode 100755 new mode 100644 diff --git a/modules/wikipedia.py b/modules/wikipedia.py old mode 100755 new mode 100644 diff --git a/modules/wiktionary.py b/modules/wiktionary.py old mode 100755 new mode 100644