[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
abarth at webkit.org
abarth at webkit.org
Thu Feb 4 21:25:32 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 6e09924905103ec3ae0be24f6702cfe2ca3beb2f
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 23 00:21:53 2010 +0000
2010-01-22 Adam Barth <abarth at webkit.org>
Rubber stamped by Eric Seidel.
Make __init__.py and buildbot.py pass pep8 style checker.
* Scripts/webkitpy/__init__.py:
* Scripts/webkitpy/buildbot.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53734 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 762b208..37c6c03 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-22 Adam Barth <abarth at webkit.org>
+
+ Rubber stamped by Eric Seidel.
+
+ Make __init__.py and buildbot.py pass pep8 style checker.
+
+ * Scripts/webkitpy/__init__.py:
+ * Scripts/webkitpy/buildbot.py:
+
2010-01-21 Joe Mason <jmason at rim.com>
Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/__init__.py b/WebKitTools/Scripts/webkitpy/__init__.py
index 4bb5bb4..94ecc70 100644
--- a/WebKitTools/Scripts/webkitpy/__init__.py
+++ b/WebKitTools/Scripts/webkitpy/__init__.py
@@ -2,6 +2,7 @@
import autoinstall
-# List our third-party library dependencies here and where they can be downloaded.
+# List our third-party library dependencies here and where they can be
+# downloaded.
autoinstall.bind("ClientForm", "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.zip", "ClientForm-0.2.10")
autoinstall.bind("mechanize", "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.1.11.zip", "mechanize-0.1.11")
diff --git a/WebKitTools/Scripts/webkitpy/buildbot.py b/WebKitTools/Scripts/webkitpy/buildbot.py
index e505fc8..38828fd 100644
--- a/WebKitTools/Scripts/webkitpy/buildbot.py
+++ b/WebKitTools/Scripts/webkitpy/buildbot.py
@@ -1,9 +1,9 @@
# Copyright (c) 2009, Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -38,46 +38,65 @@ from webkitpy.webkit_logging import log
# so this import should always succeed.
from .BeautifulSoup import BeautifulSoup
+
class BuildBot:
+
default_host = "build.webkit.org"
+
def __init__(self, host=default_host):
self.buildbot_host = host
self.buildbot_server_url = "http://%s/" % self.buildbot_host
-
- # If any Leopard builder/tester, Windows builder or Chromium builder is red we should not be landing patches.
- # Other builders should be added to this list once they are known to be reliable.
+
+ # If any Leopard builder/tester, Windows builder or Chromium builder is
+ # red we should not be landing patches. Other builders should be added
+ # to this list once they are known to be reliable.
# See https://bugs.webkit.org/show_bug.cgi?id=33296 and related bugs.
- self.core_builder_names_regexps = [ "Leopard", "Windows.*Build", "Chromium" ]
+ self.core_builder_names_regexps = [
+ "Leopard",
+ "Windows.*Build",
+ "Chromium",
+ ]
- # If WebKit's buildbot has an XMLRPC interface we could use, we could do something more sophisticated here.
- # For now we just parse out the basics, enough to support basic questions like "is the tree green?"
def _parse_builder_status_from_row(self, status_row):
+ # If WebKit's buildbot has an XMLRPC interface we could use, we could
+ # do something more sophisticated here. For now we just parse out the
+ # basics, enough to support basic questions like "is the tree green?"
status_cells = status_row.findAll('td')
builder = {}
name_link = status_cells[0].find('a')
builder['name'] = name_link.string
- # We could generate the builder_url from the name in a future version of this code.
+ # We could generate the builder_url from the name in a future version
+ # of this code.
builder['builder_url'] = self.buildbot_server_url + name_link['href']
status_link = status_cells[1].find('a')
if not status_link:
- # We failed to find a link in the first cell, just give up.
- # This can happen if a builder is just-added, the first cell will just be "no build"
- builder['is_green'] = False # Other parts of the code depend on is_green being present.
+ # We failed to find a link in the first cell, just give up. This
+ # can happen if a builder is just-added, the first cell will just
+ # be "no build"
+ # Other parts of the code depend on is_green being present.
+ builder['is_green'] = False
return builder
- revision_string = status_link.string # Will be either a revision number or a build number
+ # Will be either a revision number or a build number
+ revision_string = status_link.string
# If revision_string has non-digits assume it's not a revision number.
- builder['built_revision'] = int(revision_string) if not re.match('\D', revision_string) else None
- builder['is_green'] = not re.search('fail', status_cells[1].renderContents())
- # We could parse out the build number instead, but for now just store the URL.
+ builder['built_revision'] = int(revision_string) \
+ if not re.match('\D', revision_string) \
+ else None
+ builder['is_green'] = not re.search('fail',
+ status_cells[1].renderContents())
+ # We could parse out the build number instead, but for now just store
+ # the URL.
builder['build_url'] = self.buildbot_server_url + status_link['href']
# We could parse out the current activity too.
return builder
- def _builder_statuses_with_names_matching_regexps(self, builder_statuses, name_regexps):
+ def _builder_statuses_with_names_matching_regexps(self,
+ builder_statuses,
+ name_regexps):
builders = []
for builder in builder_statuses:
for name_regexp in name_regexps:
@@ -87,7 +106,9 @@ class BuildBot:
def red_core_builders(self):
red_builders = []
- for builder in self._builder_statuses_with_names_matching_regexps(self.builder_statuses(), self.core_builder_names_regexps):
+ for builder in self._builder_statuses_with_names_matching_regexps(
+ self.builder_statuses(),
+ self.core_builder_names_regexps):
if not builder['is_green']:
red_builders.append(builder)
return red_builders
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list