Merge branch 'master' into buildbot-0.8.0

* master:
  remove assertions
  remove 'will this work?' comments - refs buildbot#829
  add an 'else' to a template inline conditional

buildbot/db/connector.py

@@ -362,10 +362,6 @@ def changeEventGenerator(self, branches=[], categories=[], committers=[], minTim
             q += " AND ".join(pieces)
         q += " ORDER BY changeid DESC"
         rows = self.runQueryNow(q, tuple(args))
-        # will this work? do I need to finish fetching everything by using
-        # list(rows)? or can I use it as an iterator and fetch things as
-        # needed? will the queries in getChangeNumberedNow() interfere with
-        # that iterator?
         for (changeid,) in rows:
             yield self.getChangeNumberedNow(changeid)
 

buildbot/slave/commands/base.py

@@ -495,8 +495,6 @@ def _startCommand(self):
         self.process = None
         self.startTime = util.now(self._reactor)
 
-        for arg in argv: assert isinstance(arg, str), (type(arg), arg)
-
         p = reactor.spawnProcess(self.pp, argv[0], argv,
                                  self.environ,
                                  self.workdir,

buildbot/sourcestamp.py

@@ -41,20 +41,15 @@ class SourceStamp(util.ComparableMixin, styles.Versioned):
 
     def __init__(self, branch=None, revision=None, patch=None,
                  changes=None, project='', repository=''):
-        if branch is not None:
-            assert isinstance(branch, str), type(branch)
         if revision is not None:
             if isinstance(revision, int):
                 revision = str(revision)
-            assert isinstance(revision, str), type(revision)
         if patch is not None:
             patch_level = patch[0]
             patch_level = int(patch_level)
             patch_diff = patch[1]
-            assert isinstance(patch_diff, str), type(patch_diff)
             if len(patch) > 2:
                 patch_subdir = patch[2]
-                assert isinstance(patch_subdir, str)
         self.branch = branch
         self.revision = revision
         self.patch = patch
@@ -64,11 +59,7 @@ def __init__(self, branch=None, revision=None, patch=None,
             self.changes = tuple(changes)
             # set branch and revision to most recent change
             self.branch = changes[-1].branch
-            if self.branch is not None:
-                assert isinstance(self.branch, str), type(self.branch)
             self.revision = str(changes[-1].revision)
-            if self.revision is not None:
-                assert isinstance(self.revision, str), type(self.revision)
             if not self.project:
                 self.project = changes[-1].project
             if not self.repository:

buildbot/status/web/templates/console.html

@@ -156,7 +156,7 @@ <h1>Console View</h1>
     <td width="1%">
     </td>
   {% for c in categories %}
-    <td class='DevSlave {{ alt_class.next() }} {{ "last" if loop.last }}'>
+    <td class='DevSlave {{ alt_class.next() }} {{ "last" if loop.last else '' }}'>
       <table width="100%">
         <tr>          
     {% for s in slaves[c.name] %}