1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00

Use Python's "range" instead of deprecated "xrange".

Reported by 2to3. Python 3 throws out the old range, renames the old
xrange to be the new range, leaving no xrange. A shim could be used,
but using the less efficient version does not have a noticeable impact
on the run time.  This observed (lack of an) effect is as described in
the Python 2 docs for xrange. The largest range created is only 1000
elements big, and the memory cost of those ranges is negligible when
compared to that of all the pmpkg instances created.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jeremy Heiner 2013-10-12 12:44:35 -04:00 committed by Allan McRae
parent 95b0a868f2
commit e9c7c3b90d
3 changed files with 5 additions and 5 deletions

View File

@ -4,7 +4,7 @@ p = pmpkg("pkg1000")
self.addpkg2db("local", p) self.addpkg2db("local", p)
for i in xrange(1000): for i in range(1000):
p = pmpkg("pkg%03d" % i) p = pmpkg("pkg%03d" % i)
p.depends = ["pkg%03d" % (i+1)] p.depends = ["pkg%03d" % (i+1)]
p.files = ["usr/share/pkg%03d" % i] p.files = ["usr/share/pkg%03d" % i]
@ -14,7 +14,7 @@ pkglist = [p.filename() for p in self.localpkgs]
self.args = "-U %s" % " ".join(pkglist) self.args = "-U %s" % " ".join(pkglist)
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
#for i in xrange(1000): #for i in range(1000):
# self.addrule("PKG_EXIST=pkg%03d" %i) # self.addrule("PKG_EXIST=pkg%03d" %i)
# picked 3 random packages to test for, since the loop is too much to handle # picked 3 random packages to test for, since the loop is too much to handle
self.addrule("PKG_EXIST=pkg050") self.addrule("PKG_EXIST=pkg050")

View File

@ -1,11 +1,11 @@
self.description = "Remove a thousand packages in a single transaction" self.description = "Remove a thousand packages in a single transaction"
for i in xrange(1000): for i in range(1000):
p = pmpkg("pkg%03dname" % i) p = pmpkg("pkg%03dname" % i)
p.files = ["usr/share/pkg%03d/file" % i] p.files = ["usr/share/pkg%03d/file" % i]
self.addpkg2db("local", p) self.addpkg2db("local", p)
pkglist = ["pkg%03dname" % i for i in xrange(100, 1000)] pkglist = ["pkg%03dname" % i for i in range(100, 1000)]
self.args = "-R %s" % " ".join(pkglist) self.args = "-R %s" % " ".join(pkglist)
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")

View File

@ -7,7 +7,7 @@ self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
numpkgs = 10 numpkgs = 10
pkgnames = [] pkgnames = []
for i in xrange(numpkgs): for i in range(numpkgs):
name = "pkg_%s" % i name = "pkg_%s" % i
pkgnames.append(name) pkgnames.append(name)
p = pmpkg(name) p = pmpkg(name)