From 2e2c05c1fef8183434e82debc87627acae5a5f97 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 14 Dec 2014 20:31:45 +0000 Subject: Remove 'external' python module support code - use the third_party directory instead. Change-Id: I2f5053bc5a42d3dfe71f5bd027eb6ead7d1b9752 Signed-off-by: Jelmer Vernooij Reviewed-by: Andrew Bartlett --- python/samba/__init__.py | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'python/samba') diff --git a/python/samba/__init__.py b/python/samba/__init__.py index 0cbdec7800..1d1f27db55 100644 --- a/python/samba/__init__.py +++ b/python/samba/__init__.py @@ -354,22 +354,6 @@ def ensure_third_party_module(modulename, location): namespace="samba.third_party") -def ensure_external_module(modulename, location): - """Add a location to sys.path if an external dependency can't be found. - - :param modulename: Module name to import - :param location: Location to add to sys.path (can be relative to - ${srcdir}/lib) - """ - # This is deprecated - please use ensure_third_party_module for - # new modules instead, and put them in third_party/. - try: - __import__(modulename) - except ImportError: - import_bundled_package(modulename, location, - source_tree_container="lib", namespace="samba.external") - - def dn_from_dns_name(dnsdomain): """return a DN from a DNS name domain/forest root""" return "DC=" + ",DC=".join(dnsdomain.split(".")) -- cgit