Fix assorted bugs found by pylint

This commit is contained in:
Jakub Hrozek
2011-01-25 18:46:26 +01:00
committed by Simo Sorce
parent 27da394c44
commit ab2ca8022e
17 changed files with 19 additions and 46 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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)