From 069eaacd009d63e7268afc993288f44ae223ac90 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Sat, 1 Sep 2012 10:50:14 -0600 Subject: [PATCH] Remove use of deprecated twisted.web.error.NoResource This is has been moved to twisted.web.resource since at least twisted-0.9.0. --- master/buildbot/status/web/changes.py | 2 +- master/buildbot/status/web/logs.py | 3 +-- master/buildbot/status/web/slaves.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/master/buildbot/status/web/changes.py b/master/buildbot/status/web/changes.py index 415e781bfe5..6be37b549e8 100644 --- a/master/buildbot/status/web/changes.py +++ b/master/buildbot/status/web/changes.py @@ -16,7 +16,7 @@ from zope.interface import implements from twisted.python import components -from twisted.web.error import NoResource +from twisted.web.resource import NoResource from buildbot.changes.changes import Change from buildbot.status.web.base import HtmlResource, IBox, Box diff --git a/master/buildbot/status/web/logs.py b/master/buildbot/status/web/logs.py index bc47d49f17b..22e499bfa43 100644 --- a/master/buildbot/status/web/logs.py +++ b/master/buildbot/status/web/logs.py @@ -18,8 +18,7 @@ from twisted.python import components from twisted.spread import pb from twisted.web import server -from twisted.web.resource import Resource -from twisted.web.error import NoResource +from twisted.web.resource import Resource, NoResource from buildbot import interfaces from buildbot.status import logfile diff --git a/master/buildbot/status/web/slaves.py b/master/buildbot/status/web/slaves.py index dc1545a6870..0047241cfb2 100644 --- a/master/buildbot/status/web/slaves.py +++ b/master/buildbot/status/web/slaves.py @@ -17,7 +17,7 @@ import time, urllib from twisted.web import html from twisted.web.util import Redirect -from twisted.web.error import NoResource +from twisted.web.resource import NoResource from twisted.internet import defer from buildbot.status.web.base import HtmlResource, abbreviate_age, \