[Buildbot-commits] buildbot/buildbot/process step_twisted2.py,1.2,1.3 step.py,1.81,1.82 step_twisted.py,1.72,1.73

[Brian Warner]

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

Modified Files:
	step_twisted2.py step.py step_twisted.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: step.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- step.py	11 Apr 2006 06:12:59 -0000	1.81
+++ step.py	16 Apr 2006 23:05:40 -0000	1.82
@@ -917,7 +917,7 @@
         return SUCCESS
 
     def getText(self, cmd, results):
-        if kb is not None:
+        if self.kb is not None:
             return ["treesize", "%d kb" % self.kb]
         return ["treesize", "unknown"]
 
@@ -1572,7 +1572,7 @@
                      "buildbot-0.7.0 or newer." % (self.build.slavename,
                                                    self.args['mode']))
                 log.msg(m)
-                raise BuildslaveError(m)
+                raise BuildSlaveTooOldError(m)
 
         return warnings
 

Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- step_twisted.py	26 Oct 2005 20:38:07 -0000	1.72
+++ step_twisted.py	16 Apr 2006 23:05:40 -0000	1.73
@@ -483,7 +483,7 @@
                          counts['expectedFailures'] == 1 and "todo"
                          or "todos"))
             if 0: # TODO
-                results = WARNING
+                results = WARNINGS
                 if not text2:
                     text2 = "todo"
 
@@ -492,7 +492,7 @@
             # the build WARNING
             if counts['unexpectedSuccesses']:
                 text.append("%d surprises" % counts['unexpectedSuccesses'])
-                results = WARNING
+                results = WARNINGS
                 if not text2:
                     text2 = "tests"
 

Index: step_twisted2.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted2.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- step_twisted2.py	17 May 2005 10:14:10 -0000	1.2
+++ step_twisted2.py	16 Apr 2006 23:05:40 -0000	1.3
@@ -8,8 +8,10 @@
 from zope.interface import implements
 from twisted.python import log, failure
 from twisted.spread import jelly
+from twisted.pb.tokens import BananaError
 from twisted.web.util import formatFailure
 from twisted.web.html import PRE
+from twisted.web.error import NoResource
 
 class Null: pass
 ResultTypes = Null()