import gzip
import time
import sys
-if sys.version_info[0] == 2:
- import StringIO
-else:
- from io import StringIO
+from io import StringIO
import os
import fcntl
import string
import tempfile
+import shutil
# TLD_Builder:
import gpg
<link rel="Shortcut Icon" href="//www.tld-linux.org/favicon.ico"/>
<title>TLD builder queue</title>
<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="style.css">
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
- <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.4.3/jquery.timeago.min.js"></script>
- <script type="text/javascript" src="script.js"></script>
</head>
<body>
-<div id="header">
- <div id="requesters-filter">Filter by requesters:<br></div>
-</div>
<div id="content">
"""
)
fcntl.flock(self.fd, fcntl.LOCK_UN)
def write_signed(self, name):
- sio = StringIO.StringIO()
+ sio = StringIO()
self._write_to(sio)
sio.seek(0)
- sio.write(gpg.sign(sio.read()))
+ sio.write(util.to_str(gpg.sign(sio.read())))
sio.seek(0)
(fdno, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name))
f = os.fdopen(fdno, "w")
- if re.search(r"\.gz$", name):
- fgz = gzip.GzipFile(filename=name, mode="w", compresslevel=6, fileobj=f)
- util.sendfile(sio, fgz)
- fgz.close()
- else:
- util.sendfile(sio, f)
+ shutil.copyfileobj(sio, f)
f.flush()
os.fsync(f.fileno())
f.close()
- os.chmod(tmpname, 0o0644)
- os.rename(tmpname, name)
+ if re.search(r"\.gz$", name):
+ f_in = open(tmpname, 'rb')
+ f_out = gzip.open(name, 'wb')
+ shutil.copyfileobj(f_in, f_out)
+ f_in.close();
+ f_out.flush();
+ os.fsync(f_out.fileno())
+ f_out.close();
+ os.remove(tmpname)
+ else:
+ os.rename(tmpname, name)
+ os.chmod(name, 0o0644)
def add(self, req):
self.requests.append(req)