Added utils.python.universalImport to make the previous idiom cleaner.

plugins/Math/plugin.py

@@ -40,6 +40,7 @@ import supybot.utils as utils
 from supybot.commands import *
 import supybot.callbacks as callbacks
 
+convertcore = utils.python.universalImport('convertcore', 'our_convertcore')
 try:
     import convertcore
 except ImportError:

src/utils/python.py

@@ -27,9 +27,21 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+import sys
 import types
 import threading
 
+def universalImport(*names):
+    f = sys._getframe(1)
+    for name in names:
+        try:
+            ret = __import__(name, globals=f.f_globals)
+        except ImportError:
+            continue
+        else:
+            return ret
+    raise ImportError, ','.join(names)
+
 def changeFunctionName(f, name, doc=None):
     if doc is None:
         doc = f.__doc__