pld-builder.new: PLD_Builder/bqueue.py - dump_xyz_fobj() not needed, merge ...

Sat Nov 13 23:28:19 CET 2010

Author: arekm                        Date: Sat Nov 13 22:28:19 2010 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- dump_xyz_fobj() not needed, merge into dump_xyz

---- Files affected:
pld-builder.new/PLD_Builder:
   bqueue.py (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/bqueue.py
diff -u pld-builder.new/PLD_Builder/bqueue.py:1.18 pld-builder.new/PLD_Builder/bqueue.py:1.19

--- pld-builder.new/PLD_Builder/bqueue.py:1.18	Sat Nov 13 22:38:07 2010
+++ pld-builder.new/PLD_Builder/bqueue.py	Sat Nov 13 23:28:14 2010
@@ -23,29 +23,18 @@
 
     def dump(self, fname):
         (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
-        self.dump_fobj(f)
-        f.flush()
-        os.fsync(f.fileno())
-        f.close()
-        os.chmod(tmpfname, 0644)
-        os.rename(tmpfname, fname)
-
-    def dump_fobj(self, f):
         self.requests.reverse()
-        for r in self.requests:
-            r.dump_fobj(f)
+            for r in self.requests:
+                r.dump(f)
         self.requests.reverse()
-
-    def dump_html(self, fname):
-        (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
-        self.dump_html_fobj(f)
         f.flush()
         os.fsync(f.fileno())
         f.close()
         os.chmod(tmpfname, 0644)
         os.rename(tmpfname, fname)
 
-    def dump_html_fobj(self, f):
+    def dump_html(self, fname):
+        (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
         f.write("""
 <html>
     <head>
@@ -58,9 +47,14 @@
         )
         self.requests.reverse()
         for r in self.requests:
-            r.dump_html_fobj(f)
+            r.dump_html(f)
         self.requests.reverse()
         f.write("</body></html>\n")
+        f.flush()
+        os.fsync(f.fileno())
+        f.close()
+        os.chmod(tmpfname, 0644)
+        os.rename(tmpfname, fname)
 
     # read possibly compressed, signed queue
     def read_signed(self):
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/bqueue.py?r1=1.18&r2=1.19&f=u

