summaryrefslogtreecommitdiffstats
path: root/python/samba
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-12-14 20:31:45 +0000
committerAndrew Bartlett <abartlet@samba.org>2015-03-06 04:41:48 +0100
commit2e2c05c1fef8183434e82debc87627acae5a5f97 (patch)
tree6f8d585e03192dac593df44cd4f4e7eed6864c13 /python/samba
parent889d0adab1f303fccabd225e0162ca488ab26164 (diff)
downloadsamba-2e2c05c1fef8183434e82debc87627acae5a5f97.tar.gz
samba-2e2c05c1fef8183434e82debc87627acae5a5f97.tar.xz
samba-2e2c05c1fef8183434e82debc87627acae5a5f97.zip
Remove 'external' python module support code - use the third_party directory instead.
Change-Id: I2f5053bc5a42d3dfe71f5bd027eb6ead7d1b9752 Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba')
-rw-r--r--python/samba/__init__.py16
1 files changed, 0 insertions, 16 deletions
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("."))