Title: [246164] trunk/Tools
- Revision
- 246164
- Author
- [email protected]
- Date
- 2019-06-06 12:27:12 -0700 (Thu, 06 Jun 2019)
Log Message
[lldb-webkit] TypeError: cannot concatenate 'str' and 'int' objects when prettify SecurityOrigin with
non-default port number
https://bugs.webkit.org/show_bug.cgi?id=198618
Reviewed by Brent Fulgham.
WebCoreSecurityOriginProvider.port() returns an int data type. We need to explicitly convert this to
a string before we concatenate it with another string when building the string representation
for the WebCore::SecurityOrigin object. Otherwise, Python complains that we are concatenating a str
with an int and we don't get a pretty-printed representation for WebCore::SecurityOrigin.
* lldb/lldb_webkit.py:
(WebCoreSecurityOriginProvider.to_string): Call str() on the port before concatenting it.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (246163 => 246164)
--- trunk/Tools/ChangeLog 2019-06-06 19:15:56 UTC (rev 246163)
+++ trunk/Tools/ChangeLog 2019-06-06 19:27:12 UTC (rev 246164)
@@ -1,3 +1,19 @@
+2019-06-06 Daniel Bates <[email protected]>
+
+ [lldb-webkit] TypeError: cannot concatenate 'str' and 'int' objects when prettify SecurityOrigin with
+ non-default port number
+ https://bugs.webkit.org/show_bug.cgi?id=198618
+
+ Reviewed by Brent Fulgham.
+
+ WebCoreSecurityOriginProvider.port() returns an int data type. We need to explicitly convert this to
+ a string before we concatenate it with another string when building the string representation
+ for the WebCore::SecurityOrigin object. Otherwise, Python complains that we are concatenating a str
+ with an int and we don't get a pretty-printed representation for WebCore::SecurityOrigin.
+
+ * lldb/lldb_webkit.py:
+ (WebCoreSecurityOriginProvider.to_string): Call str() on the port before concatenting it.
+
2019-06-06 Jonathan Bedard <[email protected]>
Remove obsolete TOOLCHAINS overrides from as asan.xcconfig
Modified: trunk/Tools/lldb/lldb_webkit.py (246163 => 246164)
--- trunk/Tools/lldb/lldb_webkit.py 2019-06-06 19:15:56 UTC (rev 246163)
+++ trunk/Tools/lldb/lldb_webkit.py 2019-06-06 19:27:12 UTC (rev 246164)
@@ -691,7 +691,7 @@
return 'file://'
result = '{}://{}'.format(scheme, host)
if port:
- result += ':' + port
+ result += ':' + str(port)
return result
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
