IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Modernize use of range()

Browse Source 
In Python 3, range() behaves like the old xrange().
The difference between range() and xrange() is usually not significant,
especially if the whole result is iterated over.

Convert xrange() usage to range() for small ranges.
Use modern idioms in a few other uses of range().

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin
2015-08-12 15:23:56 +02:00
committed by Jan Cholasta
parent 9e917cae39
commit 5178e9a597
22 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ipalib/plugins/baseuser.py
View File

@@ -427,16 +427,16 @@ class baseuser(LDAPObject):
manager = [manager]
try:
container_dn = DN(container, api.env.basedn)
for m in xrange(len(manager)):
if isinstance(manager[m], DN) and manager[m].endswith(container_dn):
for i, mgr in enumerate(manager):
if isinstance(mgr, DN) and mgr.endswith(container_dn):
continue
entry_attrs = self.backend.find_entry_by_attr(
self.primary_key.name, manager[m], self.object_class, [''],
self.primary_key.name, mgr, self.object_class, [''],
container_dn
)
manager[m] = entry_attrs.dn
manager[i] = entry_attrs.dn
except errors.NotFound:
raise errors.NotFound(reason=_('manager %(manager)s not found') % dict(manager=manager[m]))
raise errors.NotFound(reason=_('manager %(manager)s not found') % dict(manager=mgr))
return manager
@@ -448,8 +448,8 @@ class baseuser(LDAPObject):
return
if 'manager' in entry_attrs:
for m in xrange(len(entry_attrs['manager'])):
entry_attrs['manager'][m] = self.get_primary_key_from_dn(entry_attrs['manager'][m])
for i, mgr in enumerate(entry_attrs['manager']):
entry_attrs['manager'][i] = self.get_primary_key_from_dn(mgr)
def _user_status(self, user, container):
assert isinstance(user, DN)