From 10441ed83d701d6db64c3a933cf09957355e1db2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 10 Dec 2010 03:03:18 +0100 Subject: subunitrun: Use unittest.TestProgram if subunit.TestProgram is not available. Autobuild-User: Jelmer Vernooij Autobuild-Date: Fri Dec 10 03:49:03 CET 2010 on sn-devel-104 --- source4/scripting/python/samba/__init__.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 6fcac16691..5294368b6d 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -318,27 +318,12 @@ def import_bundled_package(modulename, location): sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../../lib", location)) - __import__(modulename) + sys.modules[modulename] = __import__(modulename) else: sys.modules[modulename] = __import__( "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. -- cgit