diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 11:11:42 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 11:11:42 +1000 |
commit | ae977ef24780c52da66e3608a3ed94649ae9f873 (patch) | |
tree | 51f1a491b9f515049bc6eb3dc2b3b8ae2a3743e6 /source4/lib/ldb/ldb.py | |
parent | 9198a519bea19a4d9f863fde5fb3aa23f60b5c88 (diff) | |
parent | 8ed6f6d5a825c8b0e8d66d30877a91a96fe6e7a4 (diff) | |
download | samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.gz samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.bz2 samba-ae977ef24780c52da66e3608a3ed94649ae9f873.zip |
Fix merge errors on C provision interface after jelmer's good work.
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
Conflicts:
source/torture/local/torture.c
(This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
Diffstat (limited to 'source4/lib/ldb/ldb.py')
-rw-r--r-- | source4/lib/ldb/ldb.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/ldb.py b/source4/lib/ldb/ldb.py index 0bcfd36779..b148782c63 100644 --- a/source4/lib/ldb/ldb.py +++ b/source4/lib/ldb/ldb.py @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 1.3.33 +# Version 1.3.35 # # Don't modify this file, modify the SWIG interface instead. @@ -99,7 +99,7 @@ Dn_swigregister(Dn) class ldb_msg_element(object): thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - def __init__(self): raise AttributeError, "No constructor defined" + def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined" __repr__ = _swig_repr __swig_destroy__ = _ldb.delete_ldb_msg_element def __getitem__(self, i): |