[Buildbot-commits] buildbot/buildbot/status html.py,1.81,1.82 builder.py,1.76,1.77

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29450/buildbot/status

Modified Files:
	html.py builder.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-494
Creator:  Brian Warner <warner at lothar.com>

fix a number of incorrect names and missing imports [Anthony Baxter]

	* all: fix a number of incorrect names and missing imports, thanks
	to Anthony Baxter for the patch.
	* buildbot/status/html.py (WaterfallStatusResource.statusToHTML): 
	remove unused buggy method.
	* buildbot/status/builder.py (BuildStatus.saveYourself): rmtree
	comes from shutil, not "shutils"
	* buildbot/process/step.py (TreeSize.evaluateCommand): fix bad name
	(Arch.checkSlaveVersion): same
	* buildbot/process/step_twisted.py (Trial.commandComplete): same, in
	some disabled code
	* buildbot/process/step_twisted2.py: add some missing imports
	* buildbot/twcompat.py (_deferGenerator): fix cut-and-paste error,
	this code used to live in twisted.internet.defer


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- builder.py	13 Mar 2006 08:21:43 -0000	1.76
+++ builder.py	16 Apr 2006 23:05:41 -0000	1.77
@@ -1256,7 +1256,7 @@
         filename = os.path.join(self.builder.basedir, "%d" % self.number)
         if os.path.isdir(filename):
             # leftover from 0.5.0, which stored builds in directories
-            shutils.rmtree(filename, ignore_errors=True)
+            shutil.rmtree(filename, ignore_errors=True)
         tmpfilename = filename + ".tmp"
         try:
             pickle.dump(self, open(tmpfilename, "wb"), -1)

Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- html.py	12 Mar 2006 11:28:02 -0000	1.81
+++ html.py	16 Apr 2006 23:05:41 -0000	1.82
@@ -1530,18 +1530,7 @@
                 # Nones are left empty, rowspan should make it all fit
             data += " </tr>\n"
         return data
-        
 
-    def statusToHTML(self, color, text, files):
-        # UNUSED
-        """Create a <td> element from the status box."""
-        t = "<td>Dummy</td>\n"
-        # for files, need to create a Resource around the file and putChild
-        # it to the waterfall display.
-        # name the child:
-        name = "%s/%d/%s" % (builder.name, builder.buildNumber, step.number)
-        
-        return t
 
 class StatusResource(Resource):
     status = None