Cleanup all unused imports and tag the rest as ok (for Eclipse/PyDev)

buildbot/ec2buildslave.py

@@ -5,11 +5,9 @@
 
 # Portions copyright Canonical Ltd. 2009
 
-import cStringIO
 import os
 import re
 import time
-import urllib
 
 import boto
 import boto.exception

buildbot/process/builder.py

@@ -789,7 +789,7 @@ def _startBuild_2(self, res, build, sb):
         d = build.startBuild(bs, self.expectations, sb)
         d.addCallback(self.buildFinished, sb)
         d.addErrback(log.err) # this shouldn't happen. if it does, the slave
-                              # will be wedged
+                                # will be wedged
         for req in build.requests:
             req.buildStarted(build, bs)
         return build # this is the IBuildControl
@@ -807,7 +807,7 @@ def _startBuildFailed(self, why, build, sb):
         self.building.remove(build)
         for req in build.requests:
             self.buildable.insert(0, req) # the interrupted build gets first
-                                          # priority
+                                            # priority
             self.builder_status.addBuildRequest(req.status)
 
 

buildbot/scripts/checkconfig.py

@@ -3,7 +3,6 @@
 from shutil import copy, rmtree
 from tempfile import mkdtemp
 from os.path import isfile
-import traceback
 
 from buildbot import master
 

buildbot/slave/commands.py

@@ -564,7 +564,7 @@ def finished(self, sig, rc):
         self.elapsedTime = time.time() - self.startTime
         log.msg("command finished with signal %s, exit code %s, elapsedTime: %0.6f" % (sig,rc,self.elapsedTime))
         for w in self.logFileWatchers:
-             # this will send the final updates
+            # this will send the final updates
             w.stop()
         if sig is not None:
             rc = -1
@@ -1831,8 +1831,8 @@ def setup(self, args):
         if args.get('extra_args', None) is not None:
             self.svn_args.extend(args['extra_args'])
 
-	if args.has_key('depth'):
-	    self.svn_args.extend(["--depth",args['depth']])
+        if args.has_key('depth'):
+            self.svn_args.extend(["--depth",args['depth']])
 
     def _dovccmd(self, command, args, rootdir=None, cb=None, **kwargs):
         if rootdir is None:
@@ -1879,7 +1879,7 @@ def _purgeAndUpdate(self):
         Use the Force instead and delete everything that shows up in status."""
         args = ['--xml']
         if self.ignore_ignores:
-          args.append('--no-ignore')
+            args.append('--no-ignore')
         return self._dovccmd('status', args, keepStdout=True, sendStdout=False,
                              cb=self._purgeAndUpdate2)
 

buildbot/status/mail.py

@@ -20,7 +20,7 @@
 
 from buildbot import interfaces, util
 from buildbot.status import base
-from buildbot.status.builder import FAILURE, SUCCESS, WARNINGS, Results
+from buildbot.status.builder import FAILURE, SUCCESS, Results
 
 import sys
 if sys.version_info[:3] < (2,4,0):

buildbot/status/web/base.py

@@ -1,12 +1,12 @@
 
 import urlparse, urllib, time, re
 from zope.interface import Interface
-from twisted.web import html, resource, static
+from twisted.web import resource, static
 from twisted.python import log
 from buildbot.status import builder
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, SKIPPED, EXCEPTION
 from buildbot import version, util
-import sys, os, cgi
+import os, cgi
 from buildbot.process.properties import Properties
 
 class ITopBox(Interface):

buildbot/status/web/baseweb.py

@@ -5,12 +5,12 @@
 from zope.interface import implements
 from twisted.python import log
 from twisted.application import strports, service
-from twisted.web import server, distrib, static, html
+from twisted.web import server, distrib, static
 from twisted.spread import pb
 
 from buildbot.interfaces import IControl, IStatusReceiver
 
-from buildbot.status.web.base import HtmlResource, Box, \
+from buildbot.status.web.base import HtmlResource,  \
      build_get_class, ICurrentBox, BuildLineMixin, map_branches, StaticFile
 from buildbot.status.web.feeds import Rss20StatusResource, \
      Atom10StatusResource
@@ -37,7 +37,7 @@ class LastBuild(HtmlResource):
     def context(self, request, context):
         context['content'] = "missing"
         template = request.site.buildbot_service.templates.get_template("empty.html")
-        return template.render(**cxt)
+        return template.render(**context)
 
 def getLastNBuilds(status, numbuilds, builders=[], branches=[]):
     """Return a list with the last few Builds, sorted by start time.

buildbot/status/web/build.py

@@ -10,7 +10,7 @@
      getAndCheckProperties
 
 from buildbot.status.web.step import StepsResource
-from buildbot import version, util
+from buildbot import util
 
 # /builders/$builder/builds/$buildnum
 class StatusResourceBuild(HtmlResource):

buildbot/status/web/builder.py

@@ -10,7 +10,6 @@
     path_to_build, path_to_slave, path_to_builder, path_to_change, \
     getAndCheckProperties
 from buildbot.process.base import BuildRequest
