← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

  • Committer: Robert Collins
  • Date: 2005-09-06 09:47:19 UTC
  • mfrom: (1092.1.45)
  • mto: (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050906094719-a7e1f8ed80fe4280
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
24
24
 
25
25
 
26
26
import os
27
 
import bzrlib
28
 
from bzrlib.config import config_dir
 
27
from bzrlib.osutils import config_dir
29
28
DEFAULT_PLUGIN_PATH = os.path.join(config_dir(), 'plugins')
30
29
 
31
30
all_plugins = []
111
110
                plugin_info = imp.find_module(name, [d])
112
111
                mutter('load plugin %r' % (plugin_info,))
113
112
                try:
114
 
                    plugin = imp.load_module('bzrlib.plugins.' + name,
 
113
                    plugin = imp.load_module('bzrlib.plugin.' + name,
115
114
                                             *plugin_info)
116
115
                    all_plugins.append(plugin)
117
 
                    setattr(bzrlib.plugins, name, plugin)
118
116
                finally:
119
117
                    if plugin_info[0] is not None:
120
118
                        plugin_info[0].close()
121
 
 
122
 
                mutter('loaded succesfully')
123
 
            except:
 
119
            except Exception, e:
124
120
                log_error('Unable to load plugin %r from %r' % (name, d))
 
121
                log_error(str(e))
125
122
                log_exception()
126
123