Skip to content

Commit 6a10a50

Browse files
authored
Merge pull request #1383 from vil02/resolve_consider-using-enumerate
Simplify `AbstractPkg._gather_aux` to resolve `consider-using-enumerate`
2 parents 7b89025 + 0b193d2 commit 6a10a50

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

rpmlint/pkg.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -409,18 +409,18 @@ def _calc_magic(self, pkgfile):
409409
# internal function to gather dependency info used by the above ones
410410
def _gather_aux(self, header, xs, nametag, flagstag, versiontag,
411411
prereq=None):
412-
names = header[nametag]
413-
flags = header[flagstag]
414412
versions = header[versiontag]
415413

416414
if versions:
417-
for loop in range(len(versions)):
418-
name = byte_to_string(names[loop])
419-
evr = stringToVersion(byte_to_string(versions[loop]))
420-
if prereq is not None and flags[loop] & PREREQ_FLAG:
421-
prereq.append((name, flags[loop] & (~PREREQ_FLAG), evr))
415+
names = header[nametag]
416+
flags = header[flagstag]
417+
for version, name_bytes, flag in zip(versions, names, flags):
418+
name = byte_to_string(name_bytes)
419+
evr = stringToVersion(byte_to_string(version))
420+
if prereq is not None and flag & PREREQ_FLAG:
421+
prereq.append((name, flag & (~PREREQ_FLAG), evr))
422422
else:
423-
xs.append(DepInfo(name, flags[loop], evr))
423+
xs.append(DepInfo(name, flag, evr))
424424
return xs, prereq
425425

426426
def _gather_dep_info(self):

0 commit comments

Comments
 (0)