Changeset 148354 in webkit

Timestamp:

Apr 13, 2013 2:47:21 AM (11 years ago)

Author:

rniwa@webkit.org

Message:

Merge watchlistloader into host since it's an unnecessary indirection
​https://bugs.webkit.org/show_bug.cgi?id=114555

Reviewed by Antti Koivisto.

We don't need a class to load a file.

• Scripts/webkitpy/common/host.py:

(Host.watch_list):

• Scripts/webkitpy/common/watchlist/watchlistloader.py: Removed.
• Scripts/webkitpy/common/watchlist/watchlistloader_unittest.py: Removed.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/host.py (modified) (2 diffs)
• Scripts/webkitpy/common/watchlist/watchlistloader.py (deleted)
• Scripts/webkitpy/common/watchlist/watchlistloader_unittest.py (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Merge watchlistloader into host since it's an unnecessary indirection
+        https://bugs.webkit.org/show_bug.cgi?id=114555
+
+        Reviewed by Antti Koivisto.
+
+        We don't need a class to load a file.
+
+        * Scripts/webkitpy/common/host.py:
+        (Host.watch_list):
+        * Scripts/webkitpy/common/watchlist/watchlistloader.py: Removed.
+        * Scripts/webkitpy/common/watchlist/watchlistloader_unittest.py: Removed.
+
 2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/host.py

@@ -37 +37 @@
 from webkitpy.common.net import bugzilla, buildbot, web
 from webkitpy.common.system.systemhost import SystemHost
-from webkitpy.common.watchlist.watchlistloader import WatchListLoader
+from webkitpy.common.watchlist.watchlistparser import WatchListParser
 from webkitpy.layout_tests.port.factory import PortFactory
 
@@ -92 +92 @@
     @memoized
     def watch_list(self):
-        return WatchListLoader(self.filesystem).load()
+        config_path = self.filesystem.dirname(self.filesystem.path_to_module('webkitpy.common.config'))
+        watch_list_full_path = self.filesystem.join(config_path, 'watchlist')
+        if not self.filesystem.exists(watch_list_full_path):
+            raise Exception('Watch list file (%s) not found.' % watch_list_full_path)
+
+        watch_list_contents = self.filesystem.read_text_file(watch_list_full_path)
+        return WatchListParser().parse(watch_list_contents)