/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-16 01:39:55 UTC
  • mfrom: (2998 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3003.
  • Revision ID: john@arbash-meinel.com-20071116013955-3zy651u2crhk31xx
[merge] bzr.dev 2998

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
191
191
        except Exception, e:
192
192
            ## import pdb; pdb.set_trace()
193
193
            if re.search('\.|-| ', name):
194
 
                warning('Unable to load plugin %r from %r: '
195
 
                    'It is not a valid python module name.' % (name, d))
 
194
                sanitised_name = re.sub('[-. ]', '_', name)
 
195
                warning("Unable to load %r in %r as a plugin because file path"
 
196
                        " isn't a valid module name; try renaming it to %r."
 
197
                        % (name, d, sanitised_name))
196
198
            else:
197
199
                warning('Unable to load plugin %r from %r' % (name, d))
198
200
            log_exception_quietly()