Changeset 276564 in webkit

Timestamp:

Apr 25, 2021, 10:39:58 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

jsonchecker.py validate_string uses Python 2 basestring type instead of Python 2/3 str type
​https://bugs.webkit.org/show_bug.cgi?id=224978

Patch by Tyler Wilcock <Tyler Wilcock> on 2021-04-25
Reviewed by Darin Adler.

validate_string uses the Python 2 basestring type instead of the Python 2/3
str type. This causes the check to exit early the first time it validates
a string with this error:

name 'basestring' is not defined

This resulted in jsonchecker not checking the file beyond the first
string validation.

I believe this caused jsonchecker to miss a bug in one of my previous
patches in which I put the "settings-flag" property in the wrong
place:

​https://bugs.webkit.org/show_bug.cgi?id=224718#c20

• Scripts/webkitpy/style/checkers/jsonchecker.py:

(JSONCSSPropertiesChecker.validate_string):
validate_string with Python 2 / 3 str type instead of Python 2
basestring.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/jsonchecker.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-25  Tyler Wilcock  <twilco.o@protonmail.com>
+
+        jsonchecker.py validate_string uses Python 2 basestring type instead of Python 2/3 str type
+        https://bugs.webkit.org/show_bug.cgi?id=224978
+
+        Reviewed by Darin Adler.
+
+        validate_string uses the Python 2 basestring type instead of the Python 2/3
+        str type.  This causes the check to exit early the first time it validates
+        a string with this error:
+
+        name 'basestring' is not defined
+
+        This resulted in jsonchecker not checking the file beyond the first
+        string validation.  
+
+        I believe this caused jsonchecker to miss a bug in one of my previous
+        patches in which I put the "settings-flag" property in the wrong
+        place:
+
+        https://bugs.webkit.org/show_bug.cgi?id=224718#c20
+
+        * Scripts/webkitpy/style/checkers/jsonchecker.py:
+        (JSONCSSPropertiesChecker.validate_string):
+        validate_string with Python 2 / 3 str type instead of Python 2
+        basestring.
+
 2021-04-24  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py

@@ -165 +165 @@
 
     def validate_string(self, property_name, property_key, key, value):
-        self.validate_type(property_name, property_key, key, value, basestring)
+        self.validate_type(property_name, property_key, key, value, str)
 
     def validate_array(self, property_name, property_key, key, value):