Merge remote-tracking branch 'lorentz/removals'

* lorentz/removals:
  remove buildbot.util.loop
  remove DirectoryLister compatibility

master/buildbot/status/web/base.py

@@ -358,52 +358,42 @@ def content(self, request, cxt):
         template = request.site.buildbot_service.templates.get_template("empty.html")
         return template.render(**cxt)
 
-# DirectoryLister isn't available in Twisted-2.5.0, and isn't compatible with what
-# we need until 9.0.0, so we just skip this particular feature.
-have_DirectoryLister = False
-if hasattr(static, 'DirectoryLister'):
-    have_DirectoryLister = True
-    class DirectoryLister(static.DirectoryLister, ContextMixin):
-        """This variant of the static.DirectoryLister uses a template
-        for rendering."""
-
-        pageTitle = 'BuildBot'
-
-        def render(self, request):
-            cxt = self.getContext(request)
-
-            if self.dirs is None:
-                directory = os.listdir(self.path)
-                directory.sort()
-            else:
-                directory = self.dirs
+class DirectoryLister(static.DirectoryLister, ContextMixin):
+    """This variant of the static.DirectoryLister uses a template
+    for rendering."""
 
-            dirs, files = self._getFilesAndDirectories(directory)
+    pageTitle = 'BuildBot'
 
-            cxt['path'] = cgi.escape(urllib.unquote(request.uri))
-            cxt['directories'] = dirs
-            cxt['files'] = files
-            template = request.site.buildbot_service.templates.get_template("directory.html")
-            data = template.render(**cxt)
-            if isinstance(data, unicode):
-                data = data.encode("utf-8")
-            return data
+    def render(self, request):
+        cxt = self.getContext(request)
+
+        if self.dirs is None:
+            directory = os.listdir(self.path)
+            directory.sort()
+        else:
+            directory = self.dirs
+
+        dirs, files = self._getFilesAndDirectories(directory)
+
+        cxt['path'] = cgi.escape(urllib.unquote(request.uri))
+        cxt['directories'] = dirs
+        cxt['files'] = files
+        template = request.site.buildbot_service.templates.get_template("directory.html")
+        data = template.render(**cxt)
+        if isinstance(data, unicode):
+            data = data.encode("utf-8")
+        return data
 
 class StaticFile(static.File):
     """This class adds support for templated directory
     views."""
 
     def directoryListing(self):
-        if have_DirectoryLister:
-            return DirectoryLister(self.path,
-                                   self.listNames(),
-                                   self.contentTypes,
-                                   self.contentEncodings,
-                                   self.defaultType)
-        else:
-            return static.Data("""
-   Directory Listings require Twisted-9.0.0 or later
-                """, "text/plain")
+        return DirectoryLister(self.path,
+                                self.listNames(),
+                                self.contentTypes,
+                                self.contentEncodings,
+                                self.defaultType)
 
 
 MINUTE = 60

master/buildbot/test/test_extra_coverage.py

@@ -45,8 +45,8 @@
 modules.extend([trigger, vstudio])
 from buildbot.steps.package.rpm import rpmbuild, rpmlint, rpmspec
 modules.extend([rpmbuild, rpmlint, rpmspec])
-from buildbot.util import eventual, loop
-modules.extend([eventual, loop])
+from buildbot.util import eventual
+modules.extend([eventual])
 
 # require gobject
 #import buildbot.clients.gtkPanes