sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-15 16:59:09 +03:00
Code Activity

s4-python: Remove trivial function, replace by dictionary.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-06-20 01:26:23 +02:00
parent e55c012acc
commit b48182007c
3 changed files with 14 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source4/scripting/python/samba/misc.py
View File

@ -1,33 +0,0 @@
#!/usr/bin/python
# Unix SMB/CIFS implementation.
# Copyright (C) Matthieu Patou 2010 <mat@matws.net>
#
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
"""Misc helper functions"""
__docformat__ = "restructuredText"
import ldb
def messageEltFlagToString(flag):
if flag == ldb.FLAG_MOD_ADD:
return "MOD_ADD"
elif flag == ldb.FLAG_MOD_REPLACE:
return "MOD_REPLACE"
elif flag == ldb.FLAG_MOD_DELETE:
return "MOD_DELETE"

6
source4/scripting/python/samba/tests/dsdb.py
View File

@ -19,7 +19,7 @@
import samba.dsdb
from samba.credentials import Credentials
from samba import Ldb
from samba.samdb import SamDB
from samba.auth import system_session
from testtools.testcase import TestCase
import os
@ -36,7 +36,7 @@ class DsdbTests(TestCase):
creds = Credentials()
creds.guess(lp)
session = system_session()
test_ldb = Ldb(os.path.join(self._baseprovpath(), "private", "sam.ldb"),
test_ldb = SamDB(os.path.join(self._baseprovpath(), "private", "sam.ldb"),
session_info=session, credentials=creds,lp=lp)
oid = samba.dsdb.dsdb_get_oid_from_attid(test_ldb, 591614)
oid = test_ldb.dsdb_get_oid_from_attid(591614)
self.assertEquals(oid, "1.2.840.113556.1.4.1790")