From d1e5eeef7384c93b38950e89c5fcaf129d320f7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 13 Nov 2010 22:45:56 +0000 Subject: [PATCH] mkstemp returns file descriptor, convert to file object Changed files: PLD_Builder/bqueue.py -> 1.21 PLD_Builder/srpm_builder.py -> 1.75 --- PLD_Builder/bqueue.py | 9 ++++++--- PLD_Builder/srpm_builder.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PLD_Builder/bqueue.py b/PLD_Builder/bqueue.py index 7ffa9d3..253b3a6 100644 --- a/PLD_Builder/bqueue.py +++ b/PLD_Builder/bqueue.py @@ -22,7 +22,8 @@ class B_Queue: self.fd = None def dump(self, fname): - (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname)) + (fdno, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname)) + f = os.fdopen(fdno) self.requests.reverse() for r in self.requests: r.dump(f) @@ -34,7 +35,8 @@ class B_Queue: os.rename(tmpfname, fname) def dump_html(self, fname): - (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname)) + (fdno, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname)) + f = os.fdopen(fdno) f.write(""" @@ -120,7 +122,8 @@ class B_Queue: sio.seek(0) sio.write(gpg.sign(sio.read())) sio.seek(0) - (f, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name)) + (fdno, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name)) + f = os.fdopen(fdno) if re.search(r"\.gz$", name): fgz = gzip.GzipFile(filename=name, mode="w", compresslevel=6, fileobj=f) util.sendfile(sio, fgz) diff --git a/PLD_Builder/srpm_builder.py b/PLD_Builder/srpm_builder.py index 5f6d59b..d1cee94 100644 --- a/PLD_Builder/srpm_builder.py +++ b/PLD_Builder/srpm_builder.py @@ -64,7 +64,8 @@ def store_binary_request(r): q.write_signed(path.req_queue_signed_file) q.unlock() - (cnt_f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(path.max_req_no_file)) + (fdno, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(path.max_req_no_file)) + cnt_f = os.fdopen(fdno) cnt_f.seek(0) cnt_f.write("%d\n" % num) cnt_f.flush() -- 2.44.0