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