diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 01:26:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 01:30:51 +0200 |
| commit | b48182007c53faebb0a57cefb5e1923a3bef5851 (patch) | |
| tree | 9bc49434258467744df39d3ef84061a06471c289 /source4/scripting/python | |
| parent | e55c012accef40a9e07f8a9e67d54afd18ba2a7e (diff) | |
| download | samba-b48182007c53faebb0a57cefb5e1923a3bef5851.tar.gz samba-b48182007c53faebb0a57cefb5e1923a3bef5851.tar.bz2 samba-b48182007c53faebb0a57cefb5e1923a3bef5851.zip | |
s4-python: Remove trivial function, replace by dictionary.
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/misc.py | 33 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/dsdb.py | 6 |
2 files changed, 3 insertions, 36 deletions
diff --git a/source4/scripting/python/samba/misc.py b/source4/scripting/python/samba/misc.py deleted file mode 100644 index 0089751586..0000000000 --- a/source4/scripting/python/samba/misc.py +++ /dev/null @@ -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" diff --git a/source4/scripting/python/samba/tests/dsdb.py b/source4/scripting/python/samba/tests/dsdb.py index 86ec3ecd6c..24a2888bf3 100644 --- a/source4/scripting/python/samba/tests/dsdb.py +++ b/source4/scripting/python/samba/tests/dsdb.py @@ -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") |