diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2011-01-25 18:46:26 +0100 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2011-01-25 14:01:36 -0500 |
| commit | ab2ca8022e4bd89e87e0b7ce908022e6df350866 (patch) | |
| tree | 2f2bde264c001886e90dfb10466539e8f8b75782 /ipaserver/plugins | |
| parent | 27da394c442e98334726a7aae7da885c840be350 (diff) | |
| download | freeipa-ab2ca8022e4bd89e87e0b7ce908022e6df350866.tar.gz freeipa-ab2ca8022e4bd89e87e0b7ce908022e6df350866.tar.xz freeipa-ab2ca8022e4bd89e87e0b7ce908022e6df350866.zip | |
Fix assorted bugs found by pylint
Diffstat (limited to 'ipaserver/plugins')
| -rw-r--r-- | ipaserver/plugins/dogtag.py | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/ldapapi.py | 6 |
3 files changed, 2 insertions, 10 deletions
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py index 45c3c1979..8563848bb 100644 --- a/ipaserver/plugins/dogtag.py +++ b/ipaserver/plugins/dogtag.py @@ -1519,9 +1519,7 @@ class ra(rabase.rabase): """ self.debug('%s.revoke_certificate()', self.fullname) if type(revocation_reason) is not int: - raise TYPE_ERROR('revocation_reason', int, revocation_reason, - type(revocation_reason) - ) + raise TypeError(TYPE_ERROR % ('revocation_reason', int, revocation_reason, type(revocation_reason))) # Convert serial number to integral type from string to properly handle # radix issues. Note: the int object constructor will properly handle large diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 86ea3f882..c920d21f9 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -308,7 +308,7 @@ class ldap2(CrudBackend, Encoder): _ldap.set_option(_ldap.OPT_X_TLS_KEYFILE, tls_keyfile) if debug_level: - _ldap.set_option(_ldap.OPT_X_DEBUG_LEVEL, debug_level) + _ldap.set_option(_ldap.OPT_DEBUG_LEVEL, debug_level) try: conn = _ldap.initialize(self.ldap_uri) diff --git a/ipaserver/plugins/ldapapi.py b/ipaserver/plugins/ldapapi.py index 847e2d2ba..1ef84579c 100644 --- a/ipaserver/plugins/ldapapi.py +++ b/ipaserver/plugins/ldapapi.py @@ -25,7 +25,6 @@ This wraps the python-ldap bindings. """ import ldap as _ldap -import ldap.dn from ipalib import api from ipalib import errors from ipalib.crud import CrudBackend @@ -443,9 +442,4 @@ class ldap(CrudBackend): return results - def get_effective_rights(self, dn, attrs=None): - binddn = self.find_entry_dn("krbprincipalname", self.conn.principal, "posixAccount") - - return servercore.get_effective_rights(binddn, dn, attrs) - api.register(ldap) |