~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5086.5.14.

  • Committer: Vincent Ladeuil
  • Date: 2010-04-02 09:26:40 UTC
  • mto: (5133.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5134.
  • Revision ID: v.ladeuil+lp@free.fr-20100402092640-nn2mtg4g249ji0e6
Fix bug #552922 by controlling which files can be used to load a plugin.

* bzrlib/tests/test_plugins.py:
(TestLoadPluginAt.test_loading_from___init__): Add one more test
when loading from a file.

* bzrlib/plugin.py:
(_PluginImporter.load_module): Don't use _find_module as its
contract is also to find the plugin name. We *know* the plugin
name here.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: