sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s4-python: Add convenience function for forcibly importing bundled

Browse Source 
package.
This commit is contained in:
Jelmer Vernooij 2010-12-10 00:47:33 +01:00
parent bdf5a49cec
commit 636d8cfb42
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/bin/subunitrun
View File

@ -29,10 +29,8 @@ samba.ensure_external_module("subunit", "subunit/python")
try:
from subunit.run import SubunitTestRunner, TestProgram
except ImportError:
del sys.modules["subunit"]
if "subunit.run" in sys.modules:
del sys.modules["subunit.run"]
samba.import_bundled_package("subunit", "subunit/python")
samba.force_bundled_package("testtools", "testtools")
samba.force_bundled_package("subunit", "subunit/python")
from subunit.run import SubunitTestRunner, TestProgram
import samba.getopt as options
import samba.tests

15
source4/scripting/python/samba/__init__.py
View File

@ -324,6 +324,21 @@ def import_bundled_package(modulename, location):
"samba.external.%s" % modulename, fromlist=["samba.external"])
def force_bundled_package(packagename, location):
"""Forcibly use the bundled package.
This will first unload the system module and then load the bundled one.
:param packagename: The package name
:param location: Location to add to sys.path (can be relative to
${srcdir}/lib)
"""
for m in sys.modules.keys():
if m.startswith("%s." % packagename):
del sys.modules[m]
import_bundled_package(packagename, location)
def ensure_external_module(modulename, location):
"""Add a location to sys.path if an external dependency can't be found.