Auto merge of #26831 - servo-wpt-sync:wpt_update_09-06-2020, r=jdm

Sync WPT with upstream (09-06-2020)

Automated downstream sync of changes from upstream as of 09-06-2020.
[no-wpt-sync]
r? @servo-wpt-sync

1 files changed, 19 insertions, 19 deletions

diff --git a/tests/wpt/web-platform-tests/cors/resources/preflight.py b/tests/wpt/web-platform-tests/cors/resources/preflight.py
index 978e97c5d1e..d8bce26d280 100644
--- a/tests/wpt/web-platform-tests/cors/resources/preflight.py
+++ b/tests/wpt/web-platform-tests/cors/resources/preflight.py
@@ -1,35 +1,35 @@
 def main(request, response):
-    headers = [("Content-Type", "text/plain")]
+    headers = [(b"Content-Type", b"text/plain")]
 
-    if "check" in request.GET:
-        token = request.GET.first("token")
+    if b"check" in request.GET:
+        token = request.GET.first(b"token")
         value = request.server.stash.take(token)
         if value == None:
-            body = "0"
+            body = u"0"
         else:
-            if request.GET.first("check", None) == "keep":
+            if request.GET.first(b"check", None) == b"keep":
                 request.server.stash.put(token, value)
-            body = "1"
+            body = u"1"
 
         return headers, body
 
-    if request.method == "OPTIONS":
-        if not "Access-Control-Request-Method" in request.headers:
-            response.set_error(400, "No Access-Control-Request-Method header")
-            return "ERROR: No access-control-request-method in preflight!"
+    if request.method == u"OPTIONS":
+        if not b"Access-Control-Request-Method" in request.headers:
+            response.set_error(400, u"No Access-Control-Request-Method header")
+            return u"ERROR: No access-control-request-method in preflight!"
 
-        headers.append(("Access-Control-Allow-Methods",
-                        request.headers['Access-Control-Request-Method']))
+        headers.append((b"Access-Control-Allow-Methods",
+                        request.headers[b'Access-Control-Request-Method']))
 
-        if "max_age" in request.GET:
-            headers.append(("Access-Control-Max-Age", request.GET['max_age']))
+        if b"max_age" in request.GET:
+            headers.append((b"Access-Control-Max-Age", request.GET[b'max_age']))
 
-        if "token" in request.GET:
-            request.server.stash.put(request.GET.first("token"), 1)
+        if b"token" in request.GET:
+            request.server.stash.put(request.GET.first(b"token"), 1)
 
-    headers.append(("Access-Control-Allow-Origin", "*"))
-    headers.append(("Access-Control-Allow-Headers", "x-print"))
+    headers.append((b"Access-Control-Allow-Origin", b"*"))
+    headers.append((b"Access-Control-Allow-Headers", b"x-print"))
 
-    body = request.headers.get("x-print", "NO")
+    body = request.headers.get(b"x-print", b"NO")
 
     return headers, body