- merged PLD changes, now it works with python 3.x

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

diff --git a/TLD_Builder/file_sender.py b/TLD_Builder/file_sender.py
index 0f652db518a511ece93a2c317df2e4fc8e3a2cf0..d09affb0e5d2adaba4558bdb663af15eca945dc7 100644 (file)
--- a/TLD_Builder/file_sender.py
+++ b/TLD_Builder/file_sender.py
@@ -24,7 +24,7 @@ def read_name_val(file):
     f = open(file)
     r = {'_file': file[:-5], '_desc': file}
     rx = re.compile(r"^([^:]+)\s*:(.*)$")
-    for l in f.xreadlines():
+    for l in f:
         if l == "END\n":
             f.close()
             return r
@@ -60,7 +60,7 @@ def rsync_file(src, target, host):
 
     p = open(path.rsync_password_file, "r")
     password = ""
-    for l in p.xreadlines():
+    for l in p:
         l = string.split(l)
         if len(l) >= 2 and l[0] == host:
             password = l[1]
@@ -99,7 +99,7 @@ def post_file(src, url):
         req.add_header('X-Filename', os.path.basename(src))
         f = urllib2.urlopen(req)
         f.close()
-    except Exception, e:
+    except Exception as e:
         problems[src] = e
         return e
     return 0
@@ -123,7 +123,7 @@ def send_file(src, target):
         if m:
             return not post_file(src, target)
         log.alert("unsupported protocol: %s" % target)
-    except OSError, e:
+    except OSError as e:
         problems[src] = e
         log.error("send_file(%s, %s): %s" % (src, target, e))
         return False
@@ -190,7 +190,7 @@ def flush_queue(dir):
         emails = {}
         emails[config.admin_email] = 1
         pr = ""
-        for src, msg in problems.iteritems():
+        for src, msg in problems.items():
             pr = pr + "[src: %s]\n\n%s\n" % (src, msg)
         for d in remaining:
             if d.has_key('Requester'):