conduit r1816 - in trunk: . conduit

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jan 20 01:35:59 2009
New Revision: 1816
URL: http://svn.gnome.org/viewvc/conduit?rev=1816&view=rev

Log:
2009-01-20  John Stowers  <john stowers gmail com>

	* conduit/Module.py: Print more helpful errors during
	import. Fixes #561557 (Tom Parker)



Modified:
   trunk/ChangeLog
   trunk/conduit/Module.py

Modified: trunk/conduit/Module.py
==============================================================================
--- trunk/conduit/Module.py	(original)
+++ trunk/conduit/Module.py	Tue Jan 20 01:35:59 2009
@@ -197,8 +197,11 @@
                         log.warn("Class is an unknown type: %s" % klass)
                 except AttributeError:
                     log.warn("Could not find module %s in %s\n%s" % (modules,filename,traceback.format_exc()))
+        except pydoc.ErrorDuringImport, e:
+            log.warn("Error loading the file: %s\n%s" % (filename, "".join(traceback.format_exception(e.exc,e.value,e.tb))))
+            self.invalidFiles.append(os.path.basename(filename))
         except Exception, e:
-            log.warn("Error loading the file: %s\n%s" % (filename, traceback.format_exc()))
+            log.warn("Error loading the file: %s\n%s" % (filename, "".join(traceback.format_exception(e.exc,e.value,e.tb))))
             self.invalidFiles.append(os.path.basename(filename))
 
     def load_all(self, whitelist, blacklist):