Modified: trunk/Tools/ChangeLog (283849 => 283850)
--- trunk/Tools/ChangeLog 2021-10-08 23:10:17 UTC (rev 283849)
+++ trunk/Tools/ChangeLog 2021-10-08 23:25:14 UTC (rev 283850)
@@ -1,3 +1,20 @@
+2021-10-08 Truitt Savell <[email protected]>
+
+ Reverting r283824 becasue it broke baseline search paths
+ https://bugs.webkit.org/show_bug.cgi?id=230540
+
+ Unreviewed revert.
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py:
+ (VersionTestCase.test_int_constructor):
+ * Scripts/libraries/webkitcorepy/webkitcorepy/version.py:
+ (Version.from_iterable):
+ (Version.__init__):
+ (Version.__setitem__):
+ (Version.__contains__):
+ (Version.__hash__):
+ (Version.__cmp__):
+
2021-10-08 Wenson Hsieh <[email protected]>
Split DisplayList::Recorder into an abstract base class and a concrete implementation
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py (283849 => 283850)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py 2021-10-08 23:10:17 UTC (rev 283849)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py 2021-10-08 23:25:14 UTC (rev 283850)
@@ -52,10 +52,10 @@
def test_int_constructor(self):
v = Version(1)
self.assertEqual(v.major, 1)
- self.assertEqual(v.minor, None)
- self.assertEqual(v.tiny, None)
- self.assertEqual(v.micro, None)
- self.assertEqual(v.nano, None)
+ self.assertEqual(v.minor, 0)
+ self.assertEqual(v.tiny, 0)
+ self.assertEqual(v.micro, 0)
+ self.assertEqual(v.nano, 0)
def test_len(self):
self.assertEqual(len(Version(1, 2, 3, 4, 5)), 5)
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py (283849 => 283850)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py 2021-10-08 23:10:17 UTC (rev 283849)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py 2021-10-08 23:25:14 UTC (rev 283850)
@@ -37,7 +37,7 @@
def from_iterable(val):
result = Version()
for i in range(len(val)):
- result[i] = None if val[i] is None else int(val[i])
+ result[i] = int(val[i])
return result
@staticmethod
@@ -45,12 +45,12 @@
from webkitpy.common.version_name_map import VersionNameMap
return VersionNameMap.map().from_name(name)[1]
- def __init__(self, major=0, minor=None, tiny=None, micro=None, nano=None):
+ def __init__(self, major=0, minor=0, tiny=0, micro=0, nano=0):
self.major = int(major)
- self.minor = None if minor is None else int(minor)
- self.tiny = None if tiny is None else int(tiny)
- self.micro = None if micro is None else int(micro)
- self.nano = None if nano is None else int(nano)
+ self.minor = int(minor)
+ self.tiny = int(tiny)
+ self.micro = int(micro)
+ self.nano = int(nano)
def __len__(self):
return 5
@@ -75,22 +75,21 @@
raise ValueError('Expected version key to be string or integer')
def __setitem__(self, key, value):
- value = None if value is None else int(value)
if isinstance(key, int):
if key == 0:
- self.major = value
+ self.major = int(value)
return self.major
elif key == 1:
- self.minor = value
+ self.minor = int(value)
return self.minor
elif key == 2:
- self.tiny = value
+ self.tiny = int(value)
return self.tiny
elif key == 3:
- self.micro = value
+ self.micro = int(value)
return self.micro
elif key == 4:
- self.nano = value
+ self.nano = int(value)
return self.nano
raise ValueError('Version key must be between 0 and 4')
elif isinstance(key, str):
@@ -137,9 +136,9 @@
assert isinstance(version, Version)
does_match = True
for i in range(len(version)):
- if (self[i] or 0) != (version[i] or 0):
+ if self[i] != version[i]:
does_match = False
- if not does_match and self[i] is not None:
+ if not does_match and self[i] != 0:
return False
return True
@@ -157,7 +156,7 @@
result = 0
for index in range(len(self)):
result *= 1000
- result += -1 if self[index] is None else self[index]
+ result += self[index]
return result
def __cmp__(self, other):
@@ -164,7 +163,7 @@
if other is None:
return 1
for i in range(len(self)):
- diff = (self[i] or 0) - (other[i] or 0)
+ diff = self[i] - other[i]
if diff:
return diff
return 0