-from buildbot.process.properties import Properties
 from buildbot.sourcestamp import SourceStamp
 
 from buildbot.status.web.build import BuildsResource, StatusResourceBuild

buildbot/status/web/buildstatus.py

@@ -1,7 +1,4 @@
-from twisted.web import html, resource
-from buildbot.status.web.base import Box
-from buildbot.status.web.base import HtmlResource
-from buildbot.status.web.base import IBox
+from buildbot.status.web.base import HtmlResource, IBox
 
 class BuildStatusStatusResource(HtmlResource):
     def __init__(self, categories=None):

buildbot/status/web/feeds.py

@@ -25,7 +25,6 @@
 
 import os
 import re
-import sys
 import time
 from twisted.web import resource
 from buildbot.status.builder import FAILURE

buildbot/status/web/grid.py

@@ -1,12 +1,7 @@
 from __future__ import generators
 
-import sys, time, os.path
-import urllib
+import sys, os.path
 
-from twisted.web import html, resource
-
-from buildbot import util
-from buildbot import version
 from buildbot.status.web.base import HtmlResource
 from buildbot.status.web.base import build_get_class, path_to_builder, path_to_build
 

buildbot/status/web/logs.py

@@ -2,7 +2,7 @@
 from zope.interface import implements
 from twisted.python import components
 from twisted.spread import pb
-from twisted.web import html, server
+from twisted.web import server
 from twisted.web.resource import Resource
 from twisted.web.error import NoResource
 

buildbot/status/web/root.py

@@ -1,9 +1,4 @@
-
 from buildbot.status.web.base import HtmlResource
-import buildbot
-import twisted
-import jinja2
-import time, sys
 
 class RootPage(HtmlResource):
     title = "Buildbot"

buildbot/status/web/slaves.py

@@ -1,13 +1,12 @@
 
 import time, urllib
-from twisted.python import log
 from twisted.web import html
 from twisted.web.util import Redirect
 from twisted.web.error import NoResource
 
 from buildbot.status.web.base import HtmlResource, abbreviate_age, \
-    BuildLineMixin, path_to_slave, path_to_build
-from buildbot import version, util
+    BuildLineMixin, path_to_slave
+from buildbot import util
 
 # /buildslaves/$slavename
 class OneBuildSlaveResource(HtmlResource, BuildLineMixin):

buildbot/status/web/waterfall.py

@@ -9,7 +9,6 @@
 import operator
 
 from buildbot import interfaces, util
-from buildbot import version
 from buildbot.status import builder
 
 from buildbot.status.web.base import Box, HtmlResource, IBox, ICurrentBox, \

buildbot/steps/master.py

@@ -1,7 +1,7 @@
 import os, types
-from twisted.python import log, failure, runtime
-from twisted.internet import reactor, defer, task
-from buildbot.process.buildstep import RemoteCommand, BuildStep
+from twisted.python import runtime
+from twisted.internet import reactor 
+from buildbot.process.buildstep import BuildStep
 from buildbot.process.buildstep import SUCCESS, FAILURE
 from twisted.internet.protocol import ProcessProtocol
 

buildbot/steps/package/rpm/rpmbuild.py

@@ -20,8 +20,6 @@ class RpmBuild(ShellCommand):
     Build and RPM based on pased spec filename
     """
 
-    import os.path
-
     name = "rpmbuilder"
     haltOnFailure = 1
     flunkOnFailure = 1

buildbot/steps/package/rpm/rpmspec.py

@@ -21,7 +21,6 @@ class RpmSpec(ShellCommand):
     """
 
     import re
-    import types
 
     #initialize spec info vars and get them from the spec file
     n_regex = re.compile('^Name:[ ]*([^\s]*)')

buildbot/steps/source.py

