Modified: trunk/Tools/ChangeLog (276563 => 276564)
--- trunk/Tools/ChangeLog 2021-04-25 05:59:59 UTC (rev 276563)
+++ trunk/Tools/ChangeLog 2021-04-25 17:39:58 UTC (rev 276564)
@@ -1,3 +1,30 @@
+2021-04-25 Tyler Wilcock <[email protected]>
+
+ 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 <[email protected]>
Rename slave to worker in webkitpy - part 2
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py (276563 => 276564)
--- trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2021-04-25 05:59:59 UTC (rev 276563)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2021-04-25 17:39:58 UTC (rev 276564)
@@ -164,7 +164,7 @@
self.validate_type(property_name, property_key, key, value, bool)
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):
self.validate_type(property_name, property_key, key, value, list)
