- python 3.x fixes

[tld-builder.git] / TLD_Builder / poldek.py

diff --git a/TLD_Builder/poldek.py b/TLD_Builder/poldek.py
index 9b23a899344053679e2b6fc021edc3a0049b925b..e8fe7402b129ea918711ca4ed6863035d72b8aa5 100644 (file)
--- a/TLD_Builder/poldek.py
+++ b/TLD_Builder/poldek.py
@@ -3,7 +3,6 @@
 import re
 import types
 import string
-import xreadlines
 
 from chroot import *
 from util import *
@@ -55,13 +54,13 @@ def get_poldek_requires():
     cur_pkg = None
 
     f = chr_popen("poldek -v -v --verify --unique-pkg-names")
-    for l in xreadlines.xreadlines(f):
+    for l in f:
         m = name_rx.match(l)
         if m:
             if cur_pkg:
                 pkg_reqs[cur_pkg] = cur_pkg_reqs
             cur_pkg = m.groups(1)
-            if pkg_reqs.has_key(cur_pkg):
+            if cur_pkg in pkg_reqs:
                 cur_pkg = None
                 cur_pkg_reqs = None
             else:
@@ -70,7 +69,7 @@ def get_poldek_requires():
         m = req_rx.match(l)
         if m:
             reqs = []
-            for x in string.split(m.group(1)):
+            for x in m.group(1).split():
                 if x in ["RPMLIB_CAP", "NOT", "FOUND", "UNMATCHED"]: continue
                 m = pkg_name_rx.match(x)
                 if m: