- use builtin python3 urllib instead of urllib2

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

diff --git a/TLD_Builder/file_sender.py b/TLD_Builder/file_sender.py
index 2a0c1200e0c8fbf93df1b2962fc696dc29041043..056045826204a5a0a3646a98bb4d184187343a57 100644 (file)
--- 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
@@ -168,7 +168,7 @@ def flush_queue(dir):
             return cmp(x['Type'], y['Type'])
         else:
             return rc
-    q.sort(key=mycmp)
+    q.sort(key=util.cmp_to_key(mycmp))
 
     error = None
     # copy of q