summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-09-29 01:09:09 +0300
committerKamen Mazdrashki <kamenim@samba.org>2010-10-03 01:24:55 +0300
commite9620c5fd211c854ed3f05f8821079efa729bc33 (patch)
tree26358eb1763a913b6b661ae7dc23c11bb86bc8e8
parent24f1893b5dbf78fcd2ce839e091c91426ca9252b (diff)
downloadsamba-e9620c5fd211c854ed3f05f8821079efa729bc33.tar.gz
samba-e9620c5fd211c854ed3f05f8821079efa729bc33.tar.bz2
samba-e9620c5fd211c854ed3f05f8821079efa729bc33.zip
s4-python-samba: Fix few cosmetics
- we have sys module already imported - _glue module is part of samba package so be more precise how to import
-rw-r--r--source4/scripting/python/samba/__init__.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index fb71110600..f698b9a6a6 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -92,7 +92,7 @@ class Ldb(_Ldb):
self.register_samba_handlers()
# TODO set debug
- def msg(l,text):
+ def msg(l, text):
print text
#self.set_debug(msg)
@@ -215,7 +215,7 @@ class Ldb(_Ldb):
"""
for changetype, msg in self.parse_ldif(ldif):
assert changetype == ldb.CHANGETYPE_NONE
- self.add(msg,controls)
+ self.add(msg, controls)
def modify_ldif(self, ldif, controls=None):
"""Modify database based on a LDIF string.
@@ -312,7 +312,6 @@ def ensure_external_module(modulename, location):
try:
__import__(modulename)
except ImportError:
- import sys
if _in_source_tree():
sys.path.insert(0,
os.path.join(os.path.dirname(__file__),
@@ -322,7 +321,7 @@ def ensure_external_module(modulename, location):
sys.modules[modulename] = __import__(
"samba.external.%s" % modulename, fromlist=["samba.external"])
-import _glue
+from samba import _glue
version = _glue.version
interface_ips = _glue.interface_ips
set_debug_level = _glue.set_debug_level