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
m = rx.search(l)
if m:
- r[m.group(1)] = string.strip(m.group(2))
+ r[m.group(1)] = m.group(2).strip()
else:
break
f.close()
p = open(path.rsync_password_file, "r")
password = ""
- for l in p.xreadlines():
- l = string.split(l)
+ for l in p:
+ l = l.split()
if len(l) >= 2 and l[0] == host:
password = l[1]
p.close()
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
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
retry_delay = 0
try:
f = open(dir + "/retry-at")
- last_retry = int(string.strip(f.readline()))
- retry_delay = int(string.strip(f.readline()))
+ last_retry = int(f.readline().strip())
+ retry_delay = int(f.readline().strip())
f.close()
if last_retry + retry_delay > time.time():
return
if d != None: q.append(d)
def mycmp(x, y):
rc = cmp(x['Time'], y['Time'])
- if rc == 0 and x.has_key('Type') and y.has_key('Type'):
+ if rc == 0 and 'Type' in x and 'Type' in y:
return cmp(x['Type'], y['Type'])
else:
return rc
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'):
+ if 'Requester' in d:
emails[d['Requester']] = 1
e = emails.keys()
m = mailer.Message()