<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185859] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185859">185859</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-22 20:47:24 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of factory json files in benchmark_runner
https://bugs.webkit.org/show_bug.cgi?id=146175
Patch by Dewei Zhu <dewei_zhu@apple.com> on 2015-06-22
Reviewed by Ryosuke Niwa.
Get rid of factory json files in benchmark_runner and refactoring the code.
* Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py:
(benchmark_builder_loader):
* Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py:
(BenchmarkBuilderFactory):
* Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builders.json: Removed.
* Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py:
(GenericBenchmarkBuilder):
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.__init__):
(BenchmarkRunner.execute):
* Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py:
(browser_driver_loader):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
(BrowserDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py:
(BrowserDriverFactory):
(BrowserDriverFactory.available_platforms):
(BrowserDriverFactory.available_browsers):
(BrowserDriverFactory.add_browser_driver):
(BrowserDriverFactory.create):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json: Removed.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver):
(OSXBrowserDriver.prepareEnv):
(OSXBrowserDriver.terminateProcesses):
(OSXBrowserDriver.screenSize):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
(OSXChromeDriver):
(OSXChromeCanaryDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
(OSXFirefoxDriver):
(OSXFirefoxNightlyDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver):
* Scripts/webkitpy/benchmark_runner/generic_factory.py:
(GenericFactory.create):
(GenericFactory.add):
(GenericFactory.iterateGetItem): Deleted.
* Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py:
(http_server_driver_loader):
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py:
(HTTPServerDriver):
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver_factory.py:
(HTTPServerDriverFactory):
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_drivers.json: Removed.
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver):
* Scripts/webkitpy/benchmark_runner/utils.py:
(is_subclass):
(load_subclasses):
(ModuleNotFoundError): Deleted.
(loadModule): Deleted.
(loadJSONFromFile): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builder__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builderbenchmark_builder_factorypy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_buildergeneric_benchmark_builderpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driver__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driver_factorypy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_chrome_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnergeneric_factorypy">trunk/Tools/Scripts/webkitpy/benchmark_runner/generic_factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driver__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driver_factorypy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver_factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driversimple_http_server_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerutilspy">trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builderbenchmark_buildersjson">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builders.json</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driversjson">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driversjson">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_drivers.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/ChangeLog 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2015-06-22 Dewei Zhu <dewei_zhu@apple.com>
+
+ Get rid of factory json files in benchmark_runner
+ https://bugs.webkit.org/show_bug.cgi?id=146175
+
+ Reviewed by Ryosuke Niwa.
+
+ Get rid of factory json files in benchmark_runner and refactoring the code.
+
+ * Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py:
+ (benchmark_builder_loader):
+ * Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py:
+ (BenchmarkBuilderFactory):
+ * Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builders.json: Removed.
+ * Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py:
+ (GenericBenchmarkBuilder):
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.__init__):
+ (BenchmarkRunner.execute):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py:
+ (browser_driver_loader):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+ (BrowserDriver):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py:
+ (BrowserDriverFactory):
+ (BrowserDriverFactory.available_platforms):
+ (BrowserDriverFactory.available_browsers):
+ (BrowserDriverFactory.add_browser_driver):
+ (BrowserDriverFactory.create):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json: Removed.
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver):
+ (OSXBrowserDriver.prepareEnv):
+ (OSXBrowserDriver.terminateProcesses):
+ (OSXBrowserDriver.screenSize):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+ (OSXChromeDriver):
+ (OSXChromeCanaryDriver):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
+ (OSXFirefoxDriver):
+ (OSXFirefoxNightlyDriver):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver):
+ * Scripts/webkitpy/benchmark_runner/generic_factory.py:
+ (GenericFactory.create):
+ (GenericFactory.add):
+ (GenericFactory.iterateGetItem): Deleted.
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py:
+ (http_server_driver_loader):
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py:
+ (HTTPServerDriver):
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver_factory.py:
+ (HTTPServerDriverFactory):
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_drivers.json: Removed.
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ (SimpleHTTPServerDriver):
+ * Scripts/webkitpy/benchmark_runner/utils.py:
+ (is_subclass):
+ (load_subclasses):
+ (ModuleNotFoundError): Deleted.
+ (loadModule): Deleted.
+ (loadJSONFromFile): Deleted.
+
</ins><span class="cx"> 2015-06-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to enable incremental rendering suppression in MiniBrowser
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builder__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -11,3 +11,18 @@
</span><span class="cx"> # code in this file so that callers can opt-in as they want. This also
</span><span class="cx"> # allows different callers to choose different initialization code,
</span><span class="cx"> # as necessary.
</span><ins>+import os
+
+from webkitpy.benchmark_runner.utils import load_subclasses
+from benchmark_builder_factory import BenchmarkBuilderFactory
+
+
+def benchmark_builder_loader(benchmark_builder_class):
+ if benchmark_builder_class.builder_name:
+ BenchmarkBuilderFactory.add(benchmark_builder_class.builder_name, benchmark_builder_class)
+
+
+load_subclasses(
+ dirname=os.path.dirname(os.path.abspath(__file__)),
+ base_class_name='GenericBenchmarkBuilder',
+ loader=benchmark_builder_loader)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builderbenchmark_builder_factorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -5,12 +5,8 @@
</span><span class="cx"> import os
</span><span class="cx">
</span><span class="cx"> from webkitpy.benchmark_runner.generic_factory import GenericFactory
</span><del>-from webkitpy.benchmark_runner.utils import loadJSONFromFile
</del><span class="cx">
</span><span class="cx">
</span><del>-builderFileName = 'benchmark_builders.json'
-
-
</del><span class="cx"> class BenchmarkBuilderFactory(GenericFactory):
</span><span class="cx">
</span><del>- products = loadJSONFromFile(os.path.join(os.path.dirname(__file__), builderFileName))
</del><ins>+ products = {}
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builderbenchmark_buildersjson"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builders.json (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builders.json 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builders.json 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-{
- "GenericBenchmarkBuilder": {
- "filePath": "benchmark_builder.generic_benchmark_builder",
- "moduleName": "GenericBenchmarkBuilder"
- }
-}
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_buildergeneric_benchmark_builderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx">
</span><span class="cx"> class GenericBenchmarkBuilder(object):
</span><span class="cx">
</span><ins>+ builder_name = 'GenericBenchmarkBuilder'
+
</ins><span class="cx"> def prepare(self, name, plan):
</span><span class="cx"> self.name = name
</span><span class="cx"> self.webRoot = tempfile.mkdtemp()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> from benchmark_results import BenchmarkResults
</span><span class="cx"> from browser_driver.browser_driver_factory import BrowserDriverFactory
</span><span class="cx"> from http_server_driver.http_server_driver_factory import HTTPServerDriverFactory
</span><del>-from utils import loadModule, getPathFromProjectRoot
</del><ins>+from utils import getPathFromProjectRoot
</ins><span class="cx"> from utils import timeout
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> self.plan['count'] = countOverride
</span><span class="cx"> if httpServerDriverOverride:
</span><span class="cx"> self.plan['http_server_driver'] = httpServerDriverOverride
</span><del>- self.browserDriver = BrowserDriverFactory.create([platform, browser])
- self.httpServerDriver = HTTPServerDriverFactory.create([self.plan['http_server_driver']])
</del><ins>+ self.browserDriver = BrowserDriverFactory.create(platform, browser)
+ self.httpServerDriver = HTTPServerDriverFactory.create(self.plan['http_server_driver'])
</ins><span class="cx"> self.httpServerDriver.setDeviceID(deviceID)
</span><span class="cx"> self.buildDir = os.path.abspath(buildDir) if buildDir else None
</span><span class="cx"> self.outputFile = outputFile
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> _log.info('Start to execute the plan')
</span><span class="cx"> _log.info('Start a new benchmark')
</span><span class="cx"> results = []
</span><del>- self.benchmarkBuilder = BenchmarkBuilderFactory.create([self.plan['benchmark_builder']])
</del><ins>+ self.benchmarkBuilder = BenchmarkBuilderFactory.create(self.plan['benchmark_builder'])
</ins><span class="cx">
</span><span class="cx"> webRoot = self.benchmarkBuilder.prepare(self.planName, self.plan)
</span><span class="cx"> for x in xrange(int(self.plan['count'])):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driver__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -11,3 +11,18 @@
</span><span class="cx"> # code in this file so that callers can opt-in as they want. This also
</span><span class="cx"> # allows different callers to choose different initialization code,
</span><span class="cx"> # as necessary.
</span><ins>+import os
+
+from webkitpy.benchmark_runner.utils import load_subclasses
+from browser_driver_factory import BrowserDriverFactory
+
+
+def browser_driver_loader(browser_driver_class):
+ if browser_driver_class.platform and browser_driver_class.browser_name:
+ BrowserDriverFactory.add_browser_driver(browser_driver_class.platform, browser_driver_class.browser_name, browser_driver_class)
+
+
+load_subclasses(
+ dirname=os.path.dirname(os.path.abspath(__file__)),
+ base_class_name='BrowserDriver',
+ loader=browser_driver_loader)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class BrowserDriver(object):
</span><ins>+ platform = None
+ browser_name = None
</ins><span class="cx">
</span><span class="cx"> @abc.abstractmethod
</span><span class="cx"> def prepareEnv(self, deviceID):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driver_factorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -4,25 +4,30 @@
</span><span class="cx"> import json
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from webkitpy.benchmark_runner.generic_factory import GenericFactory
-from webkitpy.benchmark_runner.utils import loadJSONFromFile
</del><span class="cx">
</span><ins>+class BrowserDriverFactory(object):
</ins><span class="cx">
</span><del>-driverFileName = 'browser_drivers.json'
</del><ins>+ browser_drivers = {}
+ platforms = set()
+ browsers = set()
</ins><span class="cx">
</span><span class="cx">
</span><del>-class BrowserDriverFactory(GenericFactory):
</del><ins>+ @classmethod
+ def available_platforms(cls):
+ return list(cls.platforms)
</ins><span class="cx">
</span><del>- products = loadJSONFromFile(os.path.join(os.path.dirname(__file__), driverFileName))
</del><ins>+ @classmethod
+ def available_browsers(cls):
+ return list(cls.browsers)
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def available_platforms(cls):
- return cls.products.keys()
</del><ins>+ def add_browser_driver(cls, platform, browser_name, browser_driver_class):
+ cls.platforms.add(platform)
+ cls.browsers.add(browser_name)
+ if platform not in cls.browser_drivers:
+ cls.browser_drivers[platform] = {}
+ cls.browser_drivers[platform][browser_name] = browser_driver_class
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def available_browsers(cls):
- browsers = []
- for platform in cls.products.values():
- for browser in platform:
- browsers.append(browser)
- return browsers
</del><ins>+ def create(cls, platform, browser_name):
+ return cls.browser_drivers[platform][browser_name]()
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driversjson"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-{
- "osx": {
- "chrome": {
- "moduleName": "OSXChromeDriver",
- "filePath": "browser_driver.osx_chrome_driver"
- },
- "chrome-canary": {
- "moduleName": "OSXChromeCanaryDriver",
- "filePath": "browser_driver.osx_chrome_driver"
- },
- "firefox": {
- "moduleName": "OSXFirefoxDriver",
- "filePath": "browser_driver.osx_firefox_driver"
- },
- "firefox-nightly": {
- "moduleName": "OSXFirefoxNightlyDriver",
- "filePath": "browser_driver.osx_firefox_driver"
- },
- "safari": {
- "moduleName": "OSXSafariDriver",
- "filePath": "browser_driver.osx_safari_driver"
- }
- }
-}
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -3,9 +3,6 @@
</span><span class="cx"> import os
</span><span class="cx"> import subprocess
</span><span class="cx">
</span><del>-from AppKit import NSRunningApplication
-from AppKit import NSScreen
-from Quartz import CGWarpMouseCursorPosition
</del><span class="cx"> from browser_driver import BrowserDriver
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -14,9 +11,11 @@
</span><span class="cx">
</span><span class="cx"> class OSXBrowserDriver(BrowserDriver):
</span><span class="cx"> bundleIdentifier = None
</span><ins>+ platform = 'osx'
</ins><span class="cx">
</span><span class="cx"> def prepareEnv(self, deviceID):
</span><span class="cx"> self.closeBrowsers()
</span><ins>+ from Quartz import CGWarpMouseCursorPosition
</ins><span class="cx"> CGWarpMouseCursorPosition((10, 0))
</span><span class="cx">
</span><span class="cx"> def closeBrowsers(self):
</span><span class="lines">@@ -37,6 +36,7 @@
</span><span class="cx"> @classmethod
</span><span class="cx"> def terminateProcesses(cls, bundleIdentifier):
</span><span class="cx"> _log.info('Closing all terminating all processes with the bundle identifier %s' % bundleIdentifier)
</span><ins>+ from AppKit import NSRunningApplication
</ins><span class="cx"> processes = NSRunningApplication.runningApplicationsWithBundleIdentifier_(bundleIdentifier)
</span><span class="cx"> for process in processes:
</span><span class="cx"> process.terminate()
</span><span class="lines">@@ -49,4 +49,5 @@
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def screenSize(cls):
</span><ins>+ from AppKit import NSScreen
</ins><span class="cx"> return NSScreen.mainScreen().frame().size
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_chrome_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> class OSXChromeDriver(OSXBrowserDriver):
</span><span class="cx"> bundleIdentifier = 'com.google.Chrome'
</span><ins>+ browser_name = 'chrome'
</ins><span class="cx">
</span><span class="cx"> def launchUrl(self, url, browserBuildPath):
</span><span class="cx"> self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome.app', url=url, args=['--args', '--homepage', url, '--window-size={width},{height}'.format(width=int(self.screenSize().width), height=int(self.screenSize().height))])
</span><span class="lines">@@ -20,6 +21,7 @@
</span><span class="cx">
</span><span class="cx"> class OSXChromeCanaryDriver(OSXBrowserDriver):
</span><span class="cx"> bundleIdentifier = 'com.google.Chrome.canary'
</span><ins>+ browser_name = 'chrome-canary'
</ins><span class="cx">
</span><span class="cx"> def launchUrl(self, url, browserBuildPath):
</span><span class="cx"> self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome Canary.app', url=url, args=['--args', '--homepage', url, '--window-size={width},{height}'.format(width=int(self.screenSize().width), height=int(self.screenSize().height))])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> class OSXFirefoxDriver(OSXBrowserDriver):
</span><span class="cx"> bundleIdentifier = 'org.mozilla.firefox'
</span><ins>+ browser_name = 'firefox'
</ins><span class="cx">
</span><span class="cx"> def launchUrl(self, url, browserBuildPath):
</span><span class="cx"> self.launchProcess(buildDir=browserBuildPath, appName='Firefox.app', url=url, args=[url, '--args', '-width', str(int(self.screenSize().width)), '-height', str(int(self.screenSize().height))])
</span><span class="lines">@@ -20,6 +21,7 @@
</span><span class="cx">
</span><span class="cx"> class OSXFirefoxNightlyDriver(OSXBrowserDriver):
</span><span class="cx"> bundleIdentifier = 'org.mozilla.nightly'
</span><ins>+ browser_name = 'firefox-nightly'
</ins><span class="cx">
</span><span class="cx"> def launchUrl(self, url, browserBuildPath):
</span><span class="cx"> self.launchProcess(buildDir=browserBuildPath, appName='FirefoxNightly.app', url=url, args=[url, '--args', '-width', str(int(self.screenSize().width)), '-height', str(int(self.screenSize().height))])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx">
</span><span class="cx"> class OSXSafariDriver(OSXBrowserDriver):
</span><span class="cx"> bundleIdentifier = 'com.apple.Safari'
</span><ins>+ browser_name = 'safari'
</ins><span class="cx">
</span><span class="cx"> def prepareEnv(self, deviceID):
</span><span class="cx"> self.safariProcess = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnergeneric_factorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/generic_factory.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/generic_factory.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/generic_factory.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -3,9 +3,7 @@
</span><span class="cx"> import logging
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from utils import loadModule, ModuleNotFoundError
</del><span class="cx">
</span><del>-
</del><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -14,18 +12,9 @@
</span><span class="cx"> products = None
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def iterateGetItem(cls, options, keys):
- ret = options
- for key in keys:
- try:
- ret = ret.__getitem__(key)
- except KeyError:
- raise
- return ret
</del><ins>+ def create(cls, description):
+ return cls.products[description]()
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def create(cls, descriptions):
- try:
- return loadModule(cls.iterateGetItem(cls.products, descriptions))()
- except Exception:
- raise
</del><ins>+ def add(cls, description, product):
+ cls.products[description] = product
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driver__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -11,3 +11,19 @@
</span><span class="cx"> # code in this file so that callers can opt-in as they want. This also
</span><span class="cx"> # allows different callers to choose different initialization code,
</span><span class="cx"> # as necessary.
</span><ins>+import os
+import imp
+
+from webkitpy.benchmark_runner.utils import load_subclasses
+from http_server_driver_factory import HTTPServerDriverFactory
+
+
+def http_server_driver_loader(http_server_driver_class):
+ if http_server_driver_class.name:
+ HTTPServerDriverFactory.add(http_server_driver_class.name, http_server_driver_class)
+
+
+load_subclasses(
+ dirname=os.path.dirname(os.path.abspath(__file__)),
+ base_class_name='HTTPServerDriver',
+ loader=http_server_driver_loader)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class HTTPServerDriver(object):
</span><ins>+ name = None
</ins><span class="cx"> @abstractmethod
</span><span class="cx"> def serve(self, webRoot):
</span><span class="cx"> pass
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driver_factorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver_factory.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver_factory.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver_factory.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -5,12 +5,7 @@
</span><span class="cx"> import os
</span><span class="cx">
</span><span class="cx"> from webkitpy.benchmark_runner.generic_factory import GenericFactory
</span><del>-from webkitpy.benchmark_runner.utils import loadJSONFromFile
</del><span class="cx">
</span><span class="cx">
</span><del>-driverFileName = 'http_server_drivers.json'
-
-
</del><span class="cx"> class HTTPServerDriverFactory(GenericFactory):
</span><del>-
- products = loadJSONFromFile(os.path.join(os.path.dirname(__file__), driverFileName))
</del><ins>+ products = {}
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driversjson"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_drivers.json (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_drivers.json 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_drivers.json 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-{
- "SimpleHTTPServerDriver": {
- "moduleName": "SimpleHTTPServerDriver",
- "filePath": "http_server_driver.simple_http_server_driver"
- }
-}
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driversimple_http_server_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx">
</span><span class="cx"> """This class depends on unix environment, need to be modified to achieve crossplatform compability
</span><span class="cx"> """
</span><ins>+ name = 'SimpleHTTPServerDriver'
</ins><span class="cx">
</span><span class="cx"> def __init__(self):
</span><span class="cx"> self.server_process = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerutilspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py (185858 => 185859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2015-06-23 01:59:08 UTC (rev 185858)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2015-06-23 03:47:24 UTC (rev 185859)
</span><span class="lines">@@ -1,25 +1,33 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx">
</span><del>-import json
</del><ins>+import imp
+import inspect
</ins><span class="cx"> import logging
</span><span class="cx"> import os
</span><span class="cx"> import signal
</span><span class="cx"> import shutil
</span><ins>+import sys
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><span class="cx">
</span><del>-class ModuleNotFoundError(Exception):
- pass
</del><ins>+# Borrow following code from stackoverflow
+# Link: http://stackoverflow.com/questions/11461356/issubclass-returns-flase-on-the-same-class-imported-from-different-paths
+def is_subclass(child, parent_name):
+ return inspect.isclass(child) and parent_name in [cls.__name__ for cls in inspect.getmro(child)]
</ins><span class="cx">
</span><span class="cx">
</span><del>-def loadModule(moduleDesc):
- try:
- ret = getattr(__import__(moduleDesc['filePath'], globals(), locals(), moduleDesc['moduleName'], -1), moduleDesc['moduleName'])
- return ret
- except Exception as error:
- raise ModuleNotFoundError('Error loading module (%s) with path(%s): {%s}' % (moduleDesc['moduleName'], moduleDesc['filePath'], error))
</del><ins>+def load_subclasses(dirname, base_class_name, loader):
+ for filename in os.listdir(dirname):
+ if not filename.endswith('.py') or filename in ['__init__.py']:
+ continue
+ module_name = filename[:-3]
+ module = imp.load_source(module_name, os.path.join(dirname, filename))
+ for item_name in dir(module):
+ item = getattr(module, item_name)
+ if is_subclass(item, base_class_name):
+ loader(item)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def getPathFromProjectRoot(relativePathToProjectRoot):
</span><span class="lines">@@ -29,15 +37,6 @@
</span><span class="cx"> return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), relativePathToProjectRoot))
</span><span class="cx">
</span><span class="cx">
</span><del>-def loadJSONFromFile(filePath):
- try:
- jsonObject = json.load(open(filePath, 'r'))
- assert(jsonObject)
- return jsonObject
- except Exception as error:
- raise Exception("Invalid json format or empty json was found in %s - Error: %s" % (filePath, error))
-
-
</del><span class="cx"> def forceRemove(path):
</span><span class="cx"> try:
</span><span class="cx"> shutil.rmtree(path)
</span></span></pre>
</div>
</div>
</body>
</html>