More python3 compatible string methods

diff --git a/modules/baseftptree.py b/modules/baseftptree.py
index af47c7649f5d6a6b2071807c042c5d486752436d..64f81a40af4220aee136e72637cde0918f82871d 100644 (file)
--- a/modules/baseftptree.py
+++ b/modules/baseftptree.py
@@ -31,7 +31,7 @@ class BasePkg:
             f.close()
 
         for entry in lines:
-            i=string.split(string.strip(entry), ':')
+            i=str.split(str.strip(entry), ':')
             if i[0] == 'info':
                 if len(i)==3:
                     self.info[i[1]]=i[2]

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 0200a10528a98da4c6adf3eefd77fa24a0922af5..c45c131acd5a2654186b960f27a0741a89bdfa83 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -71,7 +71,7 @@ def mv(src, dst, test = False):
 class Pkg(BasePkg):
     def __init__(self, nvr, tree):
         BasePkg.__init__(self, nvr, tree)
-        self.name = string.join(nvr.split('-')[:-2], '-')
+        self.name = '-'.join(nvr.split('-')[:-2])
         self.version = nvr.split('-')[-2]
         self.release = nvr.split('-')[-1]
         self.marked4removal = False
@@ -158,7 +158,7 @@ class Pkg(BasePkg):
         for bid in self.build.keys():
             f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\n" % (bid, self.build[bid].requester, bid, self.build[bid].requester_email))
         for key in self.info.keys():
-            f.write("info:%s:%s\n" % (key, string.join(self.info[key], ':')))
+            f.write("info:%s:%s\n" % (key, ':'.join(self.info[key])))
         for arch in self.files.keys():
             for rpm in self.files[arch]:
                 f.write("file:%s:%s\n" % (arch, rpm))