[ldap_locks] (item, subdict) in dict.keys() ? Nope

This commit is contained in:
Pierre-Elliott Bécue 2013-09-27 10:01:21 +02:00
parent 52fc541781
commit 3cbbb2303f

View file

@ -39,7 +39,6 @@ import exceptions
import socket import socket
import crans_utils import crans_utils
import collections import collections
import subprocess
import time import time
class LockError(exceptions.StandardError): class LockError(exceptions.StandardError):
@ -87,14 +86,14 @@ class LdapLockHolder:
l'objet. l'objet.
""" """
if Id == None: if Id == None:
for key, subdict in self.locks['default'].keys(): for key, subdict in self.locks['default'].iteritems():
for item, value in subdict: for item, value in subdict:
try: try:
self.removelock(item, value, key) self.removelock(item, value, key)
except: except:
pass pass
else: else:
for item, value in self.locks[Id].items(): for item, value in self.locks[Id].iteritems():
try: try:
self.removelock(item, value, Id) self.removelock(item, value, Id)
except: except: