Attachment 371518 Details for Bug 198618 – Patch

[patch] Patch

bug-198618-20190606120509.patch (text/plain), 1.59 KB, created by Daniel Bates on 2019-06-06 12:05:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2019-06-06 12:05:10 PDT

Size: 1.59 KB

patch

obsolete

>Subversion Revision: 246069
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d6b3dc279b0b8d0cebfd674c44e214ffb6d66151..6e9aade54c0d5037cb395748f70c437cb1f122ad 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-06  Daniel Bates  <dabates@apple.com>
>+
>+        [lldb-webkit] TypeError: cannot concatenate 'str' and 'int' objects when prettify URL with port number
>+        https://bugs.webkit.org/show_bug.cgi?id=198618
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WebCoreSecurityOriginProvider.port() returns a 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-04  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [misc] Remove JSCOnly ARMv7 Traditional bot
>diff --git a/Tools/lldb/lldb_webkit.py b/Tools/lldb/lldb_webkit.py
>index 99bf88568bfd8ccec2bbc9fff1324d9715b9ce12..5eb2d88aab36a7458a86fcc47bb2b34c2fd0f3b3 100644
>--- a/Tools/lldb/lldb_webkit.py
>+++ b/Tools/lldb/lldb_webkit.py
>@@ -691,7 +691,7 @@ class WebCoreSecurityOriginProvider:
>             return 'file://'
>         result = '{}://{}'.format(scheme, host)
>         if port:
>-            result += ':' + port
>+            result += ':' + str(port)
>         return result
> 
>

Flags:

bfulgham: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198618: 371518