import shutil
import sys
import traceback
-import urllib2
-
+import urllib.request
from config import config, init_conf
import mailer
import path
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
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(key=util.cmp_to_key(mycmp))