[Buildbot-commits] buildbot/buildbot twcompat.py,1.2,1.3

[Brian Warner]

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

Modified Files:
	twcompat.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: twcompat.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/twcompat.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- twcompat.py	19 Jul 2005 01:55:21 -0000	1.2
+++ twcompat.py	16 Apr 2006 23:05:41 -0000	1.3
@@ -152,7 +152,7 @@
             # they yield a Deferred. Perhaps eventually these semantics may
             # change.
             if isinstance(result, defer.Deferred):
-                return fail(TypeError("Yield waitForDeferred(d), not d!"))
+                return defer.fail(TypeError("Yield waitForDeferred(d), not d!"))
 
             if isinstance(result, waitForDeferred):
                 waiting=[True, None]