diff MoinMoin/wikirpc.py @ 51:54d5932d5a03

merge moin--main--1.3--patch-930: fix error handling in plugins, fix broken chart action Patches applied: * arch@arch.thinkmo.de--2003-archives/moin--main--1.3--patch-930 fix error handling in plugins, fix broken chart action * nirs@freeshell.org--2005/moin--fix--1.3--patch-50 merge from main * nirs@freeshell.org--2005/moin--fix--1.3--patch-51 fix error handling in plugins * nirs@freeshell.org--2005/moin--fix--1.3--patch-52 merge from main * nirs@freeshell.org--2005/moin--fix--1.3--patch-53 update changes with chart action fix imported from: moin--main--1.5--patch-52
author Nir Soffer <nirs@freeshell.org>
date Thu, 29 Sep 2005 00:36:27 +0000
parents 77665d8e2254
children 699811601bed
line wrap: on
line diff
--- a/MoinMoin/wikirpc.py	Thu Sep 29 00:09:43 2005 +0000
+++ b/MoinMoin/wikirpc.py	Thu Sep 29 00:36:27 2005 +0000
@@ -408,9 +408,10 @@
             try:
                 fn = getattr(self, 'xmlrpc_' + method)
             except AttributeError:
-                fn = wikiutil.importPlugin(self.request.cfg, 'xmlrpc', method,
-                                           'execute')
-                if fn is None:
+                try:
+                    fn = wikiutil.importPlugin(self.request.cfg, 'xmlrpc',
+                                               method, 'execute')
+                except ImportError:
                     response = xmlrpclib.Fault(1, "No such method: %s." %
                                                method)
                 else: