<!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>[276935] 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/276935">276935</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-05-03 16:41:50 -0700 (Mon, 03 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[webkitpy] Support pickling platforminfo
https://bugs.webkit.org/show_bug.cgi?id=225230
<rdar://problem/77384913>

Rubber-stamped by Aakash Jain.

* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.__init__): Define default arguments.
(PlatformInfo.display_name): Use default platform module if platform_module undefined.
(PlatformInfo._win_version_str): Ditto.
* Scripts/webkitpy/common/system/platforminfo_unittest.py:
(TestPlatformInfo.test_real_code):
* Scripts/webkitpy/common/system/systemhost.py:
(SystemHost.__init__): Use default platforminfo sys and platform modules.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfopy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfo_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemsystemhostpy">trunk/Tools/Scripts/webkitpy/common/system/systemhost.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (276934 => 276935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-03 23:25:05 UTC (rev 276934)
+++ trunk/Tools/ChangeLog       2021-05-03 23:41:50 UTC (rev 276935)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-05-03  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Support pickling platforminfo
+        https://bugs.webkit.org/show_bug.cgi?id=225230
+        <rdar://problem/77384913>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo.__init__): Define default arguments.
+        (PlatformInfo.display_name): Use default platform module if platform_module undefined.
+        (PlatformInfo._win_version_str): Ditto.
+        * Scripts/webkitpy/common/system/platforminfo_unittest.py:
+        (TestPlatformInfo.test_real_code):
+        * Scripts/webkitpy/common/system/systemhost.py:
+        (SystemHost.__init__): Use default platforminfo sys and platform modules.
+
</ins><span class="cx"> 2021-05-03  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         WKWebView: WKURLSchemeHandler request don't have Range headers for custom scheme videos
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (276934 => 276935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py       2021-05-03 23:25:05 UTC (rev 276934)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py  2021-05-03 23:41:50 UTC (rev 276935)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.common.memoized import memoized
</span><span class="cx"> from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE, VersionNameMap
</span><del>-from webkitpy.common.system.executive import ScriptError
</del><ins>+from webkitpy.common.system.executive import Executive, ScriptError
</ins><span class="cx"> from webkitpy.port.config import apple_additions
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -59,8 +59,9 @@
</span><span class="cx">     newer than one known to the code.
</span><span class="cx">     """
</span><span class="cx"> 
</span><del>-    def __init__(self, sys_module, platform_module, executive):
-        self._executive = executive
</del><ins>+    def __init__(self, sys_module=None, platform_module=None, executive=None):
+        sys_module = sys_module or sys
+        self._executive = executive or Executive()
</ins><span class="cx">         self._platform_module = platform_module
</span><span class="cx">         self.os_name = self._determine_os_name(sys_module.platform)
</span><span class="cx">         self.os_version = None
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx">             self.os_version = self._win_version()
</span><span class="cx">         else:
</span><span class="cx">             # Most other platforms (namely iOS) return conforming version strings.
</span><del>-            version = re.search(r'\d+.\d+(.\d+)?', platform_module.release())
</del><ins>+            version = re.search(r'\d+.\d+(.\d+)?', (platform_module or platform).release())
</ins><span class="cx">             if version:
</span><span class="cx">                 self.os_version = Version.from_string(version.group(0))
</span><span class="cx">             else:
</span><span class="lines">@@ -134,12 +135,12 @@
</span><span class="cx">     def display_name(self):
</span><span class="cx">         # platform.platform() returns Darwin information for Mac, which is just confusing.
</span><span class="cx">         if self.is_mac():
</span><del>-            return "Mac OS X %s" % self._platform_module.mac_ver()[0]
</del><ins>+            return "Mac OS X %s" % (self._platform_module or platform).mac_ver()[0]
</ins><span class="cx"> 
</span><span class="cx">         # Returns strings like:
</span><span class="cx">         # Linux-2.6.18-194.3.1.el5-i686-with-redhat-5.5-Final
</span><span class="cx">         # Windows-2008ServerR2-6.1.7600
</span><del>-        return self._platform_module.platform()
</del><ins>+        return (self._platform_module or platform).platform()
</ins><span class="cx"> 
</span><span class="cx">     def os_version_name(self, table=None):
</span><span class="cx">         if not self.os_version:
</span><span class="lines">@@ -246,7 +247,7 @@
</span><span class="cx">         return Version.from_iterable(match_object.groups())
</span><span class="cx"> 
</span><span class="cx">     def _win_version_str(self):
</span><del>-        version = self._platform_module.win32_ver()[1]
</del><ins>+        version = (self._platform_module or platform).win32_ver()[1]
</ins><span class="cx">         if version:
</span><span class="cx">             return version
</span><span class="cx">         # Note that this should only ever be called on windows, so this should always work.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfo_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py (276934 => 276935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py      2021-05-03 23:25:05 UTC (rev 276934)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py 2021-05-03 23:41:50 UTC (rev 276935)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">     # yet run by default and there's no reason not to run this everywhere by default.
</span><span class="cx">     def test_real_code(self):
</span><span class="cx">         # This test makes sure the real (unmocked) code actually works.
</span><del>-        info = PlatformInfo(sys, platform, Executive())
</del><ins>+        info = PlatformInfo(executive=Executive())
</ins><span class="cx">         self.assertNotEqual(info.os_name, '')
</span><span class="cx">         if info.is_mac() or info.is_win():
</span><span class="cx">             self.assertIsNotNone(info.os_version)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemsystemhostpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/systemhost.py (276934 => 276935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/systemhost.py 2021-05-03 23:25:05 UTC (rev 276934)
+++ trunk/Tools/Scripts/webkitpy/common/system/systemhost.py    2021-05-03 23:41:50 UTC (rev 276935)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">     def __init__(self):
</span><span class="cx">         self.executive = executive.Executive()
</span><span class="cx">         self.filesystem = filesystem.FileSystem()
</span><del>-        self.platform = platforminfo.PlatformInfo(sys, platform, self.executive)
</del><ins>+        self.platform = platforminfo.PlatformInfo(executive=self.executive)
</ins><span class="cx">         self.user = user.User(self.platform)
</span><span class="cx">         self.workspace = workspace.Workspace(self.filesystem, self.executive)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>