More python3 compatible string methods

[projects/pld-ftp-admin.git] / modules / ftptree.py

diff --git a/modules/ftptree.py b/modules/ftptree.py
index e5b33c62347fb0fcb680de0f5df2fc0098681cc3..c45c131acd5a2654186b960f27a0741a89bdfa83 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -2,7 +2,16 @@
 
 from __future__ import print_function
 
-import os, config, string, urllib, re, rpm
+import os
+import config
+import string
+try:
+    import urllib.request as urlmess
+except ImportError:
+    import urllib as urlmess
+    pass
+import re
+import rpm
 from common import fileexists, noarchcachedir
 from baseftptree import BasePkg, BaseFtpTree
 from sign import is_signed
@@ -62,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
@@ -141,7 +150,7 @@ class Pkg(BasePkg):
 
     def load(self, content=None):
         BasePkg.load(self, content)
-        if self.info.has_key('move'):
+        if 'move' in self.info:
             self.mark4moving()
 
     def writeinfo(self):
@@ -149,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))
@@ -275,7 +284,7 @@ class FtpTree(BaseFtpTree):
         self.do_checkbuild = True
 
     def __getitem__(self, key):
-        if self.loadedpkgs.has_key(key):
+        if key in self.loadedpkgs:
             return self.loadedpkgs[key]
         elif key in self.pkgnames:
             pkg=Pkg(key, self)
@@ -400,11 +409,11 @@ class FtpTree(BaseFtpTree):
 
         Reads config.builderqueue to grab the info
         """
-        f = urllib.urlopen(config.builderqueue)
+        f = urlmess.urlopen(config.builderqueue)
         requests = {}
         reid = re.compile(r'^.*id=(.*) pri.*$')
         regb = re.compile(r'^group:.*$|builders:.*$', re.M)
-        for i in re.findall(regb, f.read()):
+        for i in re.findall(regb, f.read().decode('utf-8')):
             if i[0] == 'g':
                 id = reid.sub(r'\1', i)
                 requests[id] = ""
@@ -414,7 +423,7 @@ class FtpTree(BaseFtpTree):
 
         for pkg in marked:
             for bid in pkg.build.keys():
-                if requests.has_key(bid) and not requests[bid].find('?') == -1:
+                if bid in requests and not requests[bid].find('?') == -1:
                     pkg.error("(buildid %s) building not finished" % bid)
 
     def __checkarchs(self, dsttree, marked):