@@ -408,7 +408,7 @@ def __init__(self, svnurl=None, baseURL=None, defaultBranch=None,
         self.keep_on_purge = keep_on_purge
         self.ignore_ignores = ignore_ignores
         self.always_purge = always_purge
-	self.depth = depth
+        self.depth = depth
 
         Source.__init__(self, **kwargs)
         self.addFactoryArguments(svnurl=svnurl,
@@ -493,16 +493,16 @@ def startVC(self, branch, revision, patch):
         self.args['revision'] = revision
         self.args['patch'] = patch
 
-	#Set up depth if specified
-	if self.depth is not None:
-		if self.slaveVersionIsOlderThan("svn","2.9"):
-			m = ("This buildslave (%s) does not support svn depth "
+        #Set up depth if specified
+        if self.depth is not None:
+            if self.slaveVersionIsOlderThan("svn","2.9"):
+                m = ("This buildslave (%s) does not support svn depth "
 			     "arguments.  "
 			     "Refusing to build. "
 			     "Please upgrade the buildslave." % (self.build.slavename))
-                	raise BuildSlaveTooOldError(m)
-		else: 
-			self.args['depth'] = self.depth
+                raise BuildSlaveTooOldError(m)
+            else: 
+                self.args['depth'] = self.depth
 
         if self.username is not None or self.password is not None:
             if self.slaveVersionIsOlderThan("svn", "2.8"):

buildbot/steps/transfer.py

@@ -63,7 +63,7 @@ def _extractall(self, path=".", members=None):
     """Fallback extractall method for TarFile, in case it doesn't have its own."""
 
     import copy
-    import operator
+    import operator #@UnusedImport
 
     directories = []
 

buildbot/test/test_buildstep.py

@@ -279,7 +279,7 @@ class SubunitLogObserver(subunitlogobserver.SubunitLogObserver):
     def __init__(self):
         # Skip this test if subunit is not installed.
         try:
-            from subunit import TestProtocolServer
+            from subunit import TestProtocolServer #@UnusedImport
         except ImportError:
             raise unittest.SkipTest("subunit.TestProtocolServer not available")
         subunitlogobserver.SubunitLogObserver.__init__(self)

buildbot/test/test_changemaster.py

@@ -2,7 +2,7 @@
 
 from twisted.trial import unittest
 
-from buildbot.changes.changes import *
+from buildbot.changes.changes import Change, TestChangeMaster
 
 class _DummyParent:
     def __init__(self):

buildbot/test/test_ec2buildslave.py

@@ -2,7 +2,6 @@
 
 import os
 import sys
-import StringIO
 import textwrap
 
 from twisted.trial import unittest
@@ -92,9 +91,9 @@ def run(self, **kwargs):
         return Stub(name='reservation',
                     instances=[Instance(self.data, self.id, **kwargs)])
 
-    def create(klass, data, ami, owner, location):
+    def create(cls, self, data, ami, owner, location):
         assert ami not in data.images
-        self = klass(data, ami, owner, location)
+        self = cls(data, ami, owner, location)
         data.images[ami] = self
         return self
     create = classmethod(create)
@@ -258,7 +257,7 @@ def boto_setUp3(self):
     def tearDown(self):
         try:
             import boto
-            import boto.exception
+            import boto.exception #@UnusedImport
         except ImportError:
             pass
         else:

buildbot/test/test_limitlogs.py

@@ -10,9 +10,6 @@
 from buildbot.test.runutils import SignalMixin
 import os
 
-from buildbot.test.runutils import RunMixin, rmtree
-from buildbot.changes import changes
-
 '''Testcases to verify that the --log-size and --log-count options to
 create-master and create-slave actually work.
 

buildbot/test/test_mergerequests.py

@@ -1,10 +1,8 @@
-from twisted.internet import defer, reactor
 from twisted.trial import unittest
 
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process.base import BuildRequest
 from buildbot.process.properties import Properties
-from buildbot.status import builder, base, words
 from buildbot.changes.changes import Change
 
 from buildbot.test.runutils import RunMixin

buildbot/test/test_ordering.py

@@ -1,8 +1,7 @@
 from twisted.trial import unittest
-from twisted.internet import reactor, defer
+from twisted.internet import  defer
 
-from buildbot.test.runutils import RunMixin, TestFlagMixin, rmtree
-from buildbot.changes import changes
+from buildbot.test.runutils import RunMixin, rmtree
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process.base import BuildRequest
 

buildbot/test/test_status.py

@@ -10,7 +10,7 @@
 from buildbot import interfaces
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process.base import BuildRequest, Build
-from buildbot.status import builder, base, words, progress
+from buildbot.status import builder, base, words
 from buildbot.changes.changes import Change
 from buildbot.process.builder import Builder
 from time import sleep
@@ -26,6 +26,7 @@
     from buildbot.status import mail
 except ImportError:
     pass
+
 from buildbot.status import progress, client # NEEDS COVERAGE
 from buildbot.test.runutils import RunMixin, setupBuildStepStatus, rmtree
 
@@ -885,8 +886,7 @@ def _testConsumer_2(self, res, s):
         l2.addStdout(800*"a") # should now have two chunks on disk, 1000+600
         l2.addStdout(800*"b") # HEADER,1000+600*a on disk, 800*a in memory
         l2.addStdout(800*"b") # HEADER,1000+600*a,1000+600*b on disk
-        l2.addStdout(200*"c") # HEADER,1000+600*a,1000+600*b on disk,
-                              # 200*c in memory
+        l2.addStdout(200*"c") # HEADER,1000+600*a,1000+600*b on disk, 200*c in memory
 
         s = MyLogConsumer(limit=1)
         d = l2.subscribeConsumer(s)
@@ -968,7 +968,7 @@ def testLimit(self):
 class CompressLog(unittest.TestCase):
     # compression is not supported unless bz2 is installed
     try:
-        import bz2
+        import bz2 #@UnusedImport
     except:
         skip = "compression not supported (no bz2 module available)"
 

buildbot/test/test_steps.py

@@ -22,7 +22,7 @@
 
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process import buildstep, base, factory
-from buildbot.process.properties import Properties, WithProperties
+from buildbot.process.properties import WithProperties
 from buildbot.buildslave import BuildSlave
 from buildbot.steps import shell, source, python, master
 from buildbot.status import builder