Fix list and iterators assumptions that are no longer valid in python3

diff --git a/bin/pfa-signpkg b/bin/pfa-signpkg
index 044ffe36223c4949573718495320aa0c7169522a..0bd8e6e0b5231c0e6a327d4728ab38b582994ebd 100755 (executable)
--- a/bin/pfa-signpkg
+++ b/bin/pfa-signpkg
@@ -102,7 +102,7 @@ def chunk(seq, size, pad=None):
      '''
      n = len(seq)
      mod = n % size
-     for i in xrange(0, n - mod, size):
+     for i in range(0, n - mod, size):
          yield seq[i : i + size]
      if mod:
          yield seq[-mod:]

diff --git a/modules/cmds.py b/modules/cmds.py
index 80a0ecb581d0f10476660330399850ab7f734f4a..9fa2b195c89ece9c06d438ec0f244393ff9aba3f 100644 (file)
--- a/modules/cmds.py
+++ b/modules/cmds.py
@@ -88,7 +88,7 @@ def load_creds():
         return
     else:
         f=open(common.ftpadmdir+'/var/passwd', 'r')
-        for line in f.xreadlines():
+        for line in f:
             x=line.strip().split(':')
             if len(x)>=2:
                 users[x[0]]=x[1]
@@ -97,7 +97,7 @@ def load_creds():
         return
     else:
         f=open(common.ftpadmdir+'/var/cookies', 'r')
-        for line in f.xreadlines():
+        for line in f:
             x=line.strip().split(':')
             if len(x)>=2:
                 users[x[0]]=x[1]
@@ -147,8 +147,7 @@ def cmd_logout(con):
 def reloadftptree():
     global srctree, pkglist
     srctree=ftptree.FtpTree(config.value['default_to'], loadall=True)
-    pkglist=srctree.keys()
-    pkglist.sort()
+    pkglist=sorted(srctree.keys())
 
 def cmd_gettree(con):
     buf=''

diff --git a/modules/ftptree.py b/modules/ftptree.py
index c45c131acd5a2654186b960f27a0741a89bdfa83..2c09a69d74e890728ff5d8efff30184a57e8c3d2 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -382,8 +382,8 @@ class FtpTree(BaseFtpTree):
                 return True
             else:
                 return False
-        list = filter(checkfiletype, os.listdir(self.basedir+'/SRPMS/.metadata'))
-        self.pkgnames = map((lambda x: x[:-13]), list)
+        pkglist = list(filter(checkfiletype, os.listdir(self.basedir+'/SRPMS/.metadata')))
+        self.pkgnames = list(map((lambda x: x[:-13]), pkglist))
 
     def __mark4something(self, wannabepkgs, markfunction):
         def chopoffextension(pkg):
@@ -500,7 +500,7 @@ class FtpTree(BaseFtpTree):
                 return True
             else:
                 return False
-        return filter(filter_other_pkgs, tree.pkgnames)
+        return list(filter(filter_other_pkgs, tree.pkgnames))
 
     def __find_older_pkgs(self, pkg):
         def filter_older_pkgs(x):
@@ -511,7 +511,7 @@ class FtpTree(BaseFtpTree):
                 return True
             else:
                 return False
-        return filter(filter_older_pkgs, self.__find_other_pkgs(pkg, self))
+        return list(filter(filter_older_pkgs, self.__find_other_pkgs(pkg, self)))
 
     def __checksigns(self, tree, pkgs, test = False):
         """
@@ -548,7 +548,7 @@ class FtpTree(BaseFtpTree):
         def findbyname(name):
             def x(nvr):
                 return '-'.join(nvr.split('-')[:-2]) == name
-            return filter(x, tree.pkgnames)
+            return list(filter(x, tree.pkgnames))
 
         for pkg in pkgs:
             obsoletes = pkg.obsoletes()