Rev 2259: Review feedback. in file:///home/robertc/source/baz/in-review/plugin-import/

[Robert Collins]

------------------------------------------------------------
revno: 2259
revision-id: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
parent: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-import
timestamp: Sat 2007-02-03 07:27:53 +1100
message:
  Review feedback.
modified:
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
=== modified file 'bzrlib/plugin.py'
--- a/bzrlib/plugin.py	2007-02-02 16:17:55 +0000
+++ b/bzrlib/plugin.py	2007-02-02 20:27:53 +0000
@@ -35,6 +35,7 @@
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
 import imp
+import re
 import types
 import zipimport
 
@@ -176,12 +177,16 @@
     
     for name in plugin_names:
         try:
-            exec "import bzrlib.plugins.%s" % name
+            exec "import bzrlib.plugins.%s" % name in {}
         except KeyboardInterrupt:
             raise
         except Exception, e:
             ## import pdb; pdb.set_trace()
-            warning('Unable to load plugin %r from %r' % (name, d))
+            if re.search('\.|-| ', name):
+                warning('Unable to load plugin %r from %r: '
+                    'It is not a valid python module name.' % (name, d))
+            else:
+                warning('Unable to load plugin %r from %r' % (name, d))
             log_exception_quietly()