X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Ffile_sender.py;h=b28980ee764fa3567e96faff6920c6af7321ce30;hb=90e89153ad56b37c24ba84ec1ade4dd4984a4059;hp=77a9848bc2d97c214d0764e261eddb9ecfc48e01;hpb=98531ab4a0e4e065d3b11b051b3e4bd7653c6ac0;p=tld-builder.git

diff --git a/TLD_Builder/file_sender.py b/TLD_Builder/file_sender.py
index 77a9848..b28980e 100644
--- a/TLD_Builder/file_sender.py
+++ b/TLD_Builder/file_sender.py
@@ -8,8 +8,7 @@ import time
 import shutil
 import sys
 import traceback
-import urllib2
-
+import urllib
 from config import config, init_conf
 import mailer
 import path
@@ -17,6 +16,7 @@ import log
 import loop
 import status
 import lock
+import util
 
 retries_times = [5 * 60, 5 * 60, 10 * 60, 10 * 60, 30 * 60, 60 * 60]
 
@@ -93,11 +93,11 @@ def post_file(src, url):
     global problems
     try:
         f = open(src, 'r')
-        data = f.read()
+        data = f.read().encode('utf-8')
         f.close()
-        req = urllib2.Request(url, data)
-        req.add_header('X-Filename', os.path.basename(src))
-        f = urllib2.urlopen(req)
+        headers = { 'X-Filename' : os.path.basename(src) }
+        req = urllib.request.Request(url, data=data, headers=headers)
+        f = urllib.request.urlopen(req)
         f.close()
     except Exception as e:
         problems[src] = e
@@ -163,12 +163,12 @@ def flush_queue(dir):
         d = read_name_val(f)
         if d != None: q.append(d)
     def mycmp(x, y):
-        rc = cmp(x['Time'], y['Time'])
+        rc = util.cmp(x['Time'], y['Time'])
         if rc == 0 and 'Type' in x and 'Type' in y:
-            return cmp(x['Type'], y['Type'])
+            return util.cmp(x['Type'], y['Type'])
         else:
             return rc
-    q.sort(mycmp)
+    q.sort(key=util.cmp_to_key(mycmp))
 
     error = None
     # copy of q
@@ -197,7 +197,7 @@ def flush_queue(dir):
                 emails[d['Requester']] = 1
         e = emails.keys()
         m = mailer.Message()
-        m.set_headers(to = string.join(e, ", "),
+        m.set_headers(to = ", ".join(e),
                       subject = "[%s] builder queue problem" % config.builder)
         m.write("there were problems sending files from queue %s:\n" % dir)
         m.write("problems:\n")