From 1078791cb60d3ce4543d579fc07b9c0c145e8d10 Mon Sep 17 00:00:00 2001
From: "Sean B. Palmer" <http://inamidst.com/sbp/>
Date: Sat, 1 Mar 2008 21:07:23 +0000
Subject: [PATCH] Some sundry fixes and improvements to the modules.

---
 Makefile              | 2 +-
 __init__.py           | 0
 icao.py               | 0
 modules/__init__.py   | 0
 modules/admin.py      | 0
 modules/calc.py       | 0
 modules/codepoints.py | 5 ++++-
 modules/info.py       | 0
 modules/reload.py     | 2 +-
 modules/startup.py    | 0
 modules/translate.py  | 0
 modules/validate.py   | 2 +-
 modules/wikipedia.py  | 3 ++-
 opt/__init__.py       | 0
 opt/freenode.py       | 0
 opt/swhack.py         | 0
 tools.py              | 0
 17 files changed, 9 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 __init__.py
 mode change 100644 => 100755 icao.py
 mode change 100644 => 100755 modules/__init__.py
 mode change 100644 => 100755 modules/admin.py
 mode change 100644 => 100755 modules/calc.py
 mode change 100644 => 100755 modules/codepoints.py
 mode change 100644 => 100755 modules/info.py
 mode change 100644 => 100755 modules/startup.py
 mode change 100644 => 100755 modules/translate.py
 mode change 100644 => 100755 modules/wikipedia.py
 mode change 100644 => 100755 opt/__init__.py
 mode change 100644 => 100755 opt/freenode.py
 mode change 100644 => 100755 opt/swhack.py
 mode change 100644 => 100755 tools.py

diff --git a/Makefile b/Makefile
index bec372a..0185418 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,4 @@
 # Licensed under the Eiffel Forum License 2.
 
 archive: ;
-        hg archive -t tbz2 phenny.tar.bz2
+	hg archive -t tbz2 phenny.tar.bz2
diff --git a/__init__.py b/__init__.py
old mode 100644
new mode 100755
diff --git a/icao.py b/icao.py
old mode 100644
new mode 100755
diff --git a/modules/__init__.py b/modules/__init__.py
old mode 100644
new mode 100755
diff --git a/modules/admin.py b/modules/admin.py
old mode 100644
new mode 100755
diff --git a/modules/calc.py b/modules/calc.py
old mode 100644
new mode 100755
diff --git a/modules/codepoints.py b/modules/codepoints.py
old mode 100644
new mode 100755
index d966670..f2eb862
--- a/modules/codepoints.py
+++ b/modules/codepoints.py
@@ -12,7 +12,10 @@ from itertools import islice
 
 def about(u, cp=None, name=None): 
    if cp is None: cp = ord(u)
-   if name is None: name = unicodedata.name(u)
+   if name is None: 
+      try: name = unicodedata.name(u)
+      except ValueError: 
+         return 'U+%04X (No name found)' % cp
 
    if not unicodedata.combining(u): 
       template = 'U+%04X %s (%s)'
diff --git a/modules/info.py b/modules/info.py
old mode 100644
new mode 100755
diff --git a/modules/reload.py b/modules/reload.py
index 2febcd2..6e65dd2 100755
--- a/modules/reload.py
+++ b/modules/reload.py
@@ -14,7 +14,7 @@ def f_reload(phenny, input):
    if not input.admin: return
 
    name = input.group(2)
-   if not name: 
+   if (not name) or (name == '*'): 
       phenny.setup()
       return phenny.reply('done')
 
diff --git a/modules/startup.py b/modules/startup.py
old mode 100644
new mode 100755
diff --git a/modules/translate.py b/modules/translate.py
old mode 100644
new mode 100755
diff --git a/modules/validate.py b/modules/validate.py
index 3e179e7..185623f 100755
--- a/modules/validate.py
+++ b/modules/validate.py
@@ -33,7 +33,7 @@ def val(phenny, input):
             else: result += ' (%s error)' % n
    else: result += 'Unvalidatable: no X-W3C-Validator-Status'
 
-   phenny.say(' ' + result)
+   phenny.reply(result)
 val.rule = (['val'], r'(?i)(\S+)')
 val.example = '.val http://www.w3.org/'
 
diff --git a/modules/wikipedia.py b/modules/wikipedia.py
old mode 100644
new mode 100755
index 696bce4..cb9cf6b
--- a/modules/wikipedia.py
+++ b/modules/wikipedia.py
@@ -49,7 +49,8 @@ def search(term):
       return term
 
    term = term.replace('_', ' ')
-   uri = google.google('site:en.wikipedia.org %s' % term)
+   try: uri = google.google('site:en.wikipedia.org %s' % term)
+   except IndexError: return term
    if uri: 
       return uri[len('http://en.wikipedia.org/wiki/'):]
    else: return term
diff --git a/opt/__init__.py b/opt/__init__.py
old mode 100644
new mode 100755
diff --git a/opt/freenode.py b/opt/freenode.py
old mode 100644
new mode 100755
diff --git a/opt/swhack.py b/opt/swhack.py
old mode 100644
new mode 100755
diff --git a/tools.py b/tools.py
old mode 100644
new mode 100755