bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
5086.1.1
by Vincent Ladeuil
Remove get_default_plugin_path() obsoleted since 2.0. |
1 |
# Copyright (C) 2005-2010 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
16 |
|
17 |
||
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
18 |
"""bzr python plugin support.
|
19 |
||
20 |
When load_plugins() is invoked, any python module in any directory in
|
|
21 |
$BZR_PLUGIN_PATH will be imported. The module will be imported as
|
|
22 |
'bzrlib.plugins.$BASENAME(PLUGIN)'. In the plugin's main body, it should
|
|
|
3620.4.1
by Robert Collins
plugin doc strings update. |
23 |
update any bzrlib registries it wants to extend.
|
24 |
||
25 |
See the plugin-api developer documentation for information about writing
|
|
26 |
plugins.
|
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
27 |
|
28 |
BZR_PLUGIN_PATH is also honoured for any plugins imported via
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
29 |
'import bzrlib.plugins.PLUGINNAME', as long as set_plugins_path has been
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
30 |
called.
|
|
1185.16.83
by mbp at sourcefrog
- notes on testability of plugins |
31 |
"""
|
32 |
||
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
33 |
import os |
|
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
34 |
import sys |
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
35 |
|
|
3794.1.1
by Martin Pool
Update osutils imports to fix setup.py on Windows |
36 |
from bzrlib import osutils |
37 |
||
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
38 |
from bzrlib.lazy_import import lazy_import |
|
3794.1.1
by Martin Pool
Update osutils imports to fix setup.py on Windows |
39 |
|
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
40 |
lazy_import(globals(), """ |
41 |
import imp
|
|
|
2256.2.3
by Robert Collins
Review feedback. |
42 |
import re
|
|
1516
by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a |
43 |
import types
|
|
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
44 |
|
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
45 |
from bzrlib import (
|
|
3777.6.3
by Marius Kruger
Use bzrlib._format_version_tuple and map as per review from John. |
46 |
_format_version_tuple,
|
|
3224.5.10
by Andrew Bennetts
Replace some duplication with a different form of hackery. |
47 |
config,
|
|
3427.2.2
by James Westby
Just print the exception, keeping the API of log_exception_quietly the same. |
48 |
debug,
|
|
3766.3.2
by Robert Collins
Fix reporting of incompatible api plugin load errors, fixing bug 279451. |
49 |
errors,
|
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
50 |
trace,
|
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
51 |
)
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
52 |
from bzrlib import plugins as _mod_plugins
|
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
53 |
""") |
54 |
||
|
4628.2.5
by Vincent Ladeuil
Fixes prompted by review. |
55 |
from bzrlib.symbol_versioning import ( |
56 |
deprecated_function, |
|
57 |
deprecated_in, |
|
58 |
)
|
|
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
59 |
|
60 |
||
61 |
DEFAULT_PLUGIN_PATH = None |
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
62 |
_loaded = False |
|
5017.2.2
by Martin Pool
Add import tariff tests |
63 |
_plugins_disabled = False |
64 |
||
65 |
||
|
5616.7.2
by Martin Pool
Include plugin warnings in apport crash |
66 |
plugin_warnings = {} |
67 |
# Map from plugin name, to list of string warnings about eg plugin
|
|
68 |
# dependencies.
|
|
|
5616.7.1
by Martin Pool
Record but don't show warnings about updated plugins |
69 |
|
70 |
||
|
5017.2.2
by Martin Pool
Add import tariff tests |
71 |
def are_plugins_disabled(): |
72 |
return _plugins_disabled |
|
73 |
||
|
1996.3.17
by John Arbash Meinel
lazy_import plugin and transport/local |
74 |
|
|
1551.3.11
by Aaron Bentley
Merge from Robert |
75 |
def disable_plugins(): |
76 |
"""Disable loading plugins. |
|
77 |
||
78 |
Future calls to load_plugins() will be ignored.
|
|
79 |
"""
|
|
|
5017.2.2
by Martin Pool
Add import tariff tests |
80 |
global _plugins_disabled |
81 |
_plugins_disabled = True |
|
|
3835.2.5
by Aaron Bentley
Simplify disable_plugins implementation |
82 |
load_plugins([]) |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
83 |
|
|
3010.4.1
by Alexander Belchenko
bzr.exe: enable to search system-wide plugins in "plugins" subdirectory of installation directory |
84 |
|
|
2753.1.1
by Ian Clatworthy
(Blake Winton) BZR_PLUGIN_PATH should ignore trailiing slashes |
85 |
def _strip_trailing_sep(path): |
|
2652.2.6
by Blake Winton
Incorporate suggestions from Alexander Belchenko |
86 |
return path.rstrip("\\/") |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
87 |
|
|
3010.4.1
by Alexander Belchenko
bzr.exe: enable to search system-wide plugins in "plugins" subdirectory of installation directory |
88 |
|
|
5268.5.1
by Vincent Ladeuil
Reproduce bug #591215. |
89 |
def _get_specific_plugin_paths(paths): |
90 |
"""Returns the plugin paths from a string describing the associations. |
|
91 |
||
92 |
:param paths: A string describing the paths associated with the plugins.
|
|
93 |
||
94 |
:returns: A list of (plugin name, path) tuples.
|
|
95 |
||
96 |
For example, if paths is my_plugin@/test/my-test:her_plugin@/production/her,
|
|
97 |
[('my_plugin', '/test/my-test'), ('her_plugin', '/production/her')]
|
|
98 |
will be returned.
|
|
99 |
||
100 |
Note that ':' in the example above depends on the os.
|
|
101 |
"""
|
|
102 |
if not paths: |
|
103 |
return [] |
|
104 |
specs = [] |
|
105 |
for spec in paths.split(os.pathsep): |
|
|
5268.5.2
by Vincent Ladeuil
Catch the wrong path descriptions in BZR_PLUGINS_AT. |
106 |
try: |
107 |
name, path = spec.split('@') |
|
108 |
except ValueError: |
|
109 |
raise errors.BzrCommandError( |
|
110 |
'"%s" is not a valid <plugin_name>@<plugin_path> description ' |
|
111 |
% spec) |
|
|
5268.5.1
by Vincent Ladeuil
Reproduce bug #591215. |
112 |
specs.append((name, path)) |
113 |
return specs |
|
114 |
||
115 |
||
|
3835.2.2
by Aaron Bentley
Allow specifying plugin paths, disable co-installed plugins. |
116 |
def set_plugins_path(path=None): |
117 |
"""Set the path for plugins to be loaded from. |
|
118 |
||
119 |
:param path: The list of paths to search for plugins. By default,
|
|
120 |
path will be determined using get_standard_plugins_path.
|
|
121 |
if path is [], no plugins can be loaded.
|
|
122 |
"""
|
|
123 |
if path is None: |
|
124 |
path = get_standard_plugins_path() |
|
|
5086.5.5
by Vincent Ladeuil
Use BZR_PLUGINS_AT and stop mucking with BZR_PLUGIN_PATH. |
125 |
_mod_plugins.__path__ = path |
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
126 |
PluginImporter.reset() |
|
5086.5.5
by Vincent Ladeuil
Use BZR_PLUGINS_AT and stop mucking with BZR_PLUGIN_PATH. |
127 |
# Set up a blacklist for disabled plugins
|
|
5086.1.10
by Vincent Ladeuil
Fixed as per review comments. |
128 |
disabled_plugins = os.environ.get('BZR_DISABLE_PLUGINS', None) |
129 |
if disabled_plugins is not None: |
|
130 |
for name in disabled_plugins.split(os.pathsep): |
|
|
5086.5.4
by Vincent Ladeuil
Merge for fixes from 411413-plugin-path |
131 |
PluginImporter.blacklist.add('bzrlib.plugins.' + name) |
|
5086.5.5
by Vincent Ladeuil
Use BZR_PLUGINS_AT and stop mucking with BZR_PLUGIN_PATH. |
132 |
# Set up a the specific paths for plugins
|
|
5268.5.1
by Vincent Ladeuil
Reproduce bug #591215. |
133 |
for plugin_name, plugin_path in _get_specific_plugin_paths(os.environ.get( |
134 |
'BZR_PLUGINS_AT', None)): |
|
|
5086.5.5
by Vincent Ladeuil
Use BZR_PLUGINS_AT and stop mucking with BZR_PLUGIN_PATH. |
135 |
PluginImporter.specific_paths[ |
136 |
'bzrlib.plugins.%s' % plugin_name] = plugin_path |
|
|
3835.2.2
by Aaron Bentley
Allow specifying plugin paths, disable co-installed plugins. |
137 |
return path |
138 |
||
139 |
||
|
4628.2.1
by Vincent Ladeuil
Start introducing accessors for plugin paths. |
140 |
def _append_new_path(paths, new_path): |
141 |
"""Append a new path if it set and not already known.""" |
|
142 |
if new_path is not None and new_path not in paths: |
|
143 |
paths.append(new_path) |
|
144 |
return paths |
|
145 |
||
146 |
||
147 |
def get_core_plugin_path(): |
|
148 |
core_path = None |
|
149 |
bzr_exe = bool(getattr(sys, 'frozen', None)) |
|
150 |
if bzr_exe: # expand path for bzr.exe |
|
151 |
# We need to use relative path to system-wide plugin
|
|
152 |
# directory because bzrlib from standalone bzr.exe
|
|
153 |
# could be imported by another standalone program
|
|
154 |
# (e.g. bzr-config; or TortoiseBzr/Olive if/when they
|
|
155 |
# will become standalone exe). [bialix 20071123]
|
|
156 |
# __file__ typically is
|
|
157 |
# C:\Program Files\Bazaar\lib\library.zip\bzrlib\plugin.pyc
|
|
158 |
# then plugins directory is
|
|
159 |
# C:\Program Files\Bazaar\plugins
|
|
160 |
# so relative path is ../../../plugins
|
|
161 |
core_path = osutils.abspath(osutils.pathjoin( |
|
162 |
osutils.dirname(__file__), '../../../plugins')) |
|
163 |
else: # don't look inside library.zip |
|
164 |
# search the plugin path before the bzrlib installed dir
|
|
165 |
core_path = os.path.dirname(_mod_plugins.__file__) |
|
166 |
return core_path |
|
167 |
||
168 |
||
169 |
def get_site_plugin_path(): |
|
170 |
"""Returns the path for the site installed plugins.""" |
|
|
4628.2.5
by Vincent Ladeuil
Fixes prompted by review. |
171 |
if sys.platform == 'win32': |
172 |
# We don't have (yet) a good answer for windows since that is certainly
|
|
173 |
# related to the way we build the installers. -- vila20090821
|
|
174 |
return None |
|
|
4628.2.1
by Vincent Ladeuil
Start introducing accessors for plugin paths. |
175 |
site_path = None |
176 |
try: |
|
177 |
from distutils.sysconfig import get_python_lib |
|
178 |
except ImportError: |
|
179 |
# If distutuils is not available, we just don't know where they are
|
|
180 |
pass
|
|
181 |
else: |
|
182 |
site_path = osutils.pathjoin(get_python_lib(), 'bzrlib', 'plugins') |
|
183 |
return site_path |
|
184 |
||
185 |
||
186 |
def get_user_plugin_path(): |
|
187 |
return osutils.pathjoin(config.config_dir(), 'plugins') |
|
188 |
||
189 |
||
|
3835.2.2
by Aaron Bentley
Allow specifying plugin paths, disable co-installed plugins. |
190 |
def get_standard_plugins_path(): |
191 |
"""Determine a plugin path suitable for general use.""" |
|
|
4628.2.2
by Vincent Ladeuil
Add [+-]{user|core|site} handling in BZR_PLUGIN_PATH. |
192 |
# Ad-Hoc default: core is not overriden by site but user can overrides both
|
|
4628.2.3
by Vincent Ladeuil
Update doc and add NEWS entry. |
193 |
# The rationale is that:
|
194 |
# - 'site' comes last, because these plugins should always be available and
|
|
195 |
# are supposed to be in sync with the bzr installed on site.
|
|
196 |
# - 'core' comes before 'site' so that running bzr from sources or a user
|
|
197 |
# installed version overrides the site version.
|
|
198 |
# - 'user' comes first, because... user is always right.
|
|
199 |
# - the above rules clearly defines which plugin version will be loaded if
|
|
200 |
# several exist. Yet, it is sometimes desirable to disable some directory
|
|
|
4672.1.1
by Vincent Ladeuil
BZR_PLUGIN_PATH can be used to fully control the plugin directories |
201 |
# so that a set of plugins is disabled as once. This can be done via
|
|
4628.2.3
by Vincent Ladeuil
Update doc and add NEWS entry. |
202 |
# -site, -core, -user.
|
203 |
||
204 |
env_paths = os.environ.get('BZR_PLUGIN_PATH', '+user').split(os.pathsep) |
|
205 |
defaults = ['+core', '+site'] |
|
|
4628.2.2
by Vincent Ladeuil
Add [+-]{user|core|site} handling in BZR_PLUGIN_PATH. |
206 |
|
207 |
# The predefined references
|
|
208 |
refs = dict(core=get_core_plugin_path(), |
|
209 |
site=get_site_plugin_path(), |
|
210 |
user=get_user_plugin_path()) |
|
211 |
||
|
4628.2.5
by Vincent Ladeuil
Fixes prompted by review. |
212 |
# Unset paths that should be removed
|
213 |
for k,v in refs.iteritems(): |
|
214 |
removed = '-%s' % k |
|
215 |
# defaults can never mention removing paths as that will make it
|
|
216 |
# impossible for the user to revoke these removals.
|
|
217 |
if removed in env_paths: |
|
218 |
env_paths.remove(removed) |
|
219 |
refs[k] = None |
|
220 |
||
221 |
# Expand references
|
|
222 |
paths = [] |
|
223 |
for p in env_paths + defaults: |
|
224 |
if p.startswith('+'): |
|
|
5086.1.2
by Vincent Ladeuil
Cosmetic changes. |
225 |
# Resolve references if they are known
|
|
4628.2.5
by Vincent Ladeuil
Fixes prompted by review. |
226 |
try: |
227 |
p = refs[p[1:]] |
|
228 |
except KeyError: |
|
|
5086.1.6
by Vincent Ladeuil
Crude fix for bug #411413. |
229 |
# Leave them untouched so user can still use paths starting
|
230 |
# with '+'
|
|
|
4628.2.5
by Vincent Ladeuil
Fixes prompted by review. |
231 |
pass
|
232 |
_append_new_path(paths, p) |
|
|
4628.2.2
by Vincent Ladeuil
Add [+-]{user|core|site} handling in BZR_PLUGIN_PATH. |
233 |
|
|
3835.2.7
by Aaron Bentley
Add tests for plugins |
234 |
# Get rid of trailing slashes, since Python can't handle them when
|
235 |
# it tries to import modules.
|
|
|
4628.2.2
by Vincent Ladeuil
Add [+-]{user|core|site} handling in BZR_PLUGIN_PATH. |
236 |
paths = map(_strip_trailing_sep, paths) |
237 |
return paths |
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
238 |
|
239 |
||
|
3835.2.4
by Aaron Bentley
Allow paths to be specified to load_plugins |
240 |
def load_plugins(path=None): |
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
241 |
"""Load bzrlib plugins. |
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
242 |
|
243 |
The environment variable BZR_PLUGIN_PATH is considered a delimited
|
|
244 |
set of paths to look through. Each entry is searched for *.py
|
|
245 |
files (and whatever other extensions are used in the platform,
|
|
246 |
such as *.pyd).
|
|
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
247 |
|
|
5086.1.6
by Vincent Ladeuil
Crude fix for bug #411413. |
248 |
load_from_path() provides the underlying mechanism and is called with
|
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
249 |
the default directory list to provide the normal behaviour.
|
|
3835.2.4
by Aaron Bentley
Allow paths to be specified to load_plugins |
250 |
|
251 |
:param path: The list of paths to search for plugins. By default,
|
|
252 |
path will be determined using get_standard_plugins_path.
|
|
253 |
if path is [], no plugins can be loaded.
|
|
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
254 |
"""
|
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
255 |
global _loaded |
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
256 |
if _loaded: |
257 |
# People can make sure plugins are loaded, they just won't be twice
|
|
258 |
return
|
|
259 |
_loaded = True |
|
260 |
||
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
261 |
# scan for all plugins in the path.
|
|
3835.2.4
by Aaron Bentley
Allow paths to be specified to load_plugins |
262 |
load_from_path(set_plugins_path(path)) |
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
263 |
|
264 |
||
265 |
def load_from_path(dirs): |
|
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
266 |
"""Load bzrlib plugins found in each dir in dirs. |
267 |
||
268 |
Loading a plugin means importing it into the python interpreter.
|
|
269 |
The plugin is expected to make calls to register commands when
|
|
270 |
it's loaded (or perhaps access other hooks in future.)
|
|
271 |
||
272 |
Plugins are loaded into bzrlib.plugins.NAME, and can be found there
|
|
273 |
for future reference.
|
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
274 |
|
275 |
The python module path for bzrlib.plugins will be modified to be 'dirs'.
|
|
|
2652.2.5
by Blake Winton
Get rid of CRs. |
276 |
"""
|
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
277 |
# Explicitly load the plugins with a specific path
|
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
278 |
for fullname, path in PluginImporter.specific_paths.iteritems(): |
279 |
name = fullname[len('bzrlib.plugins.'):] |
|
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
280 |
_load_plugin_module(name, path) |
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
281 |
|
|
2652.2.5
by Blake Winton
Get rid of CRs. |
282 |
# We need to strip the trailing separators here as well as in the
|
283 |
# set_plugins_path function because calling code can pass anything in to
|
|
284 |
# this function, and since it sets plugins.__path__, it should set it to
|
|
285 |
# something that will be valid for Python to use (in case people try to
|
|
|
2652.2.4
by Blake Winton
Add a note explaining why I strip the slashes twice. |
286 |
# run "import bzrlib.plugins.PLUGINNAME" after calling this function).
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
287 |
_mod_plugins.__path__ = map(_strip_trailing_sep, dirs) |
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
288 |
for d in dirs: |
289 |
if not d: |
|
290 |
continue
|
|
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
291 |
trace.mutter('looking for plugins in %s', d) |
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
292 |
if os.path.isdir(d): |
293 |
load_from_dir(d) |
|
294 |
||
295 |
||
296 |
# backwards compatability: load_from_dirs was the old name
|
|
297 |
# This was changed in 0.15
|
|
298 |
load_from_dirs = load_from_path |
|
299 |
||
300 |
||
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
301 |
def _find_plugin_module(dir, name): |
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
302 |
"""Check if there is a valid python module that can be loaded as a plugin. |
303 |
||
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
304 |
:param dir: The directory where the search is performed.
|
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
305 |
:param path: An existing file path, either a python file or a package
|
306 |
directory.
|
|
307 |
||
308 |
:return: (name, path, description) name is the module name, path is the
|
|
309 |
file to load and description is the tuple returned by
|
|
310 |
imp.get_suffixes().
|
|
311 |
"""
|
|
312 |
path = osutils.pathjoin(dir, name) |
|
313 |
if os.path.isdir(path): |
|
314 |
# Check for a valid __init__.py file, valid suffixes depends on -O and
|
|
315 |
# can be .py, .pyc and .pyo
|
|
316 |
for suffix, mode, kind in imp.get_suffixes(): |
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
317 |
if kind not in (imp.PY_SOURCE, imp.PY_COMPILED): |
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
318 |
# We don't recognize compiled modules (.so, .dll, etc)
|
319 |
continue
|
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
320 |
init_path = osutils.pathjoin(path, '__init__' + suffix) |
321 |
if os.path.isfile(init_path): |
|
322 |
return name, init_path, (suffix, mode, kind) |
|
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
323 |
else: |
324 |
for suffix, mode, kind in imp.get_suffixes(): |
|
325 |
if name.endswith(suffix): |
|
326 |
# Clean up the module name
|
|
327 |
name = name[:-len(suffix)] |
|
328 |
if kind == imp.C_EXTENSION and name.endswith('module'): |
|
329 |
name = name[:-len('module')] |
|
330 |
return name, path, (suffix, mode, kind) |
|
331 |
# There is no python module here
|
|
332 |
return None, None, (None, None, None) |
|
333 |
||
334 |
||
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
335 |
def _load_plugin_module(name, dir): |
|
5086.5.14
by Vincent Ladeuil
Fix bug #552922 by controlling which files can be used to load a plugin. |
336 |
"""Load plugin name from dir. |
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
337 |
|
338 |
:param name: The plugin name in the bzrlib.plugins namespace.
|
|
339 |
:param dir: The directory the plugin is loaded from for error messages.
|
|
340 |
"""
|
|
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
341 |
if ('bzrlib.plugins.%s' % name) in PluginImporter.blacklist: |
342 |
return
|
|
343 |
try: |
|
344 |
exec "import bzrlib.plugins.%s" % name in {} |
|
345 |
except KeyboardInterrupt: |
|
346 |
raise
|
|
347 |
except errors.IncompatibleAPI, e: |
|
|
5616.7.1
by Martin Pool
Record but don't show warnings about updated plugins |
348 |
warning_message = ( |
349 |
"Unable to load plugin %r. It requested API version " |
|
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
350 |
"%s of module %s but the minimum exported version is %s, and " |
351 |
"the maximum is %s" % |
|
352 |
(name, e.wanted, e.api, e.minimum, e.current)) |
|
|
5616.7.1
by Martin Pool
Record but don't show warnings about updated plugins |
353 |
trace.mutter(warning_message) |
|
5616.7.2
by Martin Pool
Include plugin warnings in apport crash |
354 |
plugin_warnings[name] = warning_message |
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
355 |
except Exception, e: |
356 |
trace.warning("%s" % e) |
|
357 |
if re.search('\.|-| ', name): |
|
358 |
sanitised_name = re.sub('[-. ]', '_', name) |
|
359 |
if sanitised_name.startswith('bzr_'): |
|
360 |
sanitised_name = sanitised_name[len('bzr_'):] |
|
361 |
trace.warning("Unable to load %r in %r as a plugin because the " |
|
362 |
"file path isn't a valid module name; try renaming "
|
|
363 |
"it to %r." % (name, dir, sanitised_name)) |
|
364 |
else: |
|
365 |
trace.warning('Unable to load plugin %r from %r' % (name, dir)) |
|
366 |
trace.log_exception_quietly() |
|
367 |
if 'error' in debug.debug_flags: |
|
368 |
trace.print_exception(sys.exc_info(), sys.stderr) |
|
369 |
||
370 |
||
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
371 |
def load_from_dir(d): |
|
3766.3.2
by Robert Collins
Fix reporting of incompatible api plugin load errors, fixing bug 279451. |
372 |
"""Load the plugins in directory d. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
373 |
|
|
3766.3.2
by Robert Collins
Fix reporting of incompatible api plugin load errors, fixing bug 279451. |
374 |
d must be in the plugins module path already.
|
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
375 |
This function is called once for each directory in the module path.
|
|
3766.3.2
by Robert Collins
Fix reporting of incompatible api plugin load errors, fixing bug 279451. |
376 |
"""
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
377 |
plugin_names = set() |
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
378 |
for p in os.listdir(d): |
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
379 |
name, path, desc = _find_plugin_module(d, p) |
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
380 |
if name is not None: |
381 |
if name == '__init__': |
|
382 |
# We do nothing with the __init__.py file in directories from
|
|
383 |
# the bzrlib.plugins module path, we may want to, one day
|
|
384 |
# -- vila 20100316.
|
|
385 |
continue # We don't load __init__.py in the plugins dirs |
|
386 |
elif getattr(_mod_plugins, name, None) is not None: |
|
387 |
# The module has already been loaded from another directory
|
|
388 |
# during a previous call.
|
|
389 |
# FIXME: There should be a better way to report masked plugins
|
|
390 |
# -- vila 20100316
|
|
391 |
trace.mutter('Plugin name %s already loaded', name) |
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
392 |
else: |
|
5086.5.1
by Vincent Ladeuil
Slight refactoring preparing fix for bug #82693. |
393 |
plugin_names.add(name) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
394 |
|
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
395 |
for name in plugin_names: |
|
5086.5.8
by Vincent Ladeuil
Make sure we can load from a non-standard directory name. |
396 |
_load_plugin_module(name, d) |
|
2256.2.2
by Robert Collins
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not |
397 |
|
398 |
||
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
399 |
def plugins(): |
400 |
"""Return a dictionary of the plugins. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
401 |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
402 |
Each item in the dictionary is a PlugIn object.
|
403 |
"""
|
|
404 |
result = {} |
|
405 |
for name, plugin in _mod_plugins.__dict__.items(): |
|
406 |
if isinstance(plugin, types.ModuleType): |
|
407 |
result[name] = PlugIn(name, plugin) |
|
408 |
return result |
|
409 |
||
410 |
||
|
2432.1.24
by Robert Collins
Add plugins as a help index. |
411 |
class PluginsHelpIndex(object): |
412 |
"""A help index that returns help topics for plugins.""" |
|
413 |
||
414 |
def __init__(self): |
|
415 |
self.prefix = 'plugins/' |
|
416 |
||
417 |
def get_topics(self, topic): |
|
|
2432.1.25
by Robert Collins
Return plugin module docstrings for 'bzr help plugin'. |
418 |
"""Search for topic in the loaded plugins. |
419 |
||
420 |
This will not trigger loading of new plugins.
|
|
421 |
||
422 |
:param topic: A topic to search for.
|
|
423 |
:return: A list which is either empty or contains a single
|
|
424 |
RegisteredTopic entry.
|
|
425 |
"""
|
|
426 |
if not topic: |
|
427 |
return [] |
|
428 |
if topic.startswith(self.prefix): |
|
429 |
topic = topic[len(self.prefix):] |
|
430 |
plugin_module_name = 'bzrlib.plugins.%s' % topic |
|
431 |
try: |
|
432 |
module = sys.modules[plugin_module_name] |
|
433 |
except KeyError: |
|
434 |
return [] |
|
435 |
else: |
|
436 |
return [ModuleHelpTopic(module)] |
|
437 |
||
438 |
||
439 |
class ModuleHelpTopic(object): |
|
440 |
"""A help topic which returns the docstring for a module.""" |
|
441 |
||
442 |
def __init__(self, module): |
|
443 |
"""Constructor. |
|
444 |
||
445 |
:param module: The module for which help should be generated.
|
|
446 |
"""
|
|
447 |
self.module = module |
|
448 |
||
|
3984.4.5
by Ian Clatworthy
help xxx is full help; xxx -h is concise help |
449 |
def get_help_text(self, additional_see_also=None, verbose=True): |
|
2432.1.25
by Robert Collins
Return plugin module docstrings for 'bzr help plugin'. |
450 |
"""Return a string with the help for this topic. |
451 |
||
452 |
:param additional_see_also: Additional help topics to be
|
|
453 |
cross-referenced.
|
|
454 |
"""
|
|
455 |
if not self.module.__doc__: |
|
456 |
result = "Plugin '%s' has no docstring.\n" % self.module.__name__ |
|
457 |
else: |
|
458 |
result = self.module.__doc__ |
|
459 |
if result[-1] != '\n': |
|
460 |
result += '\n' |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
461 |
# there is code duplicated here and in bzrlib/help_topic.py's
|
|
2432.1.25
by Robert Collins
Return plugin module docstrings for 'bzr help plugin'. |
462 |
# matching Topic code. This should probably be factored in
|
463 |
# to a helper function and a common base class.
|
|
464 |
if additional_see_also is not None: |
|
465 |
see_also = sorted(set(additional_see_also)) |
|
466 |
else: |
|
467 |
see_also = None |
|
468 |
if see_also: |
|
469 |
result += 'See also: ' |
|
470 |
result += ', '.join(see_also) |
|
471 |
result += '\n' |
|
472 |
return result |
|
|
2432.1.29
by Robert Collins
Add get_help_topic to ModuleHelpTopic. |
473 |
|
474 |
def get_help_topic(self): |
|
|
2432.1.30
by Robert Collins
Fix the ModuleHelpTopic get_help_topic to be tested with closer to real world data and strip the bzrlib.plugins. prefix from the name. |
475 |
"""Return the modules help topic - its __name__ after bzrlib.plugins..""" |
476 |
return self.module.__name__[len('bzrlib.plugins.'):] |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
477 |
|
478 |
||
479 |
class PlugIn(object): |
|
480 |
"""The bzrlib representation of a plugin. |
|
481 |
||
482 |
The PlugIn object provides a way to manipulate a given plugin module.
|
|
483 |
"""
|
|
484 |
||
485 |
def __init__(self, name, module): |
|
486 |
"""Construct a plugin for module.""" |
|
487 |
self.name = name |
|
488 |
self.module = module |
|
489 |
||
490 |
def path(self): |
|
491 |
"""Get the path that this plugin was loaded from.""" |
|
492 |
if getattr(self.module, '__path__', None) is not None: |
|
493 |
return os.path.abspath(self.module.__path__[0]) |
|
494 |
elif getattr(self.module, '__file__', None) is not None: |
|
|
3193.2.1
by Alexander Belchenko
show path to plugin module as *.py instead of *.pyc if python source available |
495 |
path = os.path.abspath(self.module.__file__) |
496 |
if path[-4:] in ('.pyc', '.pyo'): |
|
497 |
pypath = path[:-4] + '.py' |
|
498 |
if os.path.isfile(pypath): |
|
499 |
path = pypath |
|
500 |
return path |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
501 |
else: |
502 |
return repr(self.module) |
|
503 |
||
504 |
def __str__(self): |
|
505 |
return "<%s.%s object at %s, name=%s, module=%s>" % ( |
|
506 |
self.__class__.__module__, self.__class__.__name__, id(self), |
|
507 |
self.name, self.module) |
|
508 |
||
509 |
__repr__ = __str__ |
|
510 |
||
511 |
def test_suite(self): |
|
512 |
"""Return the plugin's test suite.""" |
|
513 |
if getattr(self.module, 'test_suite', None) is not None: |
|
514 |
return self.module.test_suite() |
|
515 |
else: |
|
516 |
return None |
|
517 |
||
|
3302.8.21
by Vincent Ladeuil
Fixed as per Robert's review. |
518 |
def load_plugin_tests(self, loader): |
|
3302.8.10
by Vincent Ladeuil
Prepare bzrlib.plugin to use the new test loader. |
519 |
"""Return the adapted plugin's test suite. |
520 |
||
521 |
:param loader: The custom loader that should be used to load additional
|
|
522 |
tests.
|
|
523 |
||
524 |
"""
|
|
525 |
if getattr(self.module, 'load_tests', None) is not None: |
|
|
3302.8.11
by Vincent Ladeuil
Simplify plugin.load_tests. |
526 |
return loader.loadTestsFromModule(self.module) |
|
3302.8.10
by Vincent Ladeuil
Prepare bzrlib.plugin to use the new test loader. |
527 |
else: |
528 |
return None |
|
529 |
||
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
530 |
def version_info(self): |
531 |
"""Return the plugin's version_tuple or None if unknown.""" |
|
532 |
version_info = getattr(self.module, 'version_info', None) |
|
|
3777.6.7
by Marius Kruger
* Can now also handle non-iteratable and string plugin versions. |
533 |
if version_info is not None: |
534 |
try: |
|
535 |
if isinstance(version_info, types.StringType): |
|
536 |
version_info = version_info.split('.') |
|
537 |
elif len(version_info) == 3: |
|
538 |
version_info = tuple(version_info) + ('final', 0) |
|
539 |
except TypeError, e: |
|
540 |
# The given version_info isn't even iteratible
|
|
541 |
trace.log_exception_quietly() |
|
542 |
version_info = (version_info,) |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
543 |
return version_info |
|
3302.8.10
by Vincent Ladeuil
Prepare bzrlib.plugin to use the new test loader. |
544 |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
545 |
def _get__version__(self): |
546 |
version_info = self.version_info() |
|
|
3777.6.1
by Marius Kruger
Try to return something usefull for plugins with bad version numbers, |
547 |
if version_info is None or len(version_info) == 0: |
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
548 |
return "unknown" |
|
3777.6.1
by Marius Kruger
Try to return something usefull for plugins with bad version numbers, |
549 |
try: |
|
3777.6.3
by Marius Kruger
Use bzrlib._format_version_tuple and map as per review from John. |
550 |
version_string = _format_version_tuple(version_info) |
|
3777.6.6
by Marius Kruger
catch only ValueError, TypeError, IndexError as per feedback from John |
551 |
except (ValueError, TypeError, IndexError), e: |
552 |
trace.log_exception_quietly() |
|
|
3777.6.1
by Marius Kruger
Try to return something usefull for plugins with bad version numbers, |
553 |
# try to return something usefull for bad plugins, in stead of
|
554 |
# stack tracing.
|
|
|
3777.6.3
by Marius Kruger
Use bzrlib._format_version_tuple and map as per review from John. |
555 |
version_string = '.'.join(map(str, version_info)) |
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
556 |
return version_string |
557 |
||
558 |
__version__ = property(_get__version__) |
|
|
5086.1.6
by Vincent Ladeuil
Crude fix for bug #411413. |
559 |
|
560 |
||
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
561 |
class _PluginImporter(object): |
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
562 |
"""An importer tailored to bzr specific needs. |
563 |
||
564 |
This is a singleton that takes care of:
|
|
565 |
- disabled plugins specified in 'blacklist',
|
|
566 |
- plugins that needs to be loaded from specific directories.
|
|
567 |
"""
|
|
|
5086.1.7
by Vincent Ladeuil
Cleaner fix for bug #411413. |
568 |
|
569 |
def __init__(self): |
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
570 |
self.reset() |
571 |
||
572 |
def reset(self): |
|
573 |
self.blacklist = set() |
|
574 |
self.specific_paths = {} |
|
|
5086.1.6
by Vincent Ladeuil
Crude fix for bug #411413. |
575 |
|
576 |
def find_module(self, fullname, parent_path=None): |
|
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
577 |
"""Search a plugin module. |
578 |
||
579 |
Disabled plugins raise an import error, plugins with specific paths
|
|
580 |
returns a specific loader.
|
|
581 |
||
582 |
:return: None if the plugin doesn't need special handling, self
|
|
583 |
otherwise.
|
|
584 |
"""
|
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
585 |
if not fullname.startswith('bzrlib.plugins.'): |
586 |
return None |
|
|
5086.1.7
by Vincent Ladeuil
Cleaner fix for bug #411413. |
587 |
if fullname in self.blacklist: |
|
5086.1.6
by Vincent Ladeuil
Crude fix for bug #411413. |
588 |
raise ImportError('%s is disabled' % fullname) |
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
589 |
if fullname in self.specific_paths: |
590 |
return self |
|
|
5086.1.6
by Vincent Ladeuil
Crude fix for bug #411413. |
591 |
return None |
|
5086.1.7
by Vincent Ladeuil
Cleaner fix for bug #411413. |
592 |
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
593 |
def load_module(self, fullname): |
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
594 |
"""Load a plugin from a specific directory.""" |
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
595 |
# We are called only for specific paths
|
|
5086.5.14
by Vincent Ladeuil
Fix bug #552922 by controlling which files can be used to load a plugin. |
596 |
plugin_path = self.specific_paths[fullname] |
597 |
loading_path = None |
|
598 |
if os.path.isdir(plugin_path): |
|
599 |
for suffix, mode, kind in imp.get_suffixes(): |
|
600 |
if kind not in (imp.PY_SOURCE, imp.PY_COMPILED): |
|
601 |
# We don't recognize compiled modules (.so, .dll, etc)
|
|
602 |
continue
|
|
603 |
init_path = osutils.pathjoin(plugin_path, '__init__' + suffix) |
|
604 |
if os.path.isfile(init_path): |
|
|
5268.6.3
by Vincent Ladeuil
BZR_PLUGINS_AT should use packages properly to handle relative imports. |
605 |
# We've got a module here and load_module needs specific
|
606 |
# parameters.
|
|
607 |
loading_path = plugin_path |
|
608 |
suffix = '' |
|
609 |
mode = '' |
|
610 |
kind = imp.PKG_DIRECTORY |
|
|
5086.5.14
by Vincent Ladeuil
Fix bug #552922 by controlling which files can be used to load a plugin. |
611 |
break
|
612 |
else: |
|
613 |
for suffix, mode, kind in imp.get_suffixes(): |
|
614 |
if plugin_path.endswith(suffix): |
|
615 |
loading_path = plugin_path |
|
616 |
break
|
|
617 |
if loading_path is None: |
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
618 |
raise ImportError('%s cannot be loaded from %s' |
|
5086.5.14
by Vincent Ladeuil
Fix bug #552922 by controlling which files can be used to load a plugin. |
619 |
% (fullname, plugin_path)) |
|
5268.6.3
by Vincent Ladeuil
BZR_PLUGINS_AT should use packages properly to handle relative imports. |
620 |
if kind is imp.PKG_DIRECTORY: |
621 |
f = None |
|
622 |
else: |
|
623 |
f = open(loading_path, mode) |
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
624 |
try: |
|
5086.5.14
by Vincent Ladeuil
Fix bug #552922 by controlling which files can be used to load a plugin. |
625 |
mod = imp.load_module(fullname, f, loading_path, |
626 |
(suffix, mode, kind)) |
|
|
5086.5.12
by Vincent Ladeuil
Force __package__ to fix pqm failure. |
627 |
mod.__package__ = fullname |
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
628 |
return mod |
629 |
finally: |
|
|
5268.6.3
by Vincent Ladeuil
BZR_PLUGINS_AT should use packages properly to handle relative imports. |
630 |
if f is not None: |
631 |
f.close() |
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
632 |
|
633 |
||
|
5086.5.10
by Vincent Ladeuil
Cleanup docs. |
634 |
# Install a dedicated importer for plugins requiring special handling
|
|
5086.5.3
by Vincent Ladeuil
First shot at loading plugins from a specific directory. |
635 |
PluginImporter = _PluginImporter() |
636 |
sys.meta_path.append(PluginImporter) |