Changeset 225953 in webkit

Timestamp:

Dec 14, 2017 5:46:42 PM (6 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Replace Version.contained_in with Version.contains
​https://bugs.webkit.org/show_bug.cgi?id=180772
<rdar://problem/36033555>

Reviewed by David Kilzer.

Using contains instead of contained_in allows for the more
Pythonic 'in' operator to be used.

• Scripts/webkitpy/common/version.py:

(Version):
(Version.contains): Replace contained_in. Note that self is now
the container.
(Version.contained_in): Deleted.

• Scripts/webkitpy/common/version_name_map.py:

(VersionNameMap.to_name):

• Scripts/webkitpy/common/version_unittest.py:

(VersionTestCase.test_contained_in):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/version.py (modified) (1 diff)
• Scripts/webkitpy/common/version_name_map.py (modified) (1 diff)
• Scripts/webkitpy/common/version_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-12-14  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Replace Version.contained_in with Version.__contains__
+        https://bugs.webkit.org/show_bug.cgi?id=180772
+        <rdar://problem/36033555>
+
+        Reviewed by David Kilzer.
+
+        Using __contains__ instead of contained_in allows for the more
+        Pythonic 'in' operator to be used.
+
+        * Scripts/webkitpy/common/version.py:
+        (Version):
+        (Version.__contains__): Replace contained_in. Note that self is now
+        the container.
+        (Version.contained_in): Deleted.
+        * Scripts/webkitpy/common/version_name_map.py:
+        (VersionNameMap.to_name):
+        * Scripts/webkitpy/common/version_unittest.py:
+        (VersionTestCase.test_contained_in):
+
 2017-12-14  Ryan Haddad  <ryanhaddad@apple.com>
 

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

@@ -96 +96 @@
         raise ValueError('Expected version key to be string or integer')
 
-    # 11.2 is contained in 11, but 11 is not contained in 11.2
-    def contained_in(self, version):
+    # 11.2 is in 11, but 11 is not in 11.2
+    def __contains__(self, version):
+        assert isinstance(version, Version)
         does_match = True
-        for i in xrange(len(self)):
+        for i in xrange(len(version)):
             if self[i] != version[i]:
                 does_match = False
-            if not does_match and version[i] != 0:
+            if not does_match and self[i] != 0:
                 return False
         return True

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

@@ -92 +92 @@
             if version == os_version:
                 return os_name
-            elif version.contained_in(os_version):
-                if closest_match[1] and closest_match[1].contained_in(os_version):
+            elif version in os_version:
+                if closest_match[1] and closest_match[1] in os_version:
                     continue
                 closest_match = (os_name, os_version)

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

@@ -111 +111 @@
 
     def test_contained_in(self):
-        self.assertTrue(Version(11, 1).contained_in(Version(11)))
-        self.assertTrue(Version(11, 1, 2).contained_in(Version(11, 1)))
-        self.assertFalse(Version(11).contained_in(Version(11, 1)))
-        self.assertFalse(Version(11).contained_in(Version(11, 1, 2)))
-        self.assertFalse(Version(11, 1).contained_in(Version(11, 1, 2)))
-        self.assertTrue(Version(11).contained_in(Version(11)))
-        self.assertTrue(Version(11, 1).contained_in(Version(11, 1)))
-        self.assertTrue(Version(11, 1, 2).contained_in(Version(11, 1, 2)))
-        self.assertTrue(Version(11).contained_in(Version(11, 0)))
-        self.assertTrue(Version(11, 0).contained_in(Version(11)))
-        self.assertTrue(Version(11).contained_in(Version(11, 0, 0)))
-        self.assertTrue(Version(11, 0, 0).contained_in(Version(11)))
-        self.assertTrue(Version(11, 1).contained_in(Version(11, 1, 0)))
-        self.assertTrue(Version(11, 1, 0).contained_in(Version(11, 1)))
+        self.assertTrue(Version(11, 1) in Version(11))
+        self.assertTrue(Version(11, 1, 2) in Version(11, 1))
+        self.assertFalse(Version(11) in Version(11, 1))
+        self.assertFalse(Version(11) in Version(11, 1, 2))
+        self.assertFalse(Version(11, 1) in Version(11, 1, 2))
+        self.assertTrue(Version(11) in Version(11))
+        self.assertTrue(Version(11, 1) in Version(11, 1))
+        self.assertTrue(Version(11, 1, 2) in Version(11, 1, 2))
+        self.assertTrue(Version(11) in Version(11, 0))
+        self.assertTrue(Version(11, 0) in Version(11))
+        self.assertTrue(Version(11) in Version(11, 0, 0))
+        self.assertTrue(Version(11, 0, 0) in Version(11))
+        self.assertTrue(Version(11, 1) in Version(11, 1, 0))
+        self.assertTrue(Version(11, 1, 0) in Version(11, 1))
 
     def test_compare_versions(self):