179520 2017-11-09 20:19:11 -0800 [webkitpy] Fix PlatformInfo._win_version since r224657 2017-11-15 09:39:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii aakash_jain buildbot glenn jbedard lforschler webkit-bug-importer oldest_to_newest 1370191 0 fujii 2017-11-09 20:19:11 -0800 [Win] version.py: ValueError: Version expected to be string, integer, tuple or list of integers Bug 179426 has added version.py. It reports the following error by using ActivePython 2.7. > C:\webkit\ga>python ./Tools/Scripts/webkit-patch apply-from-bug --port wincairo --no-update 123 > Traceback (most recent call last): > File "./Tools/Scripts/webkit-patch", line 84, in <module> > main() > File "./Tools/Scripts/webkit-patch", line 79, in main > WebKitPatch(os.path.abspath(__file__)).main() > File "C:\webkit\ga\Tools\Scripts\webkitpy\tool\main.py", line 57, in __init__ > Host.__init__(self) > File "C:\webkit\ga\Tools\Scripts\webkitpy\common\host.py", line 48, in __init__ > SystemHost.__init__(self) > File "C:\webkit\ga\Tools\Scripts\webkitpy\common\system\systemhost.py", line 40, in __init__ > self.user = user.User() > File "C:\webkit\ga\Tools\Scripts\webkitpy\common\system\user.py", line 61, in __init__ > self._platforminfo = platforminfo or PlatformInfo(sys, platform, Executive()) > File "C:\webkit\ga\Tools\Scripts\webkitpy\common\system\platforminfo.py", line 61, in __init__ > self.os_version = self._determine_win_version(self._win_version(sys_module)) > File "C:\webkit\ga\Tools\Scripts\webkitpy\common\system\platforminfo.py", line 196, in _win_version > return Version(sys_module.getwindowsversion()) > File "C:\webkit\ga\Tools\Scripts\webkitpy\common\version.py", line 46, in __init__ > raise ValueError('Version expected to be string, integer, tuple or list of integers') > ValueError: Version expected to be string, integer, tuple or list of integers I tested with trunk@224660. 1370193 1 fujii 2017-11-09 20:20:35 -0800 5th element of getwindowsversion() is ''. This causes another error. Should be truncated like sys.getwindowsversion()[0:3]. > ActivePython 2.7.10.12 (ActiveState Software Inc.) based on > Python 2.7.10 (default, Aug 21 2015, 12:07:58) [MSC v.1500 64 bit (AMD64)] on win32 > Type "help", "copyright", "credits" or "license" for more information. > >>> import sys > >>> sys.getwindowsversion() > sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='') > >>> sys.getwindowsversion()[0:3] > (6, 2, 9200) > >>> 1370241 2 fujii 2017-11-09 22:54:30 -0800 r224657 breaks Cygwin Python, too. > Traceback (most recent call last): > File "./Tools/Scripts/webkit-patch", line 84, in <module> > main() > File "./Tools/Scripts/webkit-patch", line 79, in main > WebKitPatch(os.path.abspath(__file__)).main() > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/tool/main.py", line 57, in __init__ > Host.__init__(self) > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/host.py", line 48, in __init__ > SystemHost.__init__(self) > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/system/systemhost.py", line 40, in __init__ > self.user = user.User() > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/system/user.py", line 61, in __init__ > self._platforminfo = platforminfo or PlatformInfo(sys, platform, Executive()) > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/system/platforminfo.py", line 61, in __init__ > self.os_version = self._determine_win_version(self._win_version(sys_module)) > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/system/platforminfo.py", line 197, in _win_version > return Version(self._executive.run_command(['cmd', '/c', 'ver'], decode_output=False)) > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/version.py", line 38, in __init__ > self[i] = ver.split('.')[i] > File "/cygdrive/c/webkit/ga/Tools/Scripts/webkitpy/common/version.py", line 73, in __setitem__ > self.major = int(value) > ValueError: invalid literal for int() with base 10: 'Microsoft Windows [Version 10' This is the output of ver command. > C:\>ver > > Microsoft Windows [Version 10.0.14393] 1370243 3 326560 fujii 2017-11-09 23:04:36 -0800 Created attachment 326560 Patch 1370336 4 326560 aakash_jain 2017-11-10 08:33:45 -0800 Comment on attachment 326560 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=326560&action=review > Tools/Scripts/webkitpy/common/system/platforminfo.py:199 > + def _win_version_tuple_from_cmd(self): This doesn't return tuple anymore, we should rename it to _win_version_from_cmd. 1370352 5 jbedard 2017-11-10 09:03:59 -0800 Committed the change (with Aakash's edits) in <https://trac.webkit.org/changeset/224685/webkit>. 1371941 6 webkit-bug-importer 2017-11-15 09:39:19 -0800 <rdar://problem/35562165> 326560 2017-11-09 23:04:36 -0800 2017-11-10 08:33:45 -0800 Patch bug-179520-20171110160435.patch text/plain 2315 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NjYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzFjZDdmODdlMGZjMzQ1NzUyZGQ1OWE1ZGQ2NWQwMmZl Y2Y4YWM4Ni4uOTlkMzgyMzU3YmM5NDY2MTE5YWRjNmJhYTNhY2RlOTExZGFhMWFhMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE3LTExLTA5ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFt3ZWJraXRweV0gRml4IFBsYXRmb3JtSW5mby5fd2luX3ZlcnNpb24gc2lu Y2UgcjIyNDY1NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc5NTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlcmUgYXJlIHR3byBwcm9ibGVtcy4KKworICAgICAgICBUaGUgcmV0dXJuIHZhbHVlIG9m IHN5cy5nZXR3aW5kb3dzdmVyc2lvbigpIGRvZXNuJ3QgbWF0Y2ggd2l0aAorICAgICAgICBWZXJz aW9uLl9faW5pdF9fIGV4cGVjdHMuIFRydW5jYXRlIHRoZSA0dGggYW5kIDV0aCBvZiBpdC4KKwor ICAgICAgICBfd2luX3ZlcnNpb25fdHVwbGVfZnJvbV9jbWQgd2FzIGRlbGV0ZWQgaW4gcjIyNDY1 Ny4gQnV0LCBpdCBpcworICAgICAgICBzdGlsbCBuZWVkZWQgZm9yIEN5Z3dpbiBQeXRob24uCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5 OgorICAgICAgICAoUGxhdGZvcm1JbmZvLl93aW5fdmVyc2lvbik6IFJldHVybiBbMDozXSBvZiBn ZXR3aW5kb3dzdmVyc2lvbigpLgorICAgICAgICBDYWxsIF93aW5fdmVyc2lvbl90dXBsZV9mcm9t X2NtZCBmb3IgQ3lnd2luIFB5dGhvbi4KKyAgICAgICAgKFBsYXRmb3JtSW5mby5fd2luX3ZlcnNp b25fdHVwbGVfZnJvbV9jbWQpOiBSZXN0b3JlZC4KKwogMjAxNy0xMS0wOSAgSm9uYXRoYW4gQmVk YXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgd2Via2l0cHk6IFVuaWZ5IHZlcnNp b24gcGFyc2luZyBjb2RlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3BsYXRmb3JtaW5mby5weQppbmRleCBiNTY3Mzc0OTEwNzgwOWMzNTA1NDBkOTNlMThm MjcyOTNjYzkyYWIxLi4yMmMxMWQ0NWIyOWIxNmM1ZTJlNzE5N2ZiMjhmZmEyNzBhZTQwMzAyIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm8ucHkKQEAgLTE5Myw1ICsxOTMsMTIgQEAgY2xhc3MgUGxhdGZvcm1JbmZvKG9iamVjdCk6 CiAKICAgICBkZWYgX3dpbl92ZXJzaW9uKHNlbGYsIHN5c19tb2R1bGUpOgogICAgICAgICBpZiBo YXNhdHRyKHN5c19tb2R1bGUsICdnZXR3aW5kb3dzdmVyc2lvbicpOgotICAgICAgICAgICAgcmV0 dXJuIFZlcnNpb24oc3lzX21vZHVsZS5nZXR3aW5kb3dzdmVyc2lvbigpKQotICAgICAgICByZXR1 cm4gVmVyc2lvbihzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWydjbWQnLCAnL2MnLCAndmVy J10sIGRlY29kZV9vdXRwdXQ9RmFsc2UpKQorICAgICAgICAgICAgcmV0dXJuIFZlcnNpb24oc3lz X21vZHVsZS5nZXR3aW5kb3dzdmVyc2lvbigpWzA6M10pCisgICAgICAgIHJldHVybiBWZXJzaW9u KHNlbGYuX3dpbl92ZXJzaW9uX3R1cGxlX2Zyb21fY21kKCkpCisKKyAgICBkZWYgX3dpbl92ZXJz aW9uX3R1cGxlX2Zyb21fY21kKHNlbGYpOgorICAgICAgICAjIE5vdGUgdGhhdCB0aGlzIHNob3Vs ZCBvbmx5IGV2ZXIgYmUgY2FsbGVkIG9uIHdpbmRvd3MsIHNvIHRoaXMgc2hvdWxkIGFsd2F5cyB3 b3JrLgorICAgICAgICB2ZXJfb3V0cHV0ID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsn Y21kJywgJy9jJywgJ3ZlciddLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQorICAgICAgICBtYXRjaF9v YmplY3QgPSByZS5zZWFyY2gocicoP1A8bWFqb3I+XGQpXC4oP1A8bWlub3I+XGQpXC4oP1A8YnVp bGQ+XGQrKScsIHZlcl9vdXRwdXQpCisgICAgICAgIGFzc2VydCBtYXRjaF9vYmplY3QsICdjbWQg cmV0dXJuZWQgYW4gdW5leHBlY3RlZCB2ZXJzaW9uIHN0cmluZzogJyArIHZlcl9vdXRwdXQKKyAg ICAgICAgcmV0dXJuIG1hdGNoX29iamVjdC5ncm91cHMoKQo=