diff options
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/dnskeysyncinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/ipa_otptoken_import.py | 5 | ||||
| -rw-r--r-- | ipaserver/install/plugins/rename_managed.py | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index da1c72acb..6f565dd14 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -806,8 +806,8 @@ class CAInstance(DogtagInstance): chain = chain.split("\n") root_nickname=[] - for i in xrange(len(chain)): - m = re.match('\ *"(.*)" \[.*', chain[i]) + for part in chain: + m = re.match('\ *"(.*)" \[.*', part) if m: nick = m.groups(0)[0] if nick != "ipa-ca-agent" and nick[:7] != "Builtin": diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py index 482250fee..68130c925 100644 --- a/ipaserver/install/dnskeysyncinstance.py +++ b/ipaserver/install/dnskeysyncinstance.py @@ -310,7 +310,7 @@ class DNSKeySyncInstance(service.Service): # check if key with this ID exist in softHSM # id is 16 Bytes long key_id = "".join(chr(random.randint(0, 255)) - for _ in xrange(0, 16)) + for _ in range(0, 16)) replica_pubkey_dn = DN(('ipk11UniqueId', 'autogenerate'), dn_base) diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py index 4d901d08e..98de4799d 100644 --- a/ipaserver/install/ipa_otptoken_import.py +++ b/ipaserver/install/ipa_otptoken_import.py @@ -31,6 +31,7 @@ import dateutil.parser import dateutil.tz import nss.nss as nss import gssapi +from six.moves import xrange from ipapython import admintool from ipalib import api, errors @@ -190,7 +191,7 @@ class PBKDF2KeyDerivation(XMLKeyDerivation): # Loop through each block adding it to the derived key. dk = [] - for i in xrange(1, blocks + 1): + for i in range(1, blocks + 1): # Set initial values. last = self.salt + struct.pack('>I', i) hash = [0] * mac.digest_size @@ -202,7 +203,7 @@ class PBKDF2KeyDerivation(XMLKeyDerivation): last = tmp.digest() # XOR the previous hash with the new hash. - for k in xrange(mac.digest_size): + for k in range(mac.digest_size): hash[k] ^= ord(last[k]) # Add block to derived key. diff --git a/ipaserver/install/plugins/rename_managed.py b/ipaserver/install/plugins/rename_managed.py index 9cff18b76..4b42d48dc 100644 --- a/ipaserver/install/plugins/rename_managed.py +++ b/ipaserver/install/plugins/rename_managed.py @@ -33,8 +33,8 @@ def entry_to_update(entry): update = [] for attr in entry.keys(): if isinstance(entry[attr], list): - for i in xrange(len(entry[attr])): - update.append(dict(attr=str(attr), value=str(entry[attr][i]))) + for item in entry[attr]: + update.append(dict(attr=str(attr), value=str(item))) else: update.append(dict(attr=str(attr), value=str(entry[attr]))) |