From a35d876537eb301d75a254d9da97268d041da8d6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 8 Apr 2010 20:34:40 +0200
Subject: s4-python: rename samba.glue to samba._glue to indicate it's private.

---
 source4/scripting/python/samba/__init__.py | 18 +++++++++---------
 source4/scripting/python/samba/getopt.py   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source4/scripting/python/samba')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index a513541da8..d7fc05cabd 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -43,7 +43,7 @@ else:
 
 import ldb
 import dsdb
-import glue
+import _glue
 from samba._ldb import Ldb as _Ldb
 
 class Ldb(_Ldb):
@@ -275,13 +275,13 @@ class Ldb(_Ldb):
         dsdb.samdb_get_domain_sid(self)
 
     def set_schema_from_ldif(self, pf, df):
-        glue.dsdb_set_schema_from_ldif(self, pf, df)
+        _glue.dsdb_set_schema_from_ldif(self, pf, df)
 
     def set_schema_from_ldb(self, ldb):
-        glue.dsdb_set_schema_from_ldb(self, ldb)
+        _glue.dsdb_set_schema_from_ldb(self, ldb)
 
     def write_prefixes_from_schema(self):
-        glue.dsdb_write_prefixes_from_schema_to_ldb(self)
+        _glue.dsdb_write_prefixes_from_schema_to_ldb(self)
 
     def convert_schema_to_openldap(self, target, mapping):
         return dsdb.dsdb_convert_schema_to_openldap(self, target, mapping)
@@ -397,8 +397,8 @@ def ensure_external_module(modulename, location):
             sys.modules[modulename] = __import__(
                 "samba.external.%s" % modulename, fromlist=["samba.external"])
 
-version = glue.version
-interface_ips = glue.interface_ips
-set_debug_level = glue.set_debug_level
-unix2nttime = glue.unix2nttime
-generate_random_password = glue.generate_random_password
+version = _glue.version
+interface_ips = _glue.interface_ips
+set_debug_level = _glue.set_debug_level
+unix2nttime = _glue.unix2nttime
+generate_random_password = _glue.generate_random_password
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 62e16f7c75..1fbfd9c713 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -22,7 +22,7 @@
 import optparse
 from credentials import Credentials, DONT_USE_KERBEROS, MUST_USE_KERBEROS
 from hostconfig import Hostconfig
-import glue
+import samba
 
 __docformat__ = "restructuredText"
 
@@ -60,7 +60,7 @@ class SambaOptions(optparse.OptionGroup):
         else:
             lp.load_default()
         if self._debuglevel:
-            glue.set_debug_level(self._debuglevel)
+            samba.set_debug_level(self._debuglevel)
         return lp
 
     def get_hostconfig(self):
-- 
cgit