Skip to content

Commit

Permalink
ReconnectLDAPObject.sasl_bind_s() now correctly uses generic wrapper …
Browse files Browse the repository at this point in the history
…arguments *args,**kwargs
  • Loading branch information
stroeder committed Oct 24, 2015
1 parent 2cc6d11 commit 12cf591
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ Lib/
* Added key-word argument authz_id to LDAPObject methods
sasl_non_interactive_bind_s(), sasl_external_bind_s() and
sasl_gssapi_bind_s()
* Hmmpf! Added missing self to LDAPObject.fileno().
* ReconnectLDAPObject.sasl_bind_s() now correctly uses
generic wrapper arguments *args,**kwargs

Doc/
* Started missing docs for sub-module ldap.sasl.
Expand Down Expand Up @@ -1210,4 +1213,4 @@ Released 2.0.0pre02 2002-02-01
----------------------------------------------------------------
Released 1.10alpha3 2000-09-19

$Id: CHANGES,v 1.360 2015/10/24 15:42:41 stroeder Exp $
$Id: CHANGES,v 1.361 2015/10/24 15:46:12 stroeder Exp $
6 changes: 3 additions & 3 deletions Lib/ldap/ldapobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
See http://www.python-ldap.org/ for details.
\$Id: ldapobject.py,v 1.148 2015/10/24 15:42:41 stroeder Exp $
\$Id: ldapobject.py,v 1.149 2015/10/24 15:46:12 stroeder Exp $
Compability:
- Tested with Python 2.0+ but should work with Python 1.5.x
Expand Down Expand Up @@ -136,7 +136,7 @@ def __getattr__(self,name):
self.__class__.__name__,repr(name)
)

def fileno():
def fileno(self):
"""
Returns file description of LDAP connection.
Expand Down Expand Up @@ -933,7 +933,7 @@ def sasl_interactive_bind_s(self,*args,**kwargs):
self._store_last_bind(SimpleLDAPObject.sasl_interactive_bind_s,*args,**kwargs)
return res

def sasl_bind_s(self,dn,mechanism,cred,serverctrls=None,clientctrls=None):
def sasl_bind_s(self,*args,**kwargs):
res = self._apply_method_s(SimpleLDAPObject.sasl_bind_s,*args,**kwargs)
self._store_last_bind(SimpleLDAPObject.sasl_bind_s,*args,**kwargs)
return res
Expand Down

0 comments on commit 12cf591

Please sign in to comment.