From 5abb5fe6936a346693b2dd3dbd3923b4a4091aeb Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Fri, 4 Dec 2020 08:20:12 +0000
Subject: [PATCH] Update web-platform-tests to revision
 35450a5d2eb710e579c1554872247fa3eae7b5e9

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 +
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 +
 .../cssom-view/elementFromPoint-001.html.ini  |    4 +
 .../cssom-view/elementFromPosition.html.ini   |    3 -
 .../elementsFromPoint-iframes.html.ini        |    3 -
 .../AddEventListenerOptions-signal.any.js.ini |   57 +
 .../fetch/content-type/response.window.js.ini |   21 +-
 .../fetch/content-type/script.window.js.ini   |    2 +-
 .../non-secure-context.window.js.ini          |    4 +
 .../nosniff/parsing-nosniff.window.js.ini     |    3 -
 .../traverse_the_history_5.html.ini           |    4 +
 .../embedded-opener-remove-frame.html.ini     |    1 -
 .../hash-name-reference.html.ini              |    3 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 .../form-double-submit-2.html.ini             |    4 +
 .../form-double-submit-3.html.ini             |    4 -
 .../htmlanchorelement_noopener.html.ini       |    7 +-
 .../parsing/DOMContentLoaded-defer.html.ini   |    4 +
 .../document-write/iframe_005.html.ini        |    4 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../audiocontext-not-fully-active.html.ini    |    1 +
 .../webmessaging/without-ports/018.html.ini   |    5 -
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 tests/wpt/metadata/MANIFEST.json              |  215 +-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 +
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 +
 .../cssom-view/elementFromPoint-001.html.ini  |    4 +
 .../cssom-view/elementFromPosition.html.ini   |    3 -
 .../elementsFromPoint-iframes.html.ini        |    3 -
 ...ListenerAbortController.tentative.html.ini |   10 -
 .../AddEventListenerOptions-signal.any.js.ini |   57 +
 .../fetch/content-type/response.window.js.ini |   21 +-
 .../fetch/content-type/script.window.js.ini   |    2 +-
 .../non-secure-context.window.js.ini          |    4 +
 .../nosniff/parsing-nosniff.window.js.ini     |    3 -
 .../traverse_the_history_5.html.ini           |    4 +
 .../embedded-opener-remove-frame.html.ini     |    1 -
 .../hash-name-reference.html.ini              |    3 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    4 +-
 .../form-double-submit-2.html.ini             |    4 +
 .../form-double-submit-3.html.ini             |    4 -
 .../htmlanchorelement_noopener.html.ini       |    7 +-
 .../parsing/DOMContentLoaded-defer.html.ini   |    4 +
 .../document-write/iframe_005.html.ini        |    4 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../audiocontext-not-fully-active.html.ini    |    1 +
 .../webmessaging/without-ports/018.html.ini   |    5 -
 .../parsing/list-style-type-computed.html     |    2 +
 .../parsing/list-style-type-valid.html        |    2 +
 .../css/cssom/serialize-values.html           |    3 +-
 ...003-manual.html => focus-visible-003.html} |   12 +-
 ...004-manual.html => focus-visible-004.html} |   12 +-
 ...ventListenerAbortController.tentative.html |   56 -
 .../AddEventListenerOptions-signal.any.js     |  133 +
 .../cors-rfc1918/non-secure-context.window.js |   31 +
 .../fetch/cors-rfc1918/resources/support.js   |   34 +
 .../resources/treat-as-public-address.html    |    8 +
 .../treat-as-public-address.html.headers      |    1 +
 .../treat-as-public-address.https.html        |    8 +
 ...treat-as-public-address.https.html.headers |    1 +
 .../secure-context.https.window.js            |   31 +
 .../textfieldselection/select-event.html      |   15 +-
 .../forms/textfieldselection/selection.html   |   20 +-
 .../data-driven/resolving-internal.https.html |    1 +
 .../resources/empty-import-map-internal.json  |    1 +
 .../packages-via-trailing-slashes.json        |   16 +-
 .../data-driven/resources/test-helper.js      |    2 +-
 .../url-specifiers-schemes-internal.json      |   45 +
 .../data-driven/resources/url-specifiers.json |   18 +-
 .../wpt/web-platform-tests/interfaces/dom.idl |    1 +
 .../web-platform-tests/interfaces/webrtc.idl  |    1 -
 ...interevent_capture_suppressing_mouse.html} |   25 +-
 ... pointerevent_fractional_coordinates.html} |   51 +
 .../serial/resources/common.js                |   33 +
 .../serial/resources/manual.js                |   38 +
 .../serialPort_disconnect-manual.https.html   |   83 +
 .../serialPort_loopback-manual.https.html     |  181 ++
 .../tools/third_party/enum/PKG-INFO           |    4 +-
 .../tools/third_party/enum/enum/__init__.py   |    7 +-
 .../tools/third_party/enum/enum/doc/enum.pdf  | 2237 -----------------
 .../tools/third_party/enum/enum/test.py       |   25 +-
 .../tools/third_party/enum/setup.cfg          |    1 -
 .../tools/third_party/enum/setup.py           |   16 +-
 .../webrtc/RTCDataChannel-close.html          |   78 +-
 .../webusb/resources/manual.js                |   38 +
 ...usbDevice_claimInterface-manual.https.html |   46 +
 91 files changed, 1381 insertions(+), 2477 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/dom/events/AddEventListenerOptions-signal.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/fetch/cors-rfc1918/non-secure-context.window.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
 delete mode 100644 tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini
 create mode 100644 tests/wpt/metadata/dom/events/AddEventListenerOptions-signal.any.js.ini
 create mode 100644 tests/wpt/metadata/fetch/cors-rfc1918/non-secure-context.window.js.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 create mode 100644 tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/018.html.ini
 rename tests/wpt/web-platform-tests/css/selectors/{focus-visible-003-manual.html => focus-visible-003.html} (89%)
 rename tests/wpt/web-platform-tests/css/selectors/{focus-visible-004-manual.html => focus-visible-004.html} (90%)
 delete mode 100644 tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-signal.any.js
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/support.js
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js
 create mode 100644 tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json
 rename tests/wpt/web-platform-tests/pointerevents/{pointerevent_capture_suppressing_mouse-manual.html => pointerevent_capture_suppressing_mouse.html} (90%)
 rename tests/wpt/web-platform-tests/pointerevents/{pointerevent_fractional_coordinates-manual.html => pointerevent_fractional_coordinates.html} (66%)
 create mode 100644 tests/wpt/web-platform-tests/serial/resources/common.js
 create mode 100644 tests/wpt/web-platform-tests/serial/resources/manual.js
 create mode 100644 tests/wpt/web-platform-tests/serial/serialPort_disconnect-manual.https.html
 create mode 100644 tests/wpt/web-platform-tests/serial/serialPort_loopback-manual.https.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/third_party/enum/enum/doc/enum.pdf
 create mode 100644 tests/wpt/web-platform-tests/webusb/resources/manual.js
 create mode 100644 tests/wpt/web-platform-tests/webusb/usbDevice_claimInterface-manual.https.html

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
-  [elementsFromPoint on inner documents]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/dom/events/AddEventListenerOptions-signal.any.js.ini b/tests/wpt/metadata-layout-2020/dom/events/AddEventListenerOptions-signal.any.js.ini
new file mode 100644
index 00000000000..fd5e39c021b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/dom/events/AddEventListenerOptions-signal.any.js.ini
@@ -0,0 +1,57 @@
+[AddEventListenerOptions-signal.any.html]
+  [Passing an AbortSignal to addEventListener works with the once flag]
+    expected: FAIL
+
+  [Adding then aborting a listener in another listener does not call it]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener works with the capture flag]
+    expected: FAIL
+
+  [Aborting from a listener does not call future listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to multiple listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener does not prevent removeEventListener]
+    expected: FAIL
+
+  [Aborting from a nested listener should remove it]
+    expected: FAIL
+
+  [Removing a once listener works with a passed signal]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener options should allow removing a listener]
+    expected: FAIL
+
+
+[AddEventListenerOptions-signal.any.worker.html]
+  [Passing an AbortSignal to addEventListener works with the once flag]
+    expected: FAIL
+
+  [Adding then aborting a listener in another listener does not call it]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener works with the capture flag]
+    expected: FAIL
+
+  [Aborting from a listener does not call future listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to multiple listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener does not prevent removeEventListener]
+    expected: FAIL
+
+  [Aborting from a nested listener should remove it]
+    expected: FAIL
+
+  [Removing a once listener works with a passed signal]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener options should allow removing a listener]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index b22157cd010..30d40e8adee 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,15 +312,18 @@
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 258fe374697..5c001592859 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript ]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/cors-rfc1918/non-secure-context.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/cors-rfc1918/non-secure-context.window.js.ini
new file mode 100644
index 00000000000..834261b53fe
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/cors-rfc1918/non-secure-context.window.js.ini
@@ -0,0 +1,4 @@
+[non-secure-context.window.html]
+  [Public non secure page fetches local page.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 369bf4d4fa4..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2a63e3b7f..9a85a905394 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 5c3ac06f42a..09ae27d7480 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,3 +171,6 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-3.html]
-  [<button> should have the same double-submit protection as <input type=submit>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 23fb39e544c..b1aa0f1f1c4 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,14 +1,13 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
new file mode 100644
index 00000000000..6cf9d13975c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
@@ -0,0 +1,4 @@
+[iframe_005.html]
+  [document.write external script into iframe write back into parent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 5737bda9daf..ea08eda3f8e 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -353,3 +353,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t4.4505801708958657e-25\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-3.5267191406250000e+4\t9.3139332532882690e-1\t3.5268122799575329e+4\t3.7865981900958948e+4\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.5268122799575329e+4 at index of 28696.\n\tMax RelError of 3.7865981900958948e+4 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-47.5135609418513 dB) is not greater than or equal to 65.737. Got -47.5135609418513.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 1fb132abf3c..9962c4f4452 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -14098,20 +14098,6 @@
        {}
       ]
      ],
-     "focus-visible-003-manual.html": [
-      "ccc916a952854cc357ba7a5af73f4e1b476ef97d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "focus-visible-004-manual.html": [
-      "4d7878e751ecd5487eecd9f40477fa4a7ff03484",
-      [
-       null,
-       {}
-      ]
-     ],
      "focus-visible-006-manual.html": [
       "974abc0024e3153008e944ff706156efcb9948e2",
       [
@@ -18167,13 +18153,6 @@
       ]
      ]
     },
-    "pointerevent_capture_suppressing_mouse-manual.html": [
-     "127b07a9ee0c36004e2a5c1113b01c18633672d4",
-     [
-      null,
-      {}
-     ]
-    ],
     "pointerevent_element_haspointercapture_release_pending_capture-manual.html": [
      "17ad3e24ba4cc2bae4a58d84225c2a841fa4e867",
      [
@@ -18181,13 +18160,6 @@
       {}
      ]
     ],
-    "pointerevent_fractional_coordinates-manual.html": [
-     "e0e2fdcd62175c325e43744e43addc5f45486159",
-     [
-      null,
-      {}
-     ]
-    ],
     "pointerevent_multiple_primary_pointers_boundary_events-manual.html": [
      "029aa26368413ea96b90823285a780b6798a12d9",
      [
@@ -18522,6 +18494,22 @@
      ]
     ]
    },
+   "serial": {
+    "serialPort_disconnect-manual.https.html": [
+     "3a2e13400c4570cfab7826a7ec7a2972e3596103",
+     [
+      null,
+      {}
+     ]
+    ],
+    "serialPort_loopback-manual.https.html": [
+     "9e7801d8332f13aff063f6267f645be6ba837529",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "service-workers": {
     "service-worker": {
      "fetch-event-is-history-backward-navigation-manual.https.html": [
@@ -24271,6 +24259,15 @@
      ]
     ]
    },
+   "webusb": {
+    "usbDevice_claimInterface-manual.https.html": [
+     "991c1a9f31f08fce1b5d4797678a2e9917f5e7c0",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "xhr": {
     "send-authentication-existing-session-manual.htm": [
      "a80efd6e8436408db15d8019beef3abc0dfd0ab9",
@@ -336064,6 +336061,30 @@
       ]
      }
     },
+    "cors-rfc1918": {
+     "resources": {
+      "support.js": [
+       "be49c515ef5422743e618e67a420bd048abce89c",
+       []
+      ],
+      "treat-as-public-address.html": [
+       "7a8f6f09a517f0db695a55436870790a7763870d",
+       []
+      ],
+      "treat-as-public-address.html.headers": [
+       "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
+       []
+      ],
+      "treat-as-public-address.https.html": [
+       "7a8f6f09a517f0db695a55436870790a7763870d",
+       []
+      ],
+      "treat-as-public-address.https.html.headers": [
+       "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
+       []
+      ]
+     }
+    },
     "cross-origin-resource-policy": {
      "resources": {
       "green.png": [
@@ -349797,7 +349818,7 @@
        []
       ],
       "empty-import-map-internal.json": [
-       "59390c89f6b4da9ca95da0142d48022e8dc25f40",
+       "42033a2c07947f90ee779db5ec58d251958796ba",
        []
       ],
       "empty-import-map.json": [
@@ -349809,7 +349830,7 @@
        []
       ],
       "packages-via-trailing-slashes.json": [
-       "6b8f0135f50f50cd2691b5d4ee801d9671a3a2f9",
+       "6ff330cc5a73c15cb9ccabe88376b811ccffff02",
        []
       ],
       "parsing-addresses-absolute.json": [
@@ -349873,15 +349894,19 @@
        []
       ],
       "test-helper.js": [
-       "0f53aea5b4b0507a834c112c1a0595e112d27bbf",
+       "579fd52da8c1b034788ed760ab3744dae34e9fde",
        []
       ],
       "tricky-specifiers.json": [
        "d9c80c9475000587643f52d500c0c4d588640f4a",
        []
       ],
+      "url-specifiers-schemes-internal.json": [
+       "58a97642c2bd81690d6b9703de5688996cd306eb",
+       []
+      ],
       "url-specifiers.json": [
-       "aff55c4d9dda05eb344af83640aaacd18fdc15dc",
+       "6fcf7f466356fa856d9fbef69cd943c07f942b6f",
        []
       ]
      },
@@ -350595,7 +350620,7 @@
      []
     ],
     "dom.idl": [
-     "d404be2aea5fc78ffccd4533213f47f6b76cff8f",
+     "9d371fbe7c5f63cec026c237456d1df9beacc36f",
      []
     ],
     "element-timing.idl": [
@@ -351083,7 +351108,7 @@
      []
     ],
     "webrtc.idl": [
-     "e58df13b02c3fa0072b7054df77f4e8eb498aaae",
+     "cd34d3f3782e9d48695296df274a80a3a3d668ce",
      []
     ],
     "webusb.idl": [
@@ -357721,6 +357746,14 @@
    },
    "serial": {
     "resources": {
+     "common.js": [
+      "5177f83a8655f57a7b04935a136cc00bdd1b2626",
+      []
+     ],
+     "manual.js": [
+      "4ac46b6decc7b6bf42bf4491b192714c55376ada",
+      []
+     ],
      "serial-allowed-by-feature-policy-worker.js": [
       "46c338e9a33a9ee0148ca48d09fc9c3bec37736b",
       []
@@ -363421,7 +363454,7 @@
        []
       ],
       "PKG-INFO": [
-       "98927c4d99d9ca2f7ac9aadcb23b5b0922f34206",
+       "623171e38f68fb27c2e4a5161f06575baf7e6d6a",
        []
       ],
       "README": [
@@ -363438,21 +363471,17 @@
         []
        ],
        "__init__.py": [
-        "d6ffb3a40feb07779140f43f1de11ff80e7c13d7",
+        "51f3cf247069fd673ea9702b80d8762431831826",
         []
        ],
        "doc": {
-        "enum.pdf": [
-         "8c1383a495e8f924e247cdc5b2099eba2ff9d4f6",
-         []
-        ],
         "enum.rst": [
          "3afc238210b4f43f08bd0f0be422522242971244",
          []
         ]
        },
        "test.py": [
-        "d9edfaee40aff5eba7e80415bc75be03642055f5",
+        "c8c4b962242f4f5a2ed24855a7e5a12df3dec6e6",
         []
        ]
       },
@@ -363475,11 +363504,11 @@
        ]
       },
       "setup.cfg": [
-       "861a9f554263efb088d8636c4f17a30696e495ad",
+       "8bfd5a12f85b8fbb6c058cf67dd23da690835ea0",
        []
       ],
       "setup.py": [
-       "8b284003485674597063c20b333788319e54e962",
+       "f54071e7f0c4c3eb9d3b68e11caa1ea72120c1a6",
        []
       ]
      },
@@ -372181,6 +372210,10 @@
       "975d2242c949740217c050beea72db908ef46fc7",
       []
      ],
+     "manual.js": [
+      "869ac450acf19a029eb924a6b290bcabc1acff2d",
+      []
+     ],
      "open-in-iframe.html": [
       "730db24902964282a9ff2b87c0a1c0ec566449bb",
       []
@@ -409941,7 +409974,7 @@
        ]
       ],
       "list-style-type-computed.html": [
-       "21230f31b05058e23f004cfe1a53fa09835372af",
+       "1f25e52001399fd4dbb93bce1731e36b5e5398c8",
        [
         null,
         {}
@@ -409955,7 +409988,7 @@
        ]
       ],
       "list-style-type-valid.html": [
-       "66067ca43232975409aab83684da9258f10abcea",
+       "dde0bee8dde7830ce592276f09e987519a6da8b2",
        [
         null,
         {}
@@ -424014,7 +424047,7 @@
       ]
      ],
      "serialize-values.html": [
-      "7334424a0a1e638856e4bdbf5eb95f9e2cecf268",
+      "31f5f64c8094eb9158e27ab48f756f03c6d594b8",
       [
        null,
        {}
@@ -425880,6 +425913,24 @@
        }
       ]
      ],
+     "focus-visible-003.html": [
+      "4620c1e411492069f085efc08a3647a5eaae6fa6",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "focus-visible-004.html": [
+      "1c3fb3fcedd03b46da79af2aa53fc988d63ff7ca",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "focus-visible-005.html": [
       "b5d58435db1c6d37881bbcd4c856e8abab03aada",
       [
@@ -427745,13 +427796,6 @@
    },
    "dom": {
     "abort": {
-     "addEventListenerAbortController.tentative.html": [
-      "d208d4b0d6c5765d73ae61432f5a440811a5e623",
-      [
-       null,
-       {}
-      ]
-     ],
      "event.any.js": [
       "a67e6f400fcf1dfa347390e1a76e25b573afbb9a",
       [
@@ -427858,6 +427902,17 @@
        {}
       ]
      ],
+     "AddEventListenerOptions-signal.any.js": [
+      "42871061f3b9167cfa28e536b8608844684427d6",
+      [
+       "dom/events/AddEventListenerOptions-signal.any.html",
+       {}
+      ],
+      [
+       "dom/events/AddEventListenerOptions-signal.any.worker.html",
+       {}
+      ]
+     ],
      "CustomEvent.html": [
       "87050943f9bffac8c17b85e1dba977eaebc78ec5",
       [
@@ -452330,6 +452385,34 @@
         "timeout": "long"
        }
       ]
+     ],
+     "non-secure-context.window.js": [
+      "8f49a5cbedda7ece8a598cb1c668abd90051fe65",
+      [
+       "fetch/cors-rfc1918/non-secure-context.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "resources/support.js"
+         ]
+        ]
+       }
+      ]
+     ],
+     "secure-context.https.window.js": [
+      "8ed028a390c19cddf75587910718b2d5867c318a",
+      [
+       "fetch/cors-rfc1918/secure-context.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "resources/support.js"
+         ]
+        ]
+       }
+      ]
      ]
     },
     "cross-origin-resource-policy": {
@@ -485315,7 +485398,7 @@
         ]
        ],
        "select-event.html": [
-        "2fb018f82aabdd527e8bccd59230d2acd925a04b",
+        "af49024aa2bdfaa45f8eb200fad201d915f831a2",
         [
          null,
          {
@@ -485366,7 +485449,7 @@
         ]
        ],
        "selection.html": [
-        "b5cea0511d1213e804faf1295c1e236824ae2953",
+        "e216d953cef5ba81067b6e046c8f7ed197c0488c",
         [
          null,
          {
@@ -494676,7 +494759,7 @@
       ]
      ],
      "resolving-internal.https.html": [
-      "887b7474d63ad4b05c7c99b2e756e01958c12c16",
+      "d75bebba47531c721dc6764bdb22a017120565bb",
       [
        null,
        {
@@ -508731,6 +508814,15 @@
       }
      ]
     ],
+    "pointerevent_capture_suppressing_mouse.html": [
+     "080ca1520d91ecd88264f0c501998cefc410edaf",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_change-touch-action-onpointerdown_touch.html": [
      "40dbbed72f437172bab73fde62ee487b6150b10d",
      [
@@ -508801,6 +508893,15 @@
       }
      ]
     ],
+    "pointerevent_fractional_coordinates.html": [
+     "b106340efd5d05ba4ab4281863a476dbe6134a64",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_iframe-touch-action-none_touch.html": [
      "1c9651d8c162ff1ea71677f8fd3296c5c65fcad9",
      [
@@ -548665,7 +548766,7 @@
      ]
     ],
     "RTCDataChannel-close.html": [
-     "cd4ace2a836be2c9f18deca48c8c01f5e1cdff1d",
+     "e2a5ba77245ce4d8204f473cfed1c1223741667e",
      [
       null,
       {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
-  [elementsFromPoint on inner documents]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini b/tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini
deleted file mode 100644
index 2f6ebf0027f..00000000000
--- a/tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[addEventListenerAbortController.tentative.html]
-  [Tests support for EventController to cancel event listeners in addEventListener.]
-    expected: FAIL
-
-  [Tests support for EventController to cancel capture event listeners in addEventListener.]
-    expected: FAIL
-
-  [Passing an AbortSignal to addEventListener options should allow removing a listener]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/dom/events/AddEventListenerOptions-signal.any.js.ini b/tests/wpt/metadata/dom/events/AddEventListenerOptions-signal.any.js.ini
new file mode 100644
index 00000000000..fd5e39c021b
--- /dev/null
+++ b/tests/wpt/metadata/dom/events/AddEventListenerOptions-signal.any.js.ini
@@ -0,0 +1,57 @@
+[AddEventListenerOptions-signal.any.html]
+  [Passing an AbortSignal to addEventListener works with the once flag]
+    expected: FAIL
+
+  [Adding then aborting a listener in another listener does not call it]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener works with the capture flag]
+    expected: FAIL
+
+  [Aborting from a listener does not call future listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to multiple listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener does not prevent removeEventListener]
+    expected: FAIL
+
+  [Aborting from a nested listener should remove it]
+    expected: FAIL
+
+  [Removing a once listener works with a passed signal]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener options should allow removing a listener]
+    expected: FAIL
+
+
+[AddEventListenerOptions-signal.any.worker.html]
+  [Passing an AbortSignal to addEventListener works with the once flag]
+    expected: FAIL
+
+  [Adding then aborting a listener in another listener does not call it]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener works with the capture flag]
+    expected: FAIL
+
+  [Aborting from a listener does not call future listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to multiple listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener does not prevent removeEventListener]
+    expected: FAIL
+
+  [Aborting from a nested listener should remove it]
+    expected: FAIL
+
+  [Removing a once listener works with a passed signal]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener options should allow removing a listener]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 72f1e0e841e..83022fa66bc 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,15 +312,18 @@
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 258fe374697..5c001592859 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript ]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/cors-rfc1918/non-secure-context.window.js.ini b/tests/wpt/metadata/fetch/cors-rfc1918/non-secure-context.window.js.ini
new file mode 100644
index 00000000000..834261b53fe
--- /dev/null
+++ b/tests/wpt/metadata/fetch/cors-rfc1918/non-secure-context.window.js.ini
@@ -0,0 +1,4 @@
+[non-secure-context.window.html]
+  [Public non secure page fetches local page.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 369bf4d4fa4..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 2532dceabac..442db3cb549 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..98163335e40 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,6 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 06bbed1fcac..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
new file mode 100644
index 00000000000..633a99517d3
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-2.html]
+  [preventDefault should allow onclick submit() to succeed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-3.html]
-  [<button> should have the same double-submit protection as <input type=submit>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 510ea619a7d..a057142bbc5 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -8,11 +7,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
new file mode 100644
index 00000000000..6cf9d13975c
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
@@ -0,0 +1,4 @@
+[iframe_005.html]
+  [document.write external script into iframe write back into parent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 86c321d7f18..901bbf74c6b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -581,3 +581,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t4.4505801708958657e-25\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-3.5267191406250000e+4\t9.3139332532882690e-1\t3.5268122799575329e+4\t3.7865981900958948e+4\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 3.5268122799575329e+4 at index of 28696.\n\tMax RelError of 3.7865981900958948e+4 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-47.5135609418513 dB) is not greater than or equal to 65.737. Got -47.5135609418513.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-computed.html b/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-computed.html
index 21230f31b05..1f25e520013 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-computed.html
@@ -17,6 +17,8 @@ test_computed_value('list-style-type', 'none');
 test_computed_value('list-style-type', 'disc');
 test_computed_value('list-style-type', 'circle');
 test_computed_value('list-style-type', 'square');
+test_computed_value('list-style-type', 'disclosure-open');
+test_computed_value('list-style-type', 'disclosure-closed');
 test_computed_value('list-style-type', 'decimal');
 test_computed_value('list-style-type', 'decimal-leading-zero');
 test_computed_value('list-style-type', 'lower-roman');
diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-valid.html b/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-valid.html
index 66067ca4323..dde0bee8dde 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-valid.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-valid.html
@@ -17,6 +17,8 @@ test_valid_value('list-style-type', 'none');
 test_valid_value('list-style-type', 'disc');
 test_valid_value('list-style-type', 'circle');
 test_valid_value('list-style-type', 'square');
+test_valid_value('list-style-type', 'disclosure-open');
+test_valid_value('list-style-type', 'disclosure-closed');
 test_valid_value('list-style-type', 'decimal');
 test_valid_value('list-style-type', 'decimal-leading-zero');
 test_valid_value('list-style-type', 'lower-roman');
diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-values.html b/tests/wpt/web-platform-tests/css/cssom/serialize-values.html
index 7334424a0a1..31f5f64c809 100644
--- a/tests/wpt/web-platform-tests/css/cssom/serialize-values.html
+++ b/tests/wpt/web-platform-tests/css/cssom/serialize-values.html
@@ -433,7 +433,8 @@
         'initial': 'outside',
       }],
       ['list-style-type', {
-        'values': ['disc', 'circle', 'square', 'decimal', 'decimal-leading-zero', 'lower-roman',
+        'values': ['disc', 'circle', 'square', 'disclosure-open', 'disclosure-closed',
+                   'decimal', 'decimal-leading-zero', 'lower-roman',
                    'upper-roman', 'lower-greek', 'lower-latin', 'upper-latin', 'armenian', 'georgian',
                    'lower-alpha', 'upper-alpha', 'none', 'inherit'],
         'initial': 'disc',
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-003-manual.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-003.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-003-manual.html
rename to tests/wpt/web-platform-tests/css/selectors/focus-visible-003.html
index ccc916a9528..4620c1e4114 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-003-manual.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-003.html
@@ -7,6 +7,9 @@
   <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
   <style>
     :focus-visible {
       outline: red dotted 1px; /* fallback for Edge */
@@ -40,7 +43,7 @@
     <button data-tested="false" id="el-4">Focus me</span>
   </div>
   <div>
-    <input data-tested="false" id="el-5" type="button" value="Focus me"</input>
+    <input data-tested="false" id="el-5" type="button" value="Focus me"></input>
   </div>
   <div>
     <input data-tested="false" id="el-6" type="image" alt="Focus me."></input>
@@ -69,6 +72,11 @@
     <label><input data-tested="false" id="el-11" type="color"></input> Focus me.</label>
   </div>
   <script>
+    function mouseClickInTarget(selector) {
+       let target = document.querySelector(selector);
+       return test_driver.click(target);
+    }
+
     async_test(function(t) {
         document.querySelectorAll("[data-tested]").forEach((el) => {
             el.addEventListener("click", t.step_func((e) => {
@@ -82,6 +90,8 @@
                 }
             }));
         });
+
+        mouseClickInTarget("[data-tested=false]");
     }, "Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-004-manual.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-004.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-004-manual.html
rename to tests/wpt/web-platform-tests/css/selectors/focus-visible-004.html
index 4d7878e751e..1c3fb3fcedd 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-004-manual.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-004.html
@@ -7,6 +7,9 @@
   <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
   <style>
     :focus-visible {
       outline: red dotted 1px; /* fallback for Edge */
@@ -40,7 +43,7 @@
     <button data-tested="false" id="el-4">Focus me</span>
   </div>
   <div>
-    <input data-tested="false" id="el-5" type="button" value="Focus me"</input>
+    <input data-tested="false" id="el-5" type="button" value="Focus me"></input>
   </div>
   <div>
     <input data-tested="false" id="el-6" type="image" alt="Focus me."></input>
@@ -71,6 +74,11 @@
     <label><input data-tested="false" id="el-11" type="color"></input> Focus me.</label>
   </div>
   <script>
+    function mouseClickInTarget(selector) {
+       let target = document.querySelector(selector);
+       return test_driver.click(target);
+    }
+
     async_test(function(t) {
         document.querySelectorAll("[data-tested]").forEach((el) => {
             el.addEventListener("click", t.step_func((e) => {
@@ -84,6 +92,8 @@
                 }
             }));
         });
+
+        mouseClickInTarget("[data-tested=false]");
     }, "Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible - not affected by -webkit-appearance");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html b/tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html
deleted file mode 100644
index d208d4b0d6c..00000000000
--- a/tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-
-<!-- This behavior has not been specified yet. See https://github.com/whatwg/dom/issues/911 -->
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-
-<script>
-test(t => {
-  const target = new EventTarget();
-  const controller = new AbortController();
-
-  target.addEventListener('testevent', t.step_func(() => {
-    assert_unreached('testevent should have been canceled by AbortController');
-  }), {signal: controller.signal});
-
-  controller.abort();
-  target.dispatchEvent(new Event('testevent'));
-}, 'Tests support for EventController to cancel event listeners in addEventListener.');
-
-test(t => {
-  const target = new EventTarget();
-  const controller = new AbortController();
-
-  target.addEventListener('testevent', t.step_func(() => {
-    assert_unreached('testevent should have been canceled by AbortController');
-  }), {signal: controller.signal, capture: true});
-
-  controller.abort();
-  target.dispatchEvent(new Event('testevent'));
-}, 'Tests support for EventController to cancel capture event listeners in addEventListener.');
-
-test(function() {
-  let count = 0;
-  function handler() {
-    count++;
-  }
-  const et = new EventTarget();
-  const controller = new AbortController();
-  et.addEventListener('test', handler, { signal: controller.signal });
-  et.dispatchEvent(new Event('test'));
-  assert_equals(count, 1, "Adding a signal still adds a listener");
-  et.dispatchEvent(new Event('test'));
-  assert_equals(count, 2, "The listener was not added with the once flag");
-  controller.abort();
-  et.dispatchEvent(new Event('test'));
-  assert_equals(count, 2, "Aborting on the controller removes the listener");
-  et.addEventListener('test', handler, { signal: controller.signal });
-  et.dispatchEvent(new Event('test'));
-  assert_equals(count, 2, "Passing an aborted signal never adds the handler");
-}, "Passing an AbortSignal to addEventListener options should allow removing a listener");
-</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-signal.any.js b/tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-signal.any.js
new file mode 100644
index 00000000000..42871061f3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-signal.any.js
@@ -0,0 +1,133 @@
+'use strict';
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 1, "Adding a signal still adds a listener");
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 2, "The listener was not added with the once flag");
+  controller.abort();
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 2, "Aborting on the controller removes the listener");
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 2, "Passing an aborted signal never adds the handler");
+}, "Passing an AbortSignal to addEventListener options should allow removing a listener");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.removeEventListener('test', handler);
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to addEventListener does not prevent removeEventListener");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal, once: true });
+  controller.abort();
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to addEventListener works with the once flag");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal, once: true });
+  et.removeEventListener('test', handler);
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Removing a once listener works with a passed signal");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('first', handler, { signal: controller.signal, once: true });
+  et.addEventListener('second', handler, { signal: controller.signal, once: true });
+  controller.abort();
+  et.dispatchEvent(new Event('first'));
+  et.dispatchEvent(new Event('second'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to multiple listeners");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal, capture: true });
+  controller.abort();
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to addEventListener works with the capture flag");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', () => {
+    controller.abort();
+  }, { signal: controller.signal });
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Aborting from a listener does not call future listeners");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', () => {
+    et.addEventListener('test', handler, { signal: controller.signal });
+    controller.abort();
+  }, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Adding then aborting a listener in another listener does not call it");
+
+test(function() {
+  const et = new EventTarget();
+  const ac = new AbortController();
+  let count = 0;
+  et.addEventListener('foo', () => {
+    et.addEventListener('foo', () => {
+      count++;
+      if (count > 5) ac.abort();
+      et.dispatchEvent(new Event('foo'));
+    }, { signal: ac.signal });
+    et.dispatchEvent(new Event('foo'));
+  }, { once: true });
+  et.dispatchEvent(new Event('foo'));
+}, "Aborting from a nested listener should remove it");
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js
new file mode 100644
index 00000000000..8f49a5cbedd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js
@@ -0,0 +1,31 @@
+// META: script=resources/support.js
+//
+// Spec: https://wicg.github.io/cors-rfc1918/#integration-fetch
+//
+// This file covers only those tests that must execute in a non secure context.
+// Other tests are defined in: secure-context.window.js
+
+setup(() => {
+  // Making sure we are in a non secure context, as expected.
+  assert_false(window.isSecureContext);
+});
+
+promise_test(async t => {
+  return fetch("/common/blank.html")
+      .catch(reason => {unreached_func(reason)});
+}, "Local non secure page fetches local page.");
+
+// For the following tests, we go through an iframe, because it is not possible
+// to directly import the test harness from a secured public page.
+promise_test(async t => {
+  let iframe = await appendIframe(t, document,
+      "resources/treat-as-public-address.html");
+  let reply = futureMessage();
+  iframe.contentWindow.postMessage("/common/blank.html", "*");
+  assert_equals(await reply, "failure");
+}, "Public non secure page fetches local page.");
+
+// TODO(https://github.com/web-platform-tests/wpt/issues/26166):
+// Add tests for public variations when we are able to fetch resources using a
+// mechanism compatible with WPT guidelines regarding being self-contained.
+
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/support.js b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/support.js
new file mode 100644
index 00000000000..be49c515ef5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/support.js
@@ -0,0 +1,34 @@
+// Creates a new iframe in |doc|, calls |func| on it and appends it as a child
+// of |doc|.
+// Returns a promise that resolves to the iframe once loaded (successfully or
+// not).
+// The iframe is removed from |doc| once test |t| is done running.
+//
+// NOTE: Because iframe elements always invoke the onload event handler, even
+// in case of error, we cannot wire onerror to a promise rejection. The Promise
+// constructor requires users to resolve XOR reject the promise.
+function appendIframeWith(t, doc, func) {
+  return new Promise(resolve => {
+      const child = doc.createElement("iframe");
+      func(child);
+      child.onload = () => { resolve(child); };
+      doc.body.appendChild(child);
+      t.add_cleanup(() => { doc.body.removeChild(child); });
+    });
+}
+
+// Appends a child iframe to |doc| sourced from |src|.
+//
+// See append_child_frame_with() for more details.
+function appendIframe(t, doc, src) {
+  return appendIframeWith(t, doc, child => { child.src = src; });
+}
+
+// Register an event listener that will resolve this promise when this
+// window receives a message posted to it.
+function futureMessage() {
+  return new Promise(resolve => {
+      window.addEventListener("message", e => resolve(e.data));
+  });
+};
+
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html
new file mode 100644
index 00000000000..7a8f6f09a51
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html
@@ -0,0 +1,8 @@
+<script>
+  window.addEventListener("message", function (event) {
+    fetch(event.data)
+        .then(response => {parent.postMessage("success", "*")})
+        .catch(error => {parent.postMessage("failure", "*")});
+  });
+</script>
+
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers
new file mode 100644
index 00000000000..76371c6209e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: treat-as-public-address;
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html
new file mode 100644
index 00000000000..7a8f6f09a51
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html
@@ -0,0 +1,8 @@
+<script>
+  window.addEventListener("message", function (event) {
+    fetch(event.data)
+        .then(response => {parent.postMessage("success", "*")})
+        .catch(error => {parent.postMessage("failure", "*")});
+  });
+</script>
+
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers
new file mode 100644
index 00000000000..76371c6209e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: treat-as-public-address;
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js
new file mode 100644
index 00000000000..8ed028a390c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js
@@ -0,0 +1,31 @@
+// META: script=resources/support.js
+//
+// Spec: https://wicg.github.io/cors-rfc1918/#integration-fetch
+//
+// This file covers only those tests that must execute in a secure context.
+// Other tests are defined in: non-secure-context.window.js
+
+setup(() => {
+  // Making sure we are in a secure context, as expected.
+  assert_true(window.isSecureContext);
+});
+
+promise_test(async t => {
+  return fetch("/common/blank.html")
+      .catch(reason => {unreached_func(reason)});
+}, "Local secure page fetches local page.");
+
+// For the following tests, we go through an iframe, because it is not possible
+// to directly import the test harness from a secured public page.
+promise_test(async t => {
+  let iframe = await appendIframe(t, document,
+      "resources/treat-as-public-address.https.html");
+  let reply = futureMessage();
+  iframe.contentWindow.postMessage("/common/blank.html", "*");
+  assert_equals(await reply, "success");
+}, "Public secure page fetches local page.");
+
+// TODO(https://github.com/web-platform-tests/wpt/issues/26166):
+// Add tests for public variations when we are able to fetch resources using a
+// mechanism compatible with WPT guidelines regarding being self-contained.
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/select-event.html b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/select-event.html
index 2fb018f82aa..af49024aa2b 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/select-event.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/select-event.html
@@ -43,7 +43,7 @@ const actions = [
   },
   {
     label: "setRangeText()",
-    action: el => el.setRangeText("newmiddle")
+    action: el => el.setRangeText("newmiddle", el.selectionStart, el.selectionEnd, "select")
   }
 ];
 
@@ -79,6 +79,19 @@ els.forEach((el) => {
         }, 200);
       });
     }, `${elLabel}: ${action.label} a second time (must not fire select)`);
+
+    promise_test(async t => {
+      const element = el.cloneNode(true);
+
+      element.onselect = e => {
+        element.onselect = null;
+      };
+
+      action.action(element);
+
+      // step_wait properly timeouts before the whole test collapses
+      await t.step_wait(() => !element.onselect, "event didn't fire", 200, 10);
+    }, `${elLabel}: ${action.label} disconnected node`);
   });
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection.html b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection.html
index b5cea0511d1..e216d953cef 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection.html
@@ -95,12 +95,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionStart, el.value.length,
                     "SelectionStart offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionStart, 0, "SelectionStart offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionStart offset for input that is " +
          (append ? "appended" : " not appended"));
   }
@@ -112,12 +109,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionStart, el.value.length,
                     "SelectionStart offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionStart, 0, "SelectionStart offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionStart offset for textarea that is " +
          (append ? "appended" : " not appended"));
   }
@@ -129,12 +123,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionEnd, el.value.length,
                     "SelectionEnd offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionEnd, el.value.length, "SelectionEnd offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionEnd offset for input that is " +
          (append ? "appended" : " not appended"));
   }
@@ -147,12 +138,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionEnd, el.value.length,
                     "SelectionEnd offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionEnd, el.value.length, "SelectionEnd offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionEnd offset for textarea that is " +
          (append ? "appended" : " not appended"));
   }
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html b/tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html
index 887b7474d63..d75bebba475 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html
@@ -18,6 +18,7 @@ const promises = [];
 
 for (const json of [
   'resources/empty-import-map-internal.json',
+  'resources/url-specifiers-schemes-internal.json'
 ]) {
   promise_test(() => {
       const promise = runTestsFromJSON(json);
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map-internal.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map-internal.json
index 59390c89f6b..42033a2c079 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map-internal.json
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map-internal.json
@@ -10,6 +10,7 @@
     },
     "non-fetch scheme absolute URLs": {
       "expectedResults": {
+        "about:fetch-scheme": "about:fetch-scheme",
         "mailto:non-fetch-scheme": "mailto:non-fetch-scheme",
         "import:non-fetch-scheme": "import:non-fetch-scheme",
         "javascript:non-fetch-scheme": "javascript:non-fetch-scheme",
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
index 6b8f0135f50..6ff330cc5a7 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
@@ -6,7 +6,9 @@
       "lodash-dot": "./node_modules/lodash-es/lodash.js",
       "lodash-dot/": "./node_modules/lodash-es/",
       "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-      "lodash-dotdot/": "../node_modules/lodash-es/"
+      "lodash-dotdot/": "../node_modules/lodash-es/",
+      "mapped/": "https://example.com/",
+      "mapped/path/": "https://github.com/WICG/import-maps/issues/207/"
     }
   },
   "importMapBaseURL": "https://example.com/app/index.html",
@@ -38,6 +40,18 @@
         "underscore/": null,
         "underscore/foo": null
       }
+    },
+    "backtracking via ..": {
+      "expectedResults": {
+        "mapped/path": "https://example.com/path",
+        "mapped/path/": "https://github.com/WICG/import-maps/issues/207/",
+        "mapped/path/..": null,
+        "mapped/path/../backtrack": null,
+        "mapped/path/../../backtrack": null,
+        "mapped/path/../../../backtrack": null,
+        "moment/../backtrack": null,
+        "moment/..": null
+      }
     }
   }
 }
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js
index 0f53aea5b4b..579fd52da8c 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js
@@ -83,7 +83,7 @@ function resolve(specifier, parsedImportMap, baseURL, expectedURL) {
           if (event.data.result === 'TypeError') {
             reject(new TypeError(event.data.message));
           } else {
-            reject(new Error(event.data.result));
+            reject(new Error(event.data.message));
           }
         } else {
           assert_unreached('Invalid message: ' + event.data.type);
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json
new file mode 100644
index 00000000000..58a97642c2b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json
@@ -0,0 +1,45 @@
+{
+  "importMap": {
+    "imports": {
+      "data:text/": "/lib/test-data/",
+      "about:text/": "/lib/test-about/",
+      "blob:text/": "/lib/test-blob/",
+      "blah:text/": "/lib/test-blah/",
+      "http:text/": "/lib/test-http/",
+      "https:text/": "/lib/test-https/",
+      "file:text/": "/lib/test-file/",
+      "ftp:text/": "/lib/test-ftp/",
+      "ws:text/": "/lib/test-ws/",
+      "wss:text/": "/lib/test-wss/"
+    }
+  },
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "URL-like specifiers",
+  "tests": {
+    "Non-special vs. special schemes": {
+      "expectedResults": {
+        "data:text/javascript,console.log('foo')": "data:text/javascript,console.log('foo')",
+        "data:text/": "https://example.com/lib/test-data/",
+        "about:text/foo": "about:text/foo",
+        "about:text/": "https://example.com/lib/test-about/",
+        "blob:text/foo": "blob:text/foo",
+        "blob:text/": "https://example.com/lib/test-blob/",
+        "blah:text/foo": "blah:text/foo",
+        "blah:text/": "https://example.com/lib/test-blah/",
+        "http:text/foo": "https://example.com/lib/test-http/foo",
+        "http:text/": "https://example.com/lib/test-http/",
+        "https:text/foo": "https://example.com/lib/test-https/foo",
+        "https:text/": "https://example.com/lib/test-https/",
+        "ftp:text/foo": "https://example.com/lib/test-ftp/foo",
+        "ftp:text/": "https://example.com/lib/test-ftp/",
+        "file:text/foo": "https://example.com/lib/test-file/foo",
+        "file:text/": "https://example.com/lib/test-file/",
+        "ws:text/foo": "https://example.com/lib/test-ws/foo",
+        "ws:text/": "https://example.com/lib/test-ws/",
+        "wss:text/foo": "https://example.com/lib/test-wss/foo",
+        "wss:text/": "https://example.com/lib/test-wss/"
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json
index aff55c4d9dd..6fcf7f46635 100644
--- a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json
@@ -16,7 +16,7 @@
   "baseURL": "https://example.com/js/app.mjs",
   "name": "URL-like specifiers",
   "tests": {
-    "Ordinal URL-like specifiers": {
+    "Ordinary URL-like specifiers": {
       "expectedResults": {
         "https://example.com/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
         "https://///example.com/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
@@ -47,6 +47,22 @@
       "expectedResults": {
         "/test": "https://example.com/lib/test2.mjs"
       }
+    },
+    "backtracking (relative URLs)": {
+      "expectedResults": {
+        "/test/..": "https://example.com/lib/slash-only/",
+        "/test/../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "/test/../../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "/test/../../../backtrack": "https://example.com/lib/slash-only/backtrack"
+      }
+    },
+    "backtracking (absolute URLs)": {
+      "expectedResults": {
+        "https://example.com/test/..": "https://example.com/lib/slash-only/",
+        "https://example.com/test/../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "https://example.com/test/../../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "https://example.com/test/../../../backtrack": "https://example.com/lib/slash-only/backtrack"
+      }
     }
   }
 }
diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/web-platform-tests/interfaces/dom.idl
index d404be2aea5..9d371fbe7c5 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom.idl
@@ -79,6 +79,7 @@ dictionary EventListenerOptions {
 dictionary AddEventListenerOptions : EventListenerOptions {
   boolean passive = false;
   boolean once = false;
+  AbortSignal signal;
 };
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc.idl b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
index e58df13b02c..cd34d3f3782 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
@@ -373,7 +373,6 @@ dictionary RTCRtpContributingSource {
 };
 
 dictionary RTCRtpSynchronizationSource : RTCRtpContributingSource {
-  boolean voiceActivityFlag;
 };
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse.html
similarity index 90%
rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse.html
index 127b07a9ee0..080ca1520d9 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse.html
@@ -6,6 +6,9 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
+        <script src="/resources/testdriver.js"></script>
+        <script src="/resources/testdriver-actions.js"></script>
+        <script src="/resources/testdriver-vendor.js"></script>
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
     </head>
@@ -53,6 +56,7 @@
             var test_lostpointercapture = async_test("lostpointercapture event received");
 
             var test_pointerover_no_capture = async_test("pointerover event without capture received");
+
             var test_pointerover_capture = async_test("pointerover event with capture received");
 
             var test_pointerout_no_capture = async_test("pointerout event without capture received");
@@ -64,6 +68,8 @@
             var test_pointerleave_no_capture = async_test("pointerleave event without capture received");
             var test_pointerleave_after_capture = async_test("pointerleave event after lostpointercapture received");
 
+            var actions_promise;
+
             window.onload = function() {
                 on_event(captureButton, 'pointerdown', function(e) {
                     if(isPointerCapture == false) {
@@ -147,7 +153,10 @@
                     }
                     else {
                         if (lostPointerCaptureReceived) {
-                            test_pointerleave_after_capture.done();
+                            // Make sure the test finishes after all the input actions are completed.
+                            actions_promise.then( () => {
+                                test_pointerleave_after_capture.done();
+                            });
                         } else {
                             test_pointerleave_no_capture.done();
                         }
@@ -190,6 +199,20 @@
                         }, "pointerleave shouldn't trigger for the purple rectangle while the black rectangle has capture");
                     }
                 });
+
+                actions_promise = new test_driver.Actions()
+                    .pointerMove(0, 0, {origin: target0})
+                    .pointerMove(0, 0, {origin: target1})
+                    .pointerMove(0, 0, {origin: btnCapture})
+                    .pointerDown()
+                    .pointerMove(0, 0, {origin: btnCapture})
+                    .pointerMove(10, 0, {origin: btnCapture})
+                    .pointerMove(0, 0, {origin: target1})
+                    .pointerMove(0, 0, {origin: target0})
+                    .pointerMove(0, 0, {origin: target1})
+                    .pointerUp()
+                    .pointerMove(0, 0, {origin: target1})
+                    .send();
             }
         </script>
         <h1>Pointer Events Capture Test</h1>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html
similarity index 66%
rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates-manual.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html
index e0e2fdcd621..b106340efd5 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates-manual.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html
@@ -6,6 +6,9 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
+        <script src="/resources/testdriver.js"></script>
+        <script src="/resources/testdriver-actions.js"></script>
+        <script src="/resources/testdriver-vendor.js"></script>
         <script type="text/javascript" src="pointerevent_support.js"></script>
         <style>
             #innerFrame {
@@ -43,6 +46,48 @@
                 eventsRecieved[event.type] = true;
             }
 
+            function testInputType(inputSource) {
+              const scale = 5;
+              const width = 3;
+              const height = 3;
+              var targetFrame = document.querySelector('#innerFrame');
+              var frameRect = targetFrame.getBoundingClientRect();
+              frameLeft = frameRect.left;
+              frameTop = frameRect.top;
+
+              target = [{x: 10, y: 10}, {x: 30, y: 50}, {x: 50, y: 30}]
+              xPosition = []
+              yPosition = []
+              for (var i = 0; i < target.length; i++) {
+                xPosition.push((target[i].x + width / 2.0) * scale + frameLeft);
+                yPosition.push((target[i].y + height / 2.0) * scale + frameTop);
+              }
+              return sendInputAt(inputSource, xPosition[0], yPosition[0]).then(function() {
+                return sendInputAt(inputSource, xPosition[1], yPosition[1]);
+              }).then(function() {
+                return sendInputAt(inputSource, xPosition[2], yPosition[2]);
+              });
+
+            }
+
+            function sendInputAt(inputSource, xPosition, yPosition) {
+              if (inputSource == "touch") {
+                return new test_driver.Actions()
+                  .addPointer("touchPointer1", "touch")
+                  .pointerMove(Math.ceil(xPosition), Math.ceil(yPosition))
+                  .pointerDown()
+                  .pointerMove(Math.ceil(xPosition + 1), Math.ceil(yPosition + 1))
+                  .pointerUp()
+                  .send();
+              } else {
+                return new test_driver.Actions()
+                  .pointerMove(Math.ceil(xPosition), Math.ceil(yPosition))
+                  .pointerDown()
+                  .pointerUp()
+                  .send();
+              }
+            }
+
             function run() {
                 var test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", ALL_POINTERS);
                 var innerFrame = document.getElementById('innerFrame');
@@ -70,6 +115,12 @@
                       }
                     });
                 });
+
+                testInputType("mouse").then(function() {
+                    return testInputType("touch");
+                }).then(function() {
+                    return testInputType("pen");
+                });
             }
         </script>
     </head>
diff --git a/tests/wpt/web-platform-tests/serial/resources/common.js b/tests/wpt/web-platform-tests/serial/resources/common.js
new file mode 100644
index 00000000000..5177f83a865
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/resources/common.js
@@ -0,0 +1,33 @@
+// Compare two Uint8Arrays.
+function compareArrays(actual, expected) {
+  assert_true(actual instanceof Uint8Array, 'actual is Uint8Array');
+  assert_true(expected instanceof Uint8Array, 'expected is Uint8Array');
+  assert_equals(actual.byteLength, expected.byteLength, 'lengths equal');
+  for (let i = 0; i < expected.byteLength; ++i)
+    assert_equals(actual[i], expected[i], `Mismatch at position ${i}.`);
+}
+
+// Reads from |reader| until at least |targetLength| is read or the stream is
+// closed. The data is returned as a combined Uint8Array.
+async function readWithLength(reader, targetLength) {
+  const chunks = [];
+  let actualLength = 0;
+
+  while (true) {
+    let {value, done} = await reader.read();
+    chunks.push(value);
+    actualLength += value.byteLength;
+
+    if (actualLength >= targetLength || done) {
+      // It would be better to allocate |buffer| up front with the number of
+      // of bytes expected but this is the best that can be done without a
+      // BYOB reader to control the amount of data read.
+      const buffer = new Uint8Array(actualLength);
+      chunks.reduce((offset, chunk) => {
+        buffer.set(chunk, offset);
+        return offset + chunk.byteLength;
+      }, 0);
+      return buffer;
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/serial/resources/manual.js b/tests/wpt/web-platform-tests/serial/resources/manual.js
new file mode 100644
index 00000000000..4ac46b6decc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/resources/manual.js
@@ -0,0 +1,38 @@
+let manualTestPort = null;
+
+navigator.serial.addEventListener('disconnect', (e) => {
+  if (e.port === manualTestPort) {
+    manualTestPort = null;
+  }
+})
+
+async function getPortForManualTest() {
+  if (manualTestPort) {
+    return manualTestPort;
+  }
+
+  const button = document.createElement('button');
+  button.textContent = 'Click to select a device';
+  button.style.display = 'block';
+  button.style.fontSize = '20px';
+  button.style.padding = '10px';
+
+  await new Promise((resolve) => {
+    button.onclick = () => {
+      document.body.removeChild(button);
+      resolve();
+    };
+    document.body.appendChild(button);
+  });
+
+  manualTestPort = await navigator.serial.requestPort({filters: []});
+  assert_true(manualTestPort instanceof SerialPort);
+
+  return manualTestPort;
+}
+
+function manual_loopback_serial_test(func, name, properties) {
+  promise_test(async (test) => {
+    await func(test, await getPortForManualTest());
+  }, name, properties);
+}
diff --git a/tests/wpt/web-platform-tests/serial/serialPort_disconnect-manual.https.html b/tests/wpt/web-platform-tests/serial/serialPort_disconnect-manual.https.html
new file mode 100644
index 00000000000..3a2e13400c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/serialPort_disconnect-manual.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/common.js"></script>
+    <script src="resources/manual.js"></script>
+  </head>
+  <body>
+    <p>
+      These tests require a serial device to be connected and disconnected.
+    </p>
+    <script>
+      manual_loopback_serial_test(async (t, port) => {
+        const watcher = new EventWatcher(t, navigator.serial, ['disconnect']);
+
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        const disconnectPromise = watcher.wait_for(['disconnect'])
+        const reader = port.readable.getReader();
+
+        const disconnectMessage = document.createElement('div');
+        disconnectMessage.textContent = 'Disconnect the device now.';
+        document.body.appendChild(disconnectMessage);
+
+        try {
+          while (true) {
+            const {value, done} = await reader.read();
+            // Ignore |value| in case the device happens to produce data. It is
+            // not important for this test.
+            assert_false(done);
+          }
+        } catch (e) {
+          assert_equals(e.constructor, DOMException);
+          assert_equals(e.name, 'NetworkError');
+        }
+        reader.releaseLock();
+        assert_equals(port.readable, null);
+
+        let event = await disconnectPromise;
+        assert_equals(event.target, port);
+
+        disconnectMessage.remove();
+
+        await port.close();
+      }, 'Disconnect during read is detected.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        const watcher = new EventWatcher(t, navigator.serial, ['disconnect']);
+
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        const disconnectPromise = watcher.wait_for(['disconnect'])
+        const writer = port.writable.getWriter();
+
+        const disconnectMessage = document.createElement('div');
+        disconnectMessage.textContent = 'Disconnect the device now.';
+        document.body.appendChild(disconnectMessage);
+
+        const data = new Uint8Array(4096);
+        try {
+          while (true) {
+            await writer.write(data);
+          }
+        } catch (e) {
+          assert_equals(e.constructor, DOMException);
+          assert_equals(e.name, 'NetworkError');
+        }
+        writer.releaseLock();
+        assert_equals(port.writable, null);
+
+        let event = await disconnectPromise;
+        assert_equals(event.target, port);
+
+        disconnectMessage.remove();
+
+        await port.close();
+      }, 'Disconnect during write is detected.');
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/serial/serialPort_loopback-manual.https.html b/tests/wpt/web-platform-tests/serial/serialPort_loopback-manual.https.html
new file mode 100644
index 00000000000..9e7801d8332
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/serialPort_loopback-manual.https.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/common.js"></script>
+    <script src="resources/manual.js"></script>
+  </head>
+  <body>
+    <p>
+      These tests require a connected serial device configured to act as a
+      "loopback" device, with the transmit and receive pins wired together.
+    </p>
+    <script>
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        // Create something much smaller than bufferSize above.
+        const data = new Uint8Array(64);
+        for (let i = 0; i < data.byteLength; ++i)
+          data[i] = i & 0xff;
+
+        const reader = port.readable.getReader();
+
+        for (let i = 0; i < 10; ++i) {
+          const writer = port.writable.getWriter();
+          writer.write(data);
+          const writePromise = writer.close();
+
+          const value = await readWithLength(reader, data.byteLength);
+          await writePromise;
+
+          compareArrays(value, data);
+        }
+
+        reader.releaseLock();
+        await port.close();
+      }, 'Can perform a series of small writes.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        // Create something much larger than bufferSize above.
+        const data = new Uint8Array(10 * 1024);
+        for (let i = 0; i < data.byteLength; ++i)
+          data[i] = (i / 1024) & 0xff;
+
+        const reader = port.readable.getReader();
+
+        for (let i = 0; i < 10; ++i) {
+          const writer = port.writable.getWriter();
+          writer.write(data);
+          const writePromise = writer.close();
+
+          const value = await readWithLength(reader, data.byteLength);
+          await writePromise;
+
+          compareArrays(value, data);
+        }
+
+        reader.releaseLock();
+        await port.close();
+      }, 'Can perform a series of large writes.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 64});
+
+        const writer = port.writable.getWriter();
+        // |data| is small enough to be completely transmitted.
+        let data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
+        await writer.write(data);
+
+        // Wait a little bit for the device to process the incoming data.
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        // ...before discarding the receive buffers.
+        await port.readable.cancel();
+
+        data = new Uint8Array([9, 10, 11, 12, 13, 14, 15, 16]);
+        const reader = port.readable.getReader();
+        const readPromise = readWithLength(reader, data.byteLength);
+
+        // The next block of data should be received successfully.
+        await writer.write(data);
+        writer.releaseLock();
+
+        const value = await readPromise;
+        reader.releaseLock();
+
+        compareArrays(value, data);
+
+        await port.close();
+      }, 'Canceling the reader discards buffered data.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        // Create something much larger than bufferSize above.
+        const data = new Uint8Array(16 * 1024);
+        for (let i = 0; i < data.byteLength; ++i)
+          data[i] = (i / 1024) & 0xff;
+
+        // Completely write |data| to the port without waiting for it to be
+        // received.
+        const writer = port.writable.getWriter();
+        writer.write(data);
+        await writer.close();
+
+        const reader = port.readable.getReader();
+        const chunks = [];
+        let actualLength = 0;
+        while (true) {
+          try {
+            const {value, done} = await reader.read();
+            if (value) {
+              actualLength += value.byteLength;
+              chunks.push(value);
+            }
+            if (done) {
+              assert_unreached("Unexpected end of stream.");
+              break;
+            }
+          } catch (e) {
+            assert_equals(e.name, 'BufferOverrunError');
+            break;
+          }
+        }
+        reader.releaseLock();
+
+        const buffer = new Uint8Array(actualLength);
+        chunks.reduce((offset, chunk) => {
+          buffer.set(chunk, offset);
+          return offset + chunk.byteLength;
+        }, 0);
+
+        assert_greater_than(actualLength, 0);
+        compareArrays(buffer, data.slice(0, actualLength));
+
+        await port.close();
+      }, 'Overflowing the receive buffer triggers an error.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        let reader = port.readable.getReader();
+        let readPromise = (async () => {
+          // A single zero byte will be read before the break is detected.
+          const {value, done} = await reader.read();
+          compareArrays(value, new Uint8Array([0]));
+          assert_false(done);
+
+          try {
+            const {value, done} = await reader.read();
+            assert_unreached(`Expected break, got ${value.byteLength} bytes`);
+          } catch (e) {
+            assert_equals(e.constructor, DOMException);
+            assert_equals(e.name, 'BreakError');
+          }
+        })();
+
+        await port.setSignals({break: true});
+        await readPromise;
+        await port.setSignals({break: false});
+
+        const writer = port.writable.getWriter();
+        // |data| is small enough to be completely transmitted.
+        let data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
+        await writer.write(data);
+        writer.releaseLock();
+
+        reader = port.readable.getReader();
+        const buffer = await readWithLength(reader, data.byteLength);;
+        compareArrays(buffer, data);
+        reader.releaseLock();
+
+        await port.close();
+      }, 'Break is detected.');
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/tools/third_party/enum/PKG-INFO b/tests/wpt/web-platform-tests/tools/third_party/enum/PKG-INFO
index 98927c4d99d..623171e38f6 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/enum/PKG-INFO
+++ b/tests/wpt/web-platform-tests/tools/third_party/enum/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: enum34
-Version: 1.1.6
+Version: 1.1.10
 Summary: Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4
 Home-page: https://bitbucket.org/stoneleaf/enum34
 Author: Ethan Furman
@@ -57,6 +57,4 @@ Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
 Provides: enum
diff --git a/tests/wpt/web-platform-tests/tools/third_party/enum/enum/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/enum/enum/__init__.py
index d6ffb3a40fe..51f3cf24706 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/enum/enum/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/enum/enum/__init__.py
@@ -4,7 +4,7 @@ import sys as _sys
 
 __all__ = ['Enum', 'IntEnum', 'unique']
 
-version = 1, 1, 6
+version = 1, 1, 10
 
 pyver = float('%s.%s' % _sys.version_info[:2])
 
@@ -183,7 +183,8 @@ class EnumMeta(type):
         else:
             del classdict['_order_']
             if pyver < 3.0:
-                _order_ = _order_.replace(',', ' ').split()
+                if isinstance(_order_, basestring):
+                    _order_ = _order_.replace(',', ' ').split()
                 aliases = [name for name in members if name not in _order_]
                 _order_ += aliases
 
@@ -463,7 +464,7 @@ class EnumMeta(type):
             _order_.append(member_name)
         # only set _order_ in classdict if name/value was not from a mapping
         if not isinstance(item, basestring):
-            classdict['_order_'] = ' '.join(_order_)
+            classdict['_order_'] = _order_
         enum_class = metacls.__new__(metacls, class_name, bases, classdict)
 
         # TODO: replace the frame hack if a blessed way to know the calling
diff --git a/tests/wpt/web-platform-tests/tools/third_party/enum/enum/doc/enum.pdf b/tests/wpt/web-platform-tests/tools/third_party/enum/enum/doc/enum.pdf
deleted file mode 100644
index 8c1383a495e..00000000000
--- a/tests/wpt/web-platform-tests/tools/third_party/enum/enum/doc/enum.pdf
+++ /dev/null
@@ -1,2237 +0,0 @@
-%PDF-1.4
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<< /F1 2 0 R /F2 3 0 R /F3 4 0 R /F4 5 0 R /F5 8 0 R /F6 15 0 R >>
-endobj
-2 0 obj
-<< /BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font >>
-endobj
-3 0 obj
-<< /BaseFont /Courier-Bold /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font >>
-endobj
-4 0 obj
-<< /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding /Name /F3 /Subtype /Type1 /Type /Font >>
-endobj
-5 0 obj
-<< /BaseFont /Courier /Encoding /WinAnsiEncoding /Name /F4 /Subtype /Type1 /Type /Font >>
-endobj
-6 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 639.3236 0 ] /Rect [ 335.1805 574.4272 405.2473 586.4272 ] /Subtype /Link /Type /Annot >>
-endobj
-7 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 639.3236 0 ] /Rect [ 255.9742 427.4272 321.5378 439.4272 ] /Subtype /Link /Type /Annot >>
-endobj
-8 0 obj
-<< /BaseFont /Helvetica-Oblique /Encoding /WinAnsiEncoding /Name /F5 /Subtype /Type1 /Type /Font >>
-endobj
-9 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 26 0 R /XYZ 62.69291 278.1236 0 ] /Rect [ 82.69291 182.2272 201.0729 194.2272 ] /Subtype /Link /Type /Annot >>
-endobj
-10 0 obj
-<< /Annots [ 6 0 R 7 0 R 9 0 R ] /Contents 56 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-11 0 obj
-<< /Contents 57 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-12 0 obj
-<< /Contents 58 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-13 0 obj
-<< /Contents 59 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-14 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 157.2236 0 ] /Rect [ 101.6029 741.7736 141.6229 753.7736 ] /Subtype /Link /Type /Annot >>
-endobj
-15 0 obj
-<< /BaseFont /Helvetica-BoldOblique /Encoding /WinAnsiEncoding /Name /F6 /Subtype /Type1 /Type /Font >>
-endobj
-16 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 25 0 R /XYZ 62.69291 359.6236 0 ] /Rect [ 327.1529 585.5736 392.7329 597.5736 ] /Subtype /Link /Type /Annot >>
-endobj
-17 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 639.3236 0 ] /Rect [ 181.1917 312.1736 246.4634 324.1736 ] /Subtype /Link /Type /Annot >>
-endobj
-18 0 obj
-<< /Annots [ 14 0 R 16 0 R 17 0 R ] /Contents 60 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-19 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 26 0 R /XYZ 62.69291 610.8236 0 ] /Rect [ 326.1329 511.3736 357.2629 523.3736 ] /Subtype /Link /Type /Annot >>
-endobj
-20 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 25 0 R /XYZ 62.69291 359.6236 0 ] /Rect [ 241.1229 185.9736 306.7029 197.9736 ] /Subtype /Link /Type /Annot >>
-endobj
-21 0 obj
-<< /Annots [ 19 0 R 20 0 R ] /Contents 61 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-22 0 obj
-<< /Contents 62 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-23 0 obj
-<< /Contents 63 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-24 0 obj
-<< /Contents 64 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-25 0 obj
-<< /Contents 65 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-26 0 obj
-<< /Contents 66 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-27 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 26 0 R /XYZ 62.69291 610.8236 0 ] /Rect [ 309.4094 299.5736 340.6461 311.5736 ] /Subtype /Link /Type /Annot >>
-endobj
-28 0 obj
-<< /Annots [ 27 0 R ] /Contents 67 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-29 0 obj
-<< /Outlines 31 0 R /PageLabels 68 0 R /PageMode /UseNone /Pages 55 0 R /Type /Catalog >>
-endobj
-30 0 obj
-<< /Author () /CreationDate (D:20160515202831+08'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) 
-  /Title (enum --- support for enumerations) >>
-endobj
-31 0 obj
-<< /Count 27 /First 32 0 R /Last 51 0 R /Type /Outlines >>
-endobj
-32 0 obj
-<< /Dest [ 10 0 R /XYZ 62.69291 660.6772 0 ] /Next 33 0 R /Parent 31 0 R /Title (Module Contents) >>
-endobj
-33 0 obj
-<< /Dest [ 10 0 R /XYZ 62.69291 477.6772 0 ] /Next 34 0 R /Parent 31 0 R /Prev 32 0 R /Title (Creating an Enum) >>
-endobj
-34 0 obj
-<< /Dest [ 11 0 R /XYZ 62.69291 197.0236 0 ] /Next 35 0 R /Parent 31 0 R /Prev 33 0 R /Title (Programmatic access to enumeration members and their attributes) >>
-endobj
-35 0 obj
-<< /Dest [ 12 0 R /XYZ 62.69291 501.4236 0 ] /Next 36 0 R /Parent 31 0 R /Prev 34 0 R /Title (Duplicating enum members and values) >>
-endobj
-36 0 obj
-<< /Dest [ 13 0 R /XYZ 62.69291 215.0236 0 ] /Next 37 0 R /Parent 31 0 R /Prev 35 0 R /Title (Comparisons) >>
-endobj
-37 0 obj
-<< /Dest [ 18 0 R /XYZ 62.69291 362.4236 0 ] /Next 38 0 R /Parent 31 0 R /Prev 36 0 R /Title (Allowed members and attributes of enumerations) >>
-endobj
-38 0 obj
-<< /Dest [ 21 0 R /XYZ 62.69291 498.6236 0 ] /Next 39 0 R /Parent 31 0 R /Prev 37 0 R /Title (Restricted subclassing of enumerations) >>
-endobj
-39 0 obj
-<< /Dest [ 21 0 R /XYZ 62.69291 173.2236 0 ] /Next 40 0 R /Parent 31 0 R /Prev 38 0 R /Title (Pickling) >>
-endobj
-40 0 obj
-<< /Dest [ 22 0 R /XYZ 62.69291 635.8236 0 ] /Next 41 0 R /Parent 31 0 R /Prev 39 0 R /Title (Functional API) >>
-endobj
-41 0 obj
-<< /Count 2 /Dest [ 22 0 R /XYZ 62.69291 187.2236 0 ] /First 42 0 R /Last 43 0 R /Next 44 0 R /Parent 31 0 R 
-  /Prev 40 0 R /Title (Derived Enumerations) >>
-endobj
-42 0 obj
-<< /Dest [ 22 0 R /XYZ 62.69291 154.2236 0 ] /Next 43 0 R /Parent 41 0 R /Title (IntEnum) >>
-endobj
-43 0 obj
-<< /Dest [ 23 0 R /XYZ 62.69291 217.4236 0 ] /Parent 41 0 R /Prev 42 0 R /Title (Others) >>
-endobj
-44 0 obj
-<< /Count 1 /Dest [ 24 0 R /XYZ 62.69291 567.0236 0 ] /First 45 0 R /Last 45 0 R /Next 46 0 R /Parent 31 0 R 
-  /Prev 41 0 R /Title (Decorators) >>
-endobj
-45 0 obj
-<< /Dest [ 24 0 R /XYZ 62.69291 534.0236 0 ] /Parent 44 0 R /Title (unique) >>
-endobj
-46 0 obj
-<< /Count 4 /Dest [ 24 0 R /XYZ 62.69291 356.8236 0 ] /First 47 0 R /Last 50 0 R /Next 51 0 R /Parent 31 0 R 
-  /Prev 44 0 R /Title (Interesting examples) >>
-endobj
-47 0 obj
-<< /Dest [ 24 0 R /XYZ 62.69291 281.8236 0 ] /Next 48 0 R /Parent 46 0 R /Title (AutoNumber) >>
-endobj
-48 0 obj
-<< /Dest [ 25 0 R /XYZ 62.69291 641.8236 0 ] /Next 49 0 R /Parent 46 0 R /Prev 47 0 R /Title (UniqueEnum) >>
-endobj
-49 0 obj
-<< /Dest [ 25 0 R /XYZ 62.69291 356.6236 0 ] /Next 50 0 R /Parent 46 0 R /Prev 48 0 R /Title (OrderedEnum) >>
-endobj
-50 0 obj
-<< /Dest [ 26 0 R /XYZ 62.69291 607.8236 0 ] /Parent 46 0 R /Prev 49 0 R /Title (Planet) >>
-endobj
-51 0 obj
-<< /Count 3 /Dest [ 26 0 R /XYZ 62.69291 274.6236 0 ] /First 52 0 R /Last 54 0 R /Parent 31 0 R /Prev 46 0 R 
-  /Title (How are Enums different?) >>
-endobj
-52 0 obj
-<< /Dest [ 26 0 R /XYZ 62.69291 211.6236 0 ] /Next 53 0 R /Parent 51 0 R /Title (Enum Classes) >>
-endobj
-53 0 obj
-<< /Dest [ 28 0 R /XYZ 62.69291 664.0236 0 ] /Next 54 0 R /Parent 51 0 R /Prev 52 0 R /Title (Enum Members \(aka instances\)) >>
-endobj
-54 0 obj
-<< /Dest [ 28 0 R /XYZ 62.69291 592.0236 0 ] /Parent 51 0 R /Prev 53 0 R /Title (Finer Points) >>
-endobj
-55 0 obj
-<< /Count 12 /Kids [ 10 0 R 11 0 R 12 0 R 13 0 R 18 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 
-  26 0 R 28 0 R ] /Type /Pages >>
-endobj
-56 0 obj
-<< /Length 6458 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 741.0236 cm
-q
-BT 1 0 0 1 0 4 Tm 73.71488 0 Td 24 TL /F2 20 Tf 0 0 0 rg (enum ) Tj /F3 20 Tf 0 0 0 rg (--- support for enumerations) Tj T* -73.71488 0 Td ET
-Q
-Q
-q
-1 0 0 1 62.69291 702.6772 cm
-n 0 14.17323 m 469.8898 14.17323 l S
-Q
-q
-1 0 0 1 62.69291 672.6772 cm
-q
-BT 1 0 0 1 0 14 Tm 2.091318 Tw 12 TL /F1 10 Tf 0 0 0 rg (An enumeration is a set of symbolic names \(members\) bound to unique, constant values. Within an) Tj T* 0 Tw (enumeration, the members can be compared by identity, and the enumeration itself can be iterated over.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 639.6772 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Module Contents) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 609.6772 cm
-q
-BT 1 0 0 1 0 14 Tm 2.027485 Tw 12 TL /F1 10 Tf 0 0 0 rg (This module defines two enumeration classes that can be used to define unique sets of names and) Tj T* 0 Tw (values: ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (IntEnum) Tj /F1 10 Tf 0 0 0 rg (. It also defines one decorator, ) Tj /F4 10 Tf 0 0 0 rg (unique) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 591.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F4 10 Tf 12 TL (Enum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 561.6772 cm
-q
-BT 1 0 0 1 0 14 Tm 1.128443 Tw 12 TL /F1 10 Tf 0 0 0 rg (Base class for creating enumerated constants. See section ) Tj 0 0 .501961 rg (Functional API ) Tj 0 0 0 rg (for an alternate construction) Tj T* 0 Tw (syntax.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 543.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F4 10 Tf 12 TL (IntEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 525.6772 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (Base class for creating enumerated constants that are also subclasses of ) Tj /F4 10 Tf 0 0 0 rg (int) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 507.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F4 10 Tf 12 TL (unique) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 489.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enum class decorator that ensures only one name is bound to any one value.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 456.6772 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Creating an Enum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 414.6772 cm
-q
-BT 1 0 0 1 0 26 Tm 2.432651 Tw 12 TL /F1 10 Tf 0 0 0 rg (Enumerations are created using the ) Tj /F4 10 Tf 0 0 0 rg (class ) Tj /F1 10 Tf 0 0 0 rg (syntax, which makes them easy to read and write. An) Tj T* 0 Tw .533555 Tw (alternative creation method is described in ) Tj 0 0 .501961 rg (Functional API) Tj 0 0 0 rg (. To define an enumeration, subclass ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (as) Tj T* 0 Tw (follows:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 333.4772 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum import Enum) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(Enum\):) Tj T* (...     red = 1) Tj T* (...     green = 2) Tj T* (...     blue = 3) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 313.4772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note: Nomenclature) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 307.4772 cm
-Q
-q
-1 0 0 1 62.69291 229.4772 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 72 cm
-Q
-q
-1 0 0 1 20 72 cm
-Q
-q
-1 0 0 1 20 60 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 -3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The class ) Tj /F4 10 Tf 0 0 0 rg (Color ) Tj /F1 10 Tf 0 0 0 rg (is an ) Tj /F5 10 Tf (enumeration ) Tj /F1 10 Tf (\(or ) Tj /F5 10 Tf (enum) Tj /F1 10 Tf (\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 54 cm
-Q
-q
-1 0 0 1 20 30 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm 5.568863 Tw 12 TL /F1 10 Tf 0 0 0 rg (The attributes ) Tj /F4 10 Tf 0 0 0 rg (Color.red) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (Color.green) Tj /F1 10 Tf 0 0 0 rg (, etc., are ) Tj /F5 10 Tf (enumeration members ) Tj /F1 10 Tf (\(or ) Tj /F5 10 Tf (enum) Tj T* 0 Tw (members) Tj /F1 10 Tf (\).) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 24 cm
-Q
-q
-1 0 0 1 20 0 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm 1.471318 Tw 12 TL /F1 10 Tf 0 0 0 rg (The enum members have ) Tj /F5 10 Tf (names ) Tj /F1 10 Tf (and ) Tj /F5 10 Tf (values ) Tj /F1 10 Tf (\(the name of ) Tj /F4 10 Tf 0 0 0 rg (Color.red ) Tj /F1 10 Tf 0 0 0 rg (is ) Tj /F4 10 Tf 0 0 0 rg (red) Tj /F1 10 Tf 0 0 0 rg (, the value of) Tj T* 0 Tw /F4 10 Tf 0 0 0 rg (Color.blue ) Tj /F1 10 Tf 0 0 0 rg (is ) Tj /F4 10 Tf 0 0 0 rg (3) Tj /F1 10 Tf 0 0 0 rg (, etc.\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 0 cm
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 229.4772 cm
-Q
-q
-1 0 0 1 62.69291 211.4772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 205.4772 cm
-Q
-q
-1 0 0 1 62.69291 181.4772 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-BT 1 0 0 1 0 14 Tm .126235 Tw 12 TL /F1 10 Tf 0 0 0 rg (Even though we use the ) Tj /F4 10 Tf 0 0 0 rg (class ) Tj /F1 10 Tf 0 0 0 rg (syntax to create Enums, Enums are not normal Python classes. See) Tj T* 0 Tw 0 0 .501961 rg (How are Enums different? ) Tj 0 0 0 rg (for more details.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 181.4772 cm
-Q
-q
-1 0 0 1 62.69291 163.4772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumeration members have human readable string representations:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 118.2772 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( print\(Color.red\)) Tj T* (Color.red) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 98.27717 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (...while their ) Tj /F4 10 Tf 0 0 0 rg (repr ) Tj /F1 10 Tf 0 0 0 rg (has more information:) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-57 0 obj
-<< /Length 4174 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 727.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( print\(repr\(Color.red\)\)) Tj T* (<) Tj (Color.red: 1) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 707.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F5 10 Tf (type ) Tj /F1 10 Tf (of an enumeration member is the enumeration it belongs to:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 626.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( type\(Color.red\)) Tj T* (<) Tj (enum 'Color') Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( isinstance\(Color.green, Color\)) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 606.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enum members also have a property that contains just their item name:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 561.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( print\(Color.red.name\)) Tj T* (red) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 529.4236 cm
-q
-BT 1 0 0 1 0 14 Tm .464985 Tw 12 TL /F1 10 Tf 0 0 0 rg (Enumerations support iteration. In Python 3.x definition order is used; in Python 2.x the definition order is) Tj T* 0 Tw (not available, but class attribute ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (is supported; otherwise, value order is used:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 340.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 180 re B*
-Q
-q
-BT 1 0 0 1 0 158 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Shake\(Enum\):) Tj T* (...   __order__ = 'vanilla chocolate cookies mint'  # only needed in 2.x) Tj T* (...   vanilla = 7) Tj T* (...   chocolate = 4) Tj T* (...   cookies = 9) Tj T* (...   mint = 3) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( for shake in Shake:) Tj T* (...   print\(shake\)) Tj T* (...) Tj T* (Shake.vanilla) Tj T* (Shake.chocolate) Tj T* (Shake.cookies) Tj T* (Shake.mint) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 308.2236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.893735 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (attribute is always removed, and in 3.x it is also ignored \(order is definition order\);) Tj T* 0 Tw (however, in the stdlib version it will be ignored but not removed.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 290.2236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumeration members are hashable, so they can be used in dictionaries and sets:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 209.0236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( apples = {}) Tj T* (>) Tj (>) Tj (>) Tj ( apples[Color.red] = 'red delicious') Tj T* (>) Tj (>) Tj (>) Tj ( apples[Color.green] = 'granny smith') Tj T* (>) Tj (>) Tj (>) Tj ( apples == {Color.red: 'red delicious', Color.green: 'granny smith'}) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 155.0236 cm
-q
-BT 1 0 0 1 0 24.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Programmatic access to enumeration members and) Tj T* (their attributes) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 113.0236 cm
-q
-BT 1 0 0 1 0 26 Tm 3.541797 Tw 12 TL /F1 10 Tf 0 0 0 rg (Sometimes it's useful to access members in enumerations programmatically \(i.e. situations where) Tj T* 0 Tw .922651 Tw /F4 10 Tf 0 0 0 rg (Color.red ) Tj /F1 10 Tf 0 0 0 rg (won't do because the exact color is not known at program-writing time\). ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (allows such) Tj T* 0 Tw (access:) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-58 0 obj
-<< /Length 3791 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 703.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 60 re B*
-Q
-q
-BT 1 0 0 1 0 38 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color\(1\)) Tj T* (<) Tj (Color.red: 1) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Color\(3\)) Tj T* (<) Tj (Color.blue: 3) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 683.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (If you want to access enum members by ) Tj /F5 10 Tf (name) Tj /F1 10 Tf (, use item access:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 614.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 60 re B*
-Q
-q
-BT 1 0 0 1 0 38 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color['red']) Tj T* (<) Tj (Color.red: 1) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Color['green']) Tj T* (<) Tj (Color.green: 2) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 594.6236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (If have an enum member and need its ) Tj /F4 10 Tf 0 0 0 rg (name ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (value) Tj /F1 10 Tf 0 0 0 rg (:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 513.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( member = Color.red) Tj T* (>) Tj (>) Tj (>) Tj ( member.name) Tj T* ('red') Tj T* (>) Tj (>) Tj (>) Tj ( member.value) Tj T* (1) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 480.4236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Duplicating enum members and values) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 450.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .13832 Tw (Having two enum members \(or any other attribute\) with the same name is invalid; in Python 3.x this would) Tj T* 0 Tw (raise an error, but in Python 2.x the second member simply overwrites the first:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 249.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 192 re B*
-Q
-q
-BT 1 0 0 1 0 170 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( # python 2.x) Tj T* (>) Tj (>) Tj (>) Tj ( class Shape\(Enum\):) Tj T* (...   square = 2) Tj T* (...   square = 3) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.square) Tj T* (<) Tj (Shape.square: 3) Tj (>) Tj  T*  T* (>) Tj (>) Tj (>) Tj ( # python 3.x) Tj T* (>) Tj (>) Tj (>) Tj ( class Shape\(Enum\):) Tj T* (...   square = 2) Tj T* (...   square = 3) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (TypeError: Attempted to reuse key: 'square') Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 205.2236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 26 Tm /F1 10 Tf 12 TL .384987 Tw (However, two enum members are allowed to have the same value. Given two members A and B with the) Tj T* 0 Tw .444772 Tw (same value \(and A defined first\), B is an alias to A. By-value lookup of the value of A and B will return A.) Tj T* 0 Tw (By-name lookup of B will also return A:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 88.02362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 492 108 re B*
-Q
-q
-BT 1 0 0 1 0 86 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Shape\(Enum\):) Tj T* (...   __order__ = 'square diamond circle alias_for_square'  # only needed in 2.x) Tj T* (...   square = 2) Tj T* (...   diamond = 1) Tj T* (...   circle = 3) Tj T* (...   alias_for_square = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.square) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-59 0 obj
-<< /Length 4406 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 691.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (<) Tj (Shape.square: 2) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Shape.alias_for_square) Tj T* (<) Tj (Shape.square: 2) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Shape\(2\)) Tj T* (<) Tj (Shape.square: 2) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 659.8236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.074104 Tw 12 TL /F1 10 Tf 0 0 0 rg (Allowing aliases is not always desirable. ) Tj /F4 10 Tf 0 0 0 rg (unique ) Tj /F1 10 Tf 0 0 0 rg (can be used to ensure that none exist in a particular) Tj T* 0 Tw (enumeration:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 506.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 144 re B*
-Q
-q
-BT 1 0 0 1 0 122 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum import unique) Tj T* (>) Tj (>) Tj (>) Tj ( @unique) Tj T* (... class Mistake\(Enum\):) Tj T* (...   __order__ = 'one two three four'  # only needed in 2.x) Tj T* (...   one = 1) Tj T* (...   two = 2) Tj T* (...   three = 3) Tj T* (...   four = 3) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (ValueError: duplicate names found in ) Tj (<) Tj (enum 'Mistake') Tj (>) Tj (: four -) Tj (>) Tj ( three) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 486.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Iterating over the members of an enum does not provide the aliases:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 441.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( list\(Shape\)) Tj T* ([) Tj (<) Tj (Shape.square: 2) Tj (>) Tj (, ) Tj (<) Tj (Shape.diamond: 1) Tj (>) Tj (, ) Tj (<) Tj (Shape.circle: 3) Tj (>) Tj (]) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 409.4236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.307126 Tw 12 TL /F1 10 Tf 0 0 0 rg (The special attribute ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is a dictionary mapping names to members. It includes all names) Tj T* 0 Tw (defined in the enumeration, including the aliases:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 304.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 96 re B*
-Q
-q
-BT 1 0 0 1 0 74 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( for name, member in sorted\(Shape.__members__.items\(\)\):) Tj T* (...   name, member) Tj T* (...) Tj T* (\('alias_for_square', ) Tj (<) Tj (Shape.square: 2) Tj (>) Tj (\)) Tj T* (\('circle', ) Tj (<) Tj (Shape.circle: 3) Tj (>) Tj (\)) Tj T* (\('diamond', ) Tj (<) Tj (Shape.diamond: 1) Tj (>) Tj (\)) Tj T* (\('square', ) Tj (<) Tj (Shape.square: 2) Tj (>) Tj (\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 272.2236 cm
-q
-BT 1 0 0 1 0 14 Tm .080751 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (attribute can be used for detailed programmatic access to the enumeration members.) Tj T* 0 Tw (For example, finding all the aliases:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 227.0236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 486 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( [name for name, member in Shape.__members__.items\(\) if member.name != name]) Tj T* (['alias_for_square']) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 194.0236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Comparisons) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 176.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumeration members are compared by identity:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 82.82362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.red is Color.red) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj ( Color.red is Color.blue) Tj T* (False) Tj T* (>) Tj (>) Tj (>) Tj ( Color.red is not Color.blue) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-60 0 obj
-<< /Length 4521 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 741.0236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.131647 Tw 12 TL /F1 10 Tf 0 0 0 rg (Ordered comparisons between enumeration values are ) Tj /F5 10 Tf (not ) Tj /F1 10 Tf (supported. Enum members are not integers) Tj T* 0 Tw (\(but see ) Tj 0 0 .501961 rg (IntEnum ) Tj 0 0 0 rg (below\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 671.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 60 re B*
-Q
-q
-BT 1 0 0 1 0 38 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.red ) Tj (<) Tj ( Color.blue) Tj T* (Traceback \(most recent call last\):) Tj T* (  File ") Tj (<) Tj (stdin) Tj (>) Tj (", line 1, in ) Tj (<) Tj (module) Tj (>) Tj  T* (TypeError: unorderable types: Color\(\) ) Tj (<) Tj ( Color\(\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 651.8236 cm
-Q
-q
-1 0 0 1 62.69291 568.8236 cm
-.960784 .960784 .862745 rg
-n 0 83 469.8898 -83 re f*
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 6 57 Tm  T* ET
-q
-1 0 0 1 16 52 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2.5 Tm /F6 12.5 Tf 15 TL (Warning) Tj T* ET
-Q
-Q
-q
-1 0 0 1 16 16 cm
-q
-BT 1 0 0 1 0 14 Tm .189398 Tw 12 TL /F1 10 Tf 0 0 0 rg (In Python 2 ) Tj /F5 10 Tf (everything ) Tj /F1 10 Tf (is ordered, even though the ordering may not make sense. If you want your) Tj T* 0 Tw (enumerations to have a sensible ordering check out the ) Tj 0 0 .501961 rg (OrderedEnum ) Tj 0 0 0 rg (recipe below.) Tj T* ET
-Q
-Q
-q
-1 J
-1 j
-.662745 .662745 .662745 RG
-.5 w
-n 0 83 m 469.8898 83 l S
-n 0 0 m 469.8898 0 l S
-n 0 0 m 0 83 l S
-n 469.8898 0 m 469.8898 83 l S
-Q
-Q
-q
-1 0 0 1 62.69291 562.8236 cm
-Q
-q
-1 0 0 1 62.69291 544.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Equality comparisons are defined though:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 451.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.blue == Color.red) Tj T* (False) Tj T* (>) Tj (>) Tj (>) Tj ( Color.blue != Color.red) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj ( Color.blue == Color.blue) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 419.6236 cm
-q
-BT 1 0 0 1 0 14 Tm 2.582706 Tw 12 TL /F1 10 Tf 0 0 0 rg (Comparisons against non-enumeration values will always compare not equal \(again, ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (was) Tj T* 0 Tw (explicitly designed to behave differently, see below\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 374.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.blue == 2) Tj T* (False) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 341.4236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Allowed members and attributes of enumerations) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 287.4236 cm
-q
-BT 1 0 0 1 0 38 Tm 2.755697 Tw 12 TL /F1 10 Tf 0 0 0 rg (The examples above use integers for enumeration values. Using integers is short and handy \(and) Tj T* 0 Tw .241751 Tw (provided by default by the ) Tj 0 0 .501961 rg (Functional API) Tj 0 0 0 rg (\), but not strictly enforced. In the vast majority of use-cases, one) Tj T* 0 Tw .848221 Tw (doesn't care what the actual value of an enumeration is. But if the value ) Tj /F5 10 Tf (is ) Tj /F1 10 Tf (important, enumerations can) Tj T* 0 Tw (have arbitrary values.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 257.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .638735 Tw (Enumerations are Python classes, and can have methods and special methods as usual. If we have this) Tj T* 0 Tw (enumeration:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 80.22362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 168 re B*
-Q
-q
-BT 1 0 0 1 0 146 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Mood\(Enum\):) Tj T* (...   funky = 1) Tj T* (...   happy = 3) Tj T* (...) Tj T* (...   def describe\(self\):) Tj T* (...     # self is the member here) Tj T* (...     return self.name, self.value) Tj T* (...) Tj T* (...   def __str__\(self\):) Tj T* (...     return 'my custom str! {0}'.format\(self.value\)) Tj T* (...) Tj T* (...   @classmethod) Tj T* (...   def favorite_mood\(cls\):) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-61 0 obj
-<< /Length 4627 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 727.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (...     # cls here is the enumeration) Tj T* (...     return cls.happy) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 707.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Then:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 614.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Mood.favorite_mood\(\)) Tj T* (<) Tj (Mood.happy: 3) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Mood.happy.describe\(\)) Tj T* (\('happy', 3\)) Tj T* (>) Tj (>) Tj (>) Tj ( str\(Mood.funky\)) Tj T* ('my custom str! 1') Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 558.6236 cm
-q
-BT 1 0 0 1 0 38 Tm 3.14186 Tw 12 TL /F1 10 Tf 0 0 0 rg (The rules for what is allowed are as follows: _sunder_ names \(starting and ending with a single) Tj T* 0 Tw .310651 Tw (underscore\) are reserved by enum and cannot be used; all other attributes defined within an enumeration) Tj T* 0 Tw 2.199213 Tw (will become members of this enumeration, with the exception of ) Tj /F5 10 Tf (__dunder__ ) Tj /F1 10 Tf (names and descriptors) Tj T* 0 Tw (\(methods are also descriptors\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 540.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 534.6236 cm
-Q
-q
-1 0 0 1 62.69291 510.6236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-BT 1 0 0 1 0 14 Tm .979213 Tw 12 TL /F1 10 Tf 0 0 0 rg (If your enumeration defines ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (and/or ) Tj /F4 10 Tf 0 0 0 rg (__init__ ) Tj /F1 10 Tf 0 0 0 rg (then whatever value\(s\) were given to the) Tj T* 0 Tw (enum member will be passed into those methods. See ) Tj 0 0 .501961 rg (Planet ) Tj 0 0 0 rg (for an example.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 510.6236 cm
-Q
-q
-1 0 0 1 62.69291 477.6236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Restricted subclassing of enumerations) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 447.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .778735 Tw (Subclassing an enumeration is allowed only if the enumeration does not define any members. So this is) Tj T* 0 Tw (forbidden:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 366.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class MoreColor\(Color\):) Tj T* (...   pink = 17) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (TypeError: Cannot extend enumerations) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 346.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (But this is allowed:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 229.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 108 re B*
-Q
-q
-BT 1 0 0 1 0 86 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Foo\(Enum\):) Tj T* (...   def some_behavior\(self\):) Tj T* (...     pass) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Bar\(Foo\):) Tj T* (...   happy = 1) Tj T* (...   sad = 2) Tj T* (...) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 185.2236 cm
-q
-BT 1 0 0 1 0 26 Tm .127984 Tw 12 TL /F1 10 Tf 0 0 0 rg (Allowing subclassing of enums that define members would lead to a violation of some important invariants) Tj T* 0 Tw 1.889985 Tw (of types and instances. On the other hand, it makes sense to allow sharing some common behavior) Tj T* 0 Tw (between a group of enumerations. \(See ) Tj 0 0 .501961 rg (OrderedEnum ) Tj 0 0 0 rg (for an example.\)) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 152.2236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Pickling) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 134.2236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumerations can be pickled and unpickled:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 89.02362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum.test_enum import Fruit) Tj T* (>) Tj (>) Tj (>) Tj ( from pickle import dumps, loads) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-62 0 obj
-<< /Length 5372 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 727.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Fruit.tomato is loads\(dumps\(Fruit.tomato, 2\)\)) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 695.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL 1.256457 Tw (The usual restrictions for pickling apply: picklable enums must be defined in the top level of a module,) Tj T* 0 Tw (since unpickling requires them to be importable from that module.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 677.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 671.8236 cm
-Q
-q
-1 0 0 1 62.69291 647.8236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .081163 Tw (With pickle protocol version 4 \(introduced in Python 3.4\) it is possible to easily pickle enums nested in) Tj T* 0 Tw (other classes.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 647.8236 cm
-Q
-q
-1 0 0 1 62.69291 614.8236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Functional API) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 596.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class is callable, providing the following functional API:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 467.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 120 re B*
-Q
-q
-BT 1 0 0 1 0 98 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Animal = Enum\('Animal', 'ant bee cat dog'\)) Tj T* (>) Tj (>) Tj (>) Tj ( Animal) Tj T* (<) Tj (enum 'Animal') Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Animal.ant) Tj T* (<) Tj (Animal.ant: 1) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Animal.ant.value) Tj T* (1) Tj T* (>) Tj (>) Tj (>) Tj ( list\(Animal\)) Tj T* ([) Tj (<) Tj (Animal.ant: 1) Tj (>) Tj (, ) Tj (<) Tj (Animal.bee: 2) Tj (>) Tj (, ) Tj (<) Tj (Animal.cat: 3) Tj (>) Tj (, ) Tj (<) Tj (Animal.dog: 4) Tj (>) Tj (]) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 435.6236 cm
-q
-BT 1 0 0 1 0 14 Tm .602209 Tw 12 TL /F1 10 Tf 0 0 0 rg (The semantics of this API resemble ) Tj /F4 10 Tf 0 0 0 rg (namedtuple) Tj /F1 10 Tf 0 0 0 rg (. The first argument of the call to ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is the name of) Tj T* 0 Tw (the enumeration.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 369.6236 cm
-q
-BT 1 0 0 1 0 50 Tm 1.326412 Tw 12 TL /F1 10 Tf 0 0 0 rg (The second argument is the ) Tj /F5 10 Tf (source ) Tj /F1 10 Tf (of enumeration member names. It can be a whitespace-separated) Tj T* 0 Tw .993516 Tw (string of names, a sequence of names, a sequence of 2-tuples with key/value pairs, or a mapping \(e.g.) Tj T* 0 Tw 1.168555 Tw (dictionary\) of names to values. The last two options enable assigning arbitrary values to enumerations;) Tj T* 0 Tw .537485 Tw (the others auto-assign increasing integers starting with 1. A new class derived from ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is returned. In) Tj T* 0 Tw (other words, the above assignment to ) Tj /F4 10 Tf 0 0 0 rg (Animal ) Tj /F1 10 Tf 0 0 0 rg (is equivalent to:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 288.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Animals\(Enum\):) Tj T* (...   ant = 1) Tj T* (...   bee = 2) Tj T* (...   cat = 3) Tj T* (...   dog = 4) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 232.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 38 Tm /F1 10 Tf 12 TL 1.239984 Tw (Pickling enums created with the functional API can be tricky as frame stack implementation details are) Tj T* 0 Tw .937132 Tw (used to try and figure out which module the enumeration is being created in \(e.g. it will fail if you use a) Tj T* 0 Tw 1.321163 Tw (utility function in separate module, and also may not work on IronPython or Jython\). The solution is to) Tj T* 0 Tw (specify the module name explicitly as follows:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 199.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 24 re B*
-Q
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Animals = Enum\('Animals', 'ant bee cat dog', module=__name__\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 166.2236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Derived Enumerations) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 136.2236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (IntEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 94.22362 cm
-q
-BT 1 0 0 1 0 26 Tm 1.99832 Tw 12 TL /F1 10 Tf 0 0 0 rg (A variation of ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is provided which is also a subclass of ) Tj /F4 10 Tf 0 0 0 rg (int) Tj /F1 10 Tf 0 0 0 rg (. Members of an ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (can be) Tj T* 0 Tw .087984 Tw (compared to integers; by extension, integer enumerations of different types can also be compared to each) Tj T* 0 Tw (other:) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-63 0 obj
-<< /Length 4141 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 571.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 192 re B*
-Q
-q
-BT 1 0 0 1 0 170 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum import IntEnum) Tj T* (>) Tj (>) Tj (>) Tj ( class Shape\(IntEnum\):) Tj T* (...   circle = 1) Tj T* (...   square = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Request\(IntEnum\):) Tj T* (...   post = 1) Tj T* (...   get = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape == 1) Tj T* (False) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.circle == 1) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.circle == Request.post) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 551.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (However, they still can't be compared to standard ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (enumerations:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 410.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 132 re B*
-Q
-q
-BT 1 0 0 1 0 110 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Shape\(IntEnum\):) Tj T* (...   circle = 1) Tj T* (...   square = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(Enum\):) Tj T* (...   red = 1) Tj T* (...   green = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.circle == Color.red) Tj T* (False) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 390.6236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (values behave like integers in other ways you'd expect:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 297.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( int\(Shape.circle\)) Tj T* (1) Tj T* (>) Tj (>) Tj (>) Tj ( ['a', 'b', 'c'][Shape.circle]) Tj T* ('b') Tj T* (>) Tj (>) Tj (>) Tj ( [i for i in range\(Shape.square\)]) Tj T* ([0, 1]) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 229.4236 cm
-q
-BT 1 0 0 1 0 50 Tm 1.197126 Tw 12 TL /F1 10 Tf 0 0 0 rg (For the vast majority of code, ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is strongly recommended, since ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (breaks some semantic) Tj T* 0 Tw .793318 Tw (promises of an enumeration \(by being comparable to integers, and thus by transitivity to other unrelated) Tj T* 0 Tw .554985 Tw (enumerations\). It should be used only in special cases where there's no other choice; for example, when) Tj T* 0 Tw .746136 Tw (integer constants are replaced with enumerations and backwards compatibility is required with code that) Tj T* 0 Tw (still expects integers.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 199.4236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Others) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 181.4236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (While ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (is part of the ) Tj /F4 10 Tf 0 0 0 rg (enum ) Tj /F1 10 Tf 0 0 0 rg (module, it would be very simple to implement independently:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 136.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F4 10 Tf 12 TL (class IntEnum\(int, Enum\):) Tj T* (    pass) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 104.2236 cm
-q
-BT 1 0 0 1 0 14 Tm .361412 Tw 12 TL /F1 10 Tf 0 0 0 rg (This demonstrates how similar derived enumerations can be defined; for example a ) Tj /F4 10 Tf 0 0 0 rg (StrEnum ) Tj /F1 10 Tf 0 0 0 rg (that mixes) Tj T* 0 Tw (in ) Tj /F4 10 Tf 0 0 0 rg (str ) Tj /F1 10 Tf 0 0 0 rg (instead of ) Tj /F4 10 Tf 0 0 0 rg (int) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 86.22362 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Some rules:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 80.22362 cm
-Q
-q
-1 0 0 1 62.69291 80.22362 cm
-Q
- 
-endstream
-endobj
-64 0 obj
-<< /Length 7108 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 741.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm .477318 Tw 12 TL /F1 10 Tf 0 0 0 rg (When subclassing ) Tj /F4 10 Tf 0 0 0 rg (Enum) Tj /F1 10 Tf 0 0 0 rg (, mix-in types must appear before ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (itself in the sequence of bases, as) Tj T* 0 Tw (in the ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (example above.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 735.0236 cm
-Q
-q
-1 0 0 1 62.69291 699.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 21 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 26 Tm 1.147045 Tw 12 TL /F1 10 Tf 0 0 0 rg (While ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (can have members of any type, once you mix in an additional type, all the members) Tj T* 0 Tw .420574 Tw (must have values of that type, e.g. ) Tj /F4 10 Tf 0 0 0 rg (int ) Tj /F1 10 Tf 0 0 0 rg (above. This restriction does not apply to mix-ins which only) Tj T* 0 Tw (add methods and don't specify another data type such as ) Tj /F4 10 Tf 0 0 0 rg (int ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (str) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 693.0236 cm
-Q
-q
-1 0 0 1 62.69291 669.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm .100542 Tw 12 TL /F1 10 Tf 0 0 0 rg (When another data type is mixed in, the ) Tj /F4 10 Tf 0 0 0 rg (value ) Tj /F1 10 Tf 0 0 0 rg (attribute is ) Tj /F5 10 Tf (not the same ) Tj /F1 10 Tf (as the enum member itself,) Tj T* 0 Tw (although it is equivalant and will compare equal.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 663.0236 cm
-Q
-q
-1 0 0 1 62.69291 609.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 39 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 27 cm
-q
-BT 1 0 0 1 0 14 Tm 1.85998 Tw 12 TL /F1 10 Tf 0 0 0 rg (%-style formatting: ) Tj /F4 10 Tf 0 0 0 rg (%s ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (%r ) Tj /F1 10 Tf 0 0 0 rg (call ) Tj /F4 10 Tf 0 0 0 rg (Enum) Tj /F1 10 Tf 0 0 0 rg ('s ) Tj /F4 10 Tf 0 0 0 rg (__str__ ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (__repr__ ) Tj /F1 10 Tf 0 0 0 rg (respectively; other codes) Tj T* 0 Tw (\(such as ) Tj /F4 10 Tf 0 0 0 rg (%i ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (%h ) Tj /F1 10 Tf 0 0 0 rg (for IntEnum\) treat the enum member as its mixed-in type.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm .067045 Tw 12 TL /F1 10 Tf 0 0 0 rg (Note: Prior to Python 3.4 there is a bug in ) Tj /F4 10 Tf 0 0 0 rg (str) Tj /F1 10 Tf 0 0 0 rg ('s %-formatting: ) Tj /F4 10 Tf 0 0 0 rg (int ) Tj /F1 10 Tf 0 0 0 rg (subclasses are printed as strings) Tj T* 0 Tw (and not numbers when the ) Tj /F4 10 Tf 0 0 0 rg (%d) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (%i) Tj /F1 10 Tf 0 0 0 rg (, or ) Tj /F4 10 Tf 0 0 0 rg (%u ) Tj /F1 10 Tf 0 0 0 rg (codes are used.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 603.0236 cm
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm 1.880751 Tw 12 TL /F4 10 Tf 0 0 0 rg (str.__format__ ) Tj /F1 10 Tf 0 0 0 rg (\(or ) Tj /F4 10 Tf 0 0 0 rg (format) Tj /F1 10 Tf 0 0 0 rg (\) will use the mixed-in type's ) Tj /F4 10 Tf 0 0 0 rg (__format__) Tj /F1 10 Tf 0 0 0 rg (. If the ) Tj /F4 10 Tf 0 0 0 rg (Enum) Tj /F1 10 Tf 0 0 0 rg ('s ) Tj /F4 10 Tf 0 0 0 rg (str ) Tj /F1 10 Tf 0 0 0 rg (or) Tj T* 0 Tw /F4 10 Tf 0 0 0 rg (repr ) Tj /F1 10 Tf 0 0 0 rg (is desired use the ) Tj /F4 10 Tf 0 0 0 rg (!s ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (!r) Tj /F1 10 Tf 0 0 0 rg ( ) Tj /F4 10 Tf 0 0 0 rg (str ) Tj /F1 10 Tf 0 0 0 rg (format codes.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-Q
-q
-1 0 0 1 62.69291 546.0236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Decorators) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 516.0236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (unique) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 486.0236 cm
-q
-BT 1 0 0 1 0 14 Tm .287251 Tw 12 TL /F1 10 Tf 0 0 0 rg (A ) Tj /F4 10 Tf 0 0 0 rg (class ) Tj /F1 10 Tf 0 0 0 rg (decorator specifically for enumerations. It searches an enumeration's ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (gathering) Tj T* 0 Tw (any aliases it finds; if any are found ) Tj /F4 10 Tf 0 0 0 rg (ValueError ) Tj /F1 10 Tf 0 0 0 rg (is raised with the details:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 368.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 108 re B*
-Q
-q
-BT 1 0 0 1 0 86 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( @unique) Tj T* (... class NoDupes\(Enum\):) Tj T* (...    first = 'one') Tj T* (...    second = 'two') Tj T* (...    third = 'two') Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (ValueError: duplicate names found in ) Tj (<) Tj (enum 'NoDupes') Tj (>) Tj (: third -) Tj (>) Tj ( second) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 335.8236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Interesting examples) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 293.8236 cm
-q
-BT 1 0 0 1 0 26 Tm .593735 Tw 12 TL /F1 10 Tf 0 0 0 rg (While ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (are expected to cover the majority of use-cases, they cannot cover them all.) Tj T* 0 Tw .897045 Tw (Here are recipes for some different types of enumerations that can be used directly, or as examples for) Tj T* 0 Tw (creating one's own.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 263.8236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (AutoNumber) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 245.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Avoids having to specify the value for each enumeration member:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 80.62362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 156 re B*
-Q
-q
-BT 1 0 0 1 0 134 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class AutoNumber\(Enum\):) Tj T* (...     def __new__\(cls\):) Tj T* (...         value = len\(cls.__members__\) + 1) Tj T* (...         obj = object.__new__\(cls\)) Tj T* (...         obj._value_ = value) Tj T* (...         return obj) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(AutoNumber\):) Tj T* (...     __order__ = "red green blue"  # only needed in 2.x) Tj T* (...     red = \(\)) Tj T* (...     green = \(\)) Tj T* (...     blue = \(\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-65 0 obj
-<< /Length 4158 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 715.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 48 re B*
-Q
-q
-BT 1 0 0 1 0 26 Tm 12 TL /F4 10 Tf 0 0 0 rg (...) Tj T* (>) Tj (>) Tj (>) Tj ( Color.green.value == 2) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 695.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 689.8236 cm
-Q
-q
-1 0 0 1 62.69291 653.8236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-BT 1 0 0 1 0 26 Tm .144104 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F5 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (method, if defined, is used during creation of the Enum members; it is then replaced by) Tj T* 0 Tw .799985 Tw (Enum's ) Tj /F5 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (which is used after class creation for lookup of existing members. Due to the way) Tj T* 0 Tw (Enums are supposed to behave, there is no way to customize Enum's ) Tj /F5 10 Tf 0 0 0 rg (__new__) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 653.8236 cm
-Q
-q
-1 0 0 1 62.69291 623.8236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (UniqueEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 605.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Raises an error if a duplicate member name is found instead of creating an alias:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 368.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 228 re B*
-Q
-q
-BT 1 0 0 1 0 206 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class UniqueEnum\(Enum\):) Tj T* (...     def __init__\(self, *args\):) Tj T* (...         cls = self.__class__) Tj T* (...         if any\(self.value == e.value for e in cls\):) Tj T* (...             a = self.name) Tj T* (...             e = cls\(self.value\).name) Tj T* (...             raise ValueError\() Tj T* (...                     "aliases not allowed in UniqueEnum:  %r --) Tj (>) Tj ( %r") Tj T* (...                     % \(a, e\)\)) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(UniqueEnum\):) Tj T* (...     red = 1) Tj T* (...     green = 2) Tj T* (...     blue = 3) Tj T* (...     grene = 2) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (ValueError: aliases not allowed in UniqueEnum:  'grene' --) Tj (>) Tj ( 'green') Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 338.6236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (OrderedEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 308.6236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.335984 Tw 12 TL /F1 10 Tf 0 0 0 rg (An ordered enumeration that is not based on ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (and so maintains the normal ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (invariants) Tj T* 0 Tw (\(such as not being comparable to other enumerations\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 83.42362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 216 re B*
-Q
-q
-BT 1 0 0 1 0 194 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class OrderedEnum\(Enum\):) Tj T* (...     def __ge__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (>) Tj (= other._value_) Tj T* (...         return NotImplemented) Tj T* (...     def __gt__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (>) Tj ( other._value_) Tj T* (...         return NotImplemented) Tj T* (...     def __le__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (<) Tj (= other._value_) Tj T* (...         return NotImplemented) Tj T* (...     def __lt__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (<) Tj ( other._value_) Tj T* (...         return NotImplemented) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-66 0 obj
-<< /Length 4039 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 619.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 144 re B*
-Q
-q
-BT 1 0 0 1 0 122 Tm 12 TL /F4 10 Tf 0 0 0 rg (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Grade\(OrderedEnum\):) Tj T* (...     __ordered__ = 'A B C D F') Tj T* (...     A = 5) Tj T* (...     B = 4) Tj T* (...     C = 3) Tj T* (...     D = 2) Tj T* (...     F = 1) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Grade.C ) Tj (<) Tj ( Grade.A) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 589.8236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Planet) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 571.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (If ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (__init__ ) Tj /F1 10 Tf 0 0 0 rg (is defined the value of the enum member will be passed to those methods:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 286.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 276 re B*
-Q
-q
-BT 1 0 0 1 0 254 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Planet\(Enum\):) Tj T* (...     MERCURY = \(3.303e+23, 2.4397e6\)) Tj T* (...     VENUS   = \(4.869e+24, 6.0518e6\)) Tj T* (...     EARTH   = \(5.976e+24, 6.37814e6\)) Tj T* (...     MARS    = \(6.421e+23, 3.3972e6\)) Tj T* (...     JUPITER = \(1.9e+27,   7.1492e7\)) Tj T* (...     SATURN  = \(5.688e+26, 6.0268e7\)) Tj T* (...     URANUS  = \(8.686e+25, 2.5559e7\)) Tj T* (...     NEPTUNE = \(1.024e+26, 2.4746e7\)) Tj T* (...     def __init__\(self, mass, radius\):) Tj T* (...         self.mass = mass       # in kilograms) Tj T* (...         self.radius = radius   # in meters) Tj T* (...     @property) Tj T* (...     def surface_gravity\(self\):) Tj T* (...         # universal gravitational constant  \(m3 kg-1 s-2\)) Tj T* (...         G = 6.67300E-11) Tj T* (...         return G * self.mass / \(self.radius * self.radius\)) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Planet.EARTH.value) Tj T* (\(5.976e+24, 6378140.0\)) Tj T* (>) Tj (>) Tj (>) Tj ( Planet.EARTH.surface_gravity) Tj T* (9.802652743337129) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 253.6236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (How are Enums different?) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 223.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL 2.090651 Tw (Enums have a custom metaclass that affects many aspects of both derived Enum classes and their) Tj T* 0 Tw (instances \(members\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 193.6236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Enum Classes) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 127.6236 cm
-q
-BT 1 0 0 1 0 50 Tm 1.263615 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (EnumMeta ) Tj /F1 10 Tf 0 0 0 rg (metaclass is responsible for providing the ) Tj /F4 10 Tf 0 0 0 rg (__contains__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__dir__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__iter__ ) Tj /F1 10 Tf 0 0 0 rg (and) Tj T* 0 Tw 2.264724 Tw (other methods that allow one to do things with an ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class that fail on a typical class, such as) Tj T* 0 Tw 2.594147 Tw /F4 10 Tf 0 0 0 rg (list\(Color\) ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (some_var) Tj ( ) Tj (in) Tj ( ) Tj (Color) Tj /F1 10 Tf 0 0 0 rg (. ) Tj /F4 10 Tf 0 0 0 rg (EnumMeta ) Tj /F1 10 Tf 0 0 0 rg (is responsible for ensuring that various other) Tj T* 0 Tw 2.196905 Tw (methods on the final ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class are correct \(such as ) Tj /F4 10 Tf 0 0 0 rg (__new__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__getnewargs__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__str__ ) Tj /F1 10 Tf 0 0 0 rg (and) Tj T* 0 Tw /F4 10 Tf 0 0 0 rg (__repr__) Tj /F1 10 Tf 0 0 0 rg (\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 115.6236 cm
-Q
- 
-endstream
-endobj
-67 0 obj
-<< /Length 5453 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 682.0236 cm
-.960784 .960784 .862745 rg
-n 0 83 469.8898 -83 re f*
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 6 57 Tm  T* ET
-q
-1 0 0 1 16 52 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2.5 Tm /F6 12.5 Tf 15 TL (Note) Tj T* ET
-Q
-Q
-q
-1 0 0 1 16 16 cm
-q
-BT 1 0 0 1 0 14 Tm .686654 Tw 12 TL /F4 10 Tf 0 0 0 rg (__dir__ ) Tj /F1 10 Tf 0 0 0 rg (is not changed in the Python 2 line as it messes up some of the decorators included in) Tj T* 0 Tw (the stdlib.) Tj T* ET
-Q
-Q
-q
-1 J
-1 j
-.662745 .662745 .662745 RG
-.5 w
-n 0 83 m 469.8898 83 l S
-n 0 0 m 469.8898 0 l S
-n 0 0 m 0 83 l S
-n 469.8898 0 m 469.8898 83 l S
-Q
-Q
-q
-1 0 0 1 62.69291 676.0236 cm
-Q
-q
-1 0 0 1 62.69291 646.0236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Enum Members \(aka instances\)) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 604.0236 cm
-q
-BT 1 0 0 1 0 26 Tm .491984 Tw 12 TL /F1 10 Tf 0 0 0 rg (The most interesting thing about Enum members is that they are singletons. ) Tj /F4 10 Tf 0 0 0 rg (EnumMeta ) Tj /F1 10 Tf 0 0 0 rg (creates them all) Tj T* 0 Tw .084988 Tw (while it is creating the ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class itself, and then puts a custom ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (in place to ensure that no new) Tj T* 0 Tw (ones are ever instantiated by returning only the existing member instances.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 574.0236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Finer Points) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 520.0236 cm
-q
-BT 1 0 0 1 0 38 Tm 5.488555 Tw 12 TL /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (members are instances of an ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class, and even though they are accessible as) Tj T* 0 Tw 1.504147 Tw /F5 10 Tf 0 0 0 rg (EnumClass.member1.member2) Tj /F1 10 Tf 0 0 0 rg (, they should not be accessed directly from the member as that lookup) Tj T* 0 Tw .329985 Tw (may fail or, worse, return something besides the ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (member you were looking for \(changed in version) Tj T* 0 Tw (1.1.1\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 390.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 120 re B*
-Q
-q
-BT 1 0 0 1 0 98 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class FieldTypes\(Enum\):) Tj T* (...     name = 1) Tj T* (...     value = 2) Tj T* (...     size = 3) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( FieldTypes.value.size) Tj T* (<) Tj (FieldTypes.size: 3) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( FieldTypes.size.value) Tj T* (3) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 370.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (attribute is only available on the class.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 316.8236 cm
-q
-BT 1 0 0 1 0 38 Tm 1.374651 Tw 12 TL /F1 10 Tf 0 0 0 rg (In Python 3.x ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is always an ) Tj /F4 10 Tf 0 0 0 rg (OrderedDict) Tj /F1 10 Tf 0 0 0 rg (, with the order being the definition order. In) Tj T* 0 Tw 3.009213 Tw (Python 2.7 ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is an ) Tj /F4 10 Tf 0 0 0 rg (OrderedDict ) Tj /F1 10 Tf 0 0 0 rg (if ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (was specified, and a plain ) Tj /F4 10 Tf 0 0 0 rg (dict) Tj T* 0 Tw 1.851318 Tw /F1 10 Tf 0 0 0 rg (otherwise. In all other Python 2.x versions ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is a plain ) Tj /F4 10 Tf 0 0 0 rg (dict ) Tj /F1 10 Tf 0 0 0 rg (even if ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (was) Tj T* 0 Tw (specified as the ) Tj /F4 10 Tf 0 0 0 rg (OrderedDict ) Tj /F1 10 Tf 0 0 0 rg (type didn't exist yet.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 286.8236 cm
-q
-BT 1 0 0 1 0 14 Tm .106654 Tw 12 TL /F1 10 Tf 0 0 0 rg (If you give your ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (subclass extra methods, like the ) Tj 0 0 .501961 rg (Planet ) Tj 0 0 0 rg (class above, those methods will show up in) Tj T* 0 Tw (a ) Tj /F5 10 Tf 0 0 0 rg (dir ) Tj /F1 10 Tf 0 0 0 rg (of the member, but not of the class:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 205.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( dir\(Planet\)) Tj T* (['EARTH', 'JUPITER', 'MARS', 'MERCURY', 'NEPTUNE', 'SATURN', 'URANUS',) Tj T* ('VENUS', '__class__', '__doc__', '__members__', '__module__']) Tj T* (>) Tj (>) Tj (>) Tj ( dir\(Planet.EARTH\)) Tj T* (['__class__', '__doc__', '__module__', 'name', 'surface_gravity', 'value']) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 161.6236 cm
-q
-BT 1 0 0 1 0 26 Tm .938935 Tw 12 TL /F1 10 Tf 0 0 0 rg (A ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (method will only be used for the creation of the ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (members -- after that it is replaced.) Tj T* 0 Tw .949461 Tw (This means if you wish to change how ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (members are looked up you either have to write a helper) Tj T* 0 Tw (function or a ) Tj /F4 10 Tf 0 0 0 rg (classmethod) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-68 0 obj
-<< /Nums [ 0 69 0 R 1 70 0 R 2 71 0 R 3 72 0 R 4 73 0 R 
-  5 74 0 R 6 75 0 R 7 76 0 R 8 77 0 R 9 78 0 R 
-  10 79 0 R 11 80 0 R ] >>
-endobj
-69 0 obj
-<< /S /D /St 1 >>
-endobj
-70 0 obj
-<< /S /D /St 2 >>
-endobj
-71 0 obj
-<< /S /D /St 3 >>
-endobj
-72 0 obj
-<< /S /D /St 4 >>
-endobj
-73 0 obj
-<< /S /D /St 5 >>
-endobj
-74 0 obj
-<< /S /D /St 6 >>
-endobj
-75 0 obj
-<< /S /D /St 7 >>
-endobj
-76 0 obj
-<< /S /D /St 8 >>
-endobj
-77 0 obj
-<< /S /D /St 9 >>
-endobj
-78 0 obj
-<< /S /D /St 10 >>
-endobj
-79 0 obj
-<< /S /D /St 11 >>
-endobj
-80 0 obj
-<< /S /D /St 12 >>
-endobj
-xref
-0 81
-0000000000 65535 f
-0000000075 00000 n
-0000000160 00000 n
-0000000270 00000 n
-0000000383 00000 n
-0000000498 00000 n
-0000000606 00000 n
-0000000777 00000 n
-0000000948 00000 n
-0000001066 00000 n
-0000001237 00000 n
-0000001477 00000 n
-0000001687 00000 n
-0000001897 00000 n
-0000002107 00000 n
-0000002279 00000 n
-0000002402 00000 n
-0000002574 00000 n
-0000002746 00000 n
-0000002989 00000 n
-0000003161 00000 n
-0000003333 00000 n
-0000003569 00000 n
-0000003779 00000 n
-0000003989 00000 n
-0000004199 00000 n
-0000004409 00000 n
-0000004619 00000 n
-0000004791 00000 n
-0000005020 00000 n
-0000005129 00000 n
-0000005373 00000 n
-0000005451 00000 n
-0000005571 00000 n
-0000005705 00000 n
-0000005886 00000 n
-0000006039 00000 n
-0000006168 00000 n
-0000006332 00000 n
-0000006488 00000 n
-0000006614 00000 n
-0000006746 00000 n
-0000006924 00000 n
-0000007036 00000 n
-0000007147 00000 n
-0000007315 00000 n
-0000007413 00000 n
-0000007591 00000 n
-0000007706 00000 n
-0000007834 00000 n
-0000007963 00000 n
-0000008074 00000 n
-0000008243 00000 n
-0000008360 00000 n
-0000008508 00000 n
-0000008625 00000 n
-0000008771 00000 n
-0000015286 00000 n
-0000019517 00000 n
-0000023365 00000 n
-0000027828 00000 n
-0000032406 00000 n
-0000037090 00000 n
-0000042519 00000 n
-0000046717 00000 n
-0000053882 00000 n
-0000058097 00000 n
-0000062193 00000 n
-0000067703 00000 n
-0000067856 00000 n
-0000067893 00000 n
-0000067930 00000 n
-0000067967 00000 n
-0000068004 00000 n
-0000068041 00000 n
-0000068078 00000 n
-0000068115 00000 n
-0000068152 00000 n
-0000068189 00000 n
-0000068227 00000 n
-0000068265 00000 n
-trailer
-<< /ID 
- % ReportLab generated PDF document -- digest (http://www.reportlab.com)
- [(<}|~gm\352\320\235=\001p\220v\224\336) (<}|~gm\352\320\235=\001p\220v\224\336)]
- /Info 30 0 R /Root 29 0 R /Size 81 >>
-startxref
-68303
-%%EOF
diff --git a/tests/wpt/web-platform-tests/tools/third_party/enum/enum/test.py b/tests/wpt/web-platform-tests/tools/third_party/enum/enum/test.py
index d9edfaee40a..c8c4b962242 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/enum/enum/test.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/enum/enum/test.py
@@ -452,8 +452,8 @@ class TestEnum(unittest.TestCase):
         self.assertEqual(dates[Season.AUTUMN], '1031')
 
     def test_enum_duplicates(self):
-        _order_ = "SPRING SUMMER AUTUMN WINTER"
         class Season(Enum):
+            _order_ = "SPRING SUMMER AUTUMN WINTER"
             SPRING = 1
             SUMMER = 2
             AUTUMN = FALL = 3
@@ -665,7 +665,7 @@ class TestEnum(unittest.TestCase):
                     protocol=(0, HIGHEST_PROTOCOL))
 
     def test_exploding_pickle(self):
-        BadPickle = Enum('BadPickle', 'dill sweet bread-n-butter')
+        BadPickle = Enum('BadPickle', 'dill sweet bread_n_butter')
         enum._make_class_unpicklable(BadPickle)
         globals()['BadPickle'] = BadPickle
         test_pickle_exception(self.assertRaises, TypeError, BadPickle.dill)
@@ -813,6 +813,27 @@ class TestEnum(unittest.TestCase):
             self.assertTrue(e in SummerMonth)
             self.assertTrue(type(e) is SummerMonth)
 
+    def test_programatic_function_iterable_with_weird_names(self):
+        SummerMonth = Enum(
+                'SummerMonth',
+                (('june', 1), ('july', 2), ('august', 3), ('fabulous september', 4))
+                )
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 4, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august, SummerMonth['fabulous september']],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split() + ['fabulous september']):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
     def test_programatic_function_from_dict(self):
         SummerMonth = Enum(
                 'SummerMonth',
diff --git a/tests/wpt/web-platform-tests/tools/third_party/enum/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/enum/setup.cfg
index 861a9f55426..8bfd5a12f85 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/enum/setup.cfg
+++ b/tests/wpt/web-platform-tests/tools/third_party/enum/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/enum/setup.py b/tests/wpt/web-platform-tests/tools/third_party/enum/setup.py
index 8b284003485..f54071e7f0c 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/enum/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/enum/setup.py
@@ -9,6 +9,14 @@ if sys.version_info[:2] < (2, 7):
 else:
     required = []
 
+# Don't shadow builtin enum package if we are being installed on a
+# recent Python.  This causes conflicts since at least 3.6:
+# https://bitbucket.org/stoneleaf/enum34/issues/19/enum34-isnt-compatible-with-python-36
+if sys.version_info[:2] < (3, 4):
+    packages = ['enum']
+else:
+    packages = []
+
 long_desc = '''\
 enum --- support for enumerations
 ========================================
@@ -54,15 +62,15 @@ Repository and Issue Tracker at https://bitbucket.org/stoneleaf/enum34.
 py2_only = ()
 py3_only = ()
 make = [
-        'rst2pdf enum/doc/enum.rst --output=enum/doc/enum.pdf',
+        # 'rst2pdf enum/doc/enum.rst --output=enum/doc/enum.pdf',
         ]
 
 
 data = dict(
         name='enum34',
-        version='1.1.6',
+        version='1.1.10',
         url='https://bitbucket.org/stoneleaf/enum34',
-        packages=['enum'],
+        packages=packages,
         package_data={
             'enum' : [
                 'LICENSE',
@@ -90,8 +98,6 @@ data = dict(
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3.3',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: 3.5',
             ],
         )
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-close.html b/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-close.html
index cd4ace2a836..e2a5ba77245 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-close.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-close.html
@@ -45,7 +45,7 @@ for (const options of [{}, {negotiated: true, id: 0}]) {
     assert_true(closingSeen, 'Closing event was seen');
   }, `Close ${mode} causes closing and close event to be called`);
 
-  promise_test(async t => {
+   promise_test(async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     const [channel1, channel2] = await createDataChannelPair(t, options, pc1);
@@ -100,5 +100,81 @@ for (const options of [{}, {negotiated: true, id: 0}]) {
     pc1.close();
     await new Promise(resolve => t.step_timeout(resolve, 10));
   }, `Close peerconnection after ${mode} close causes no events`);
+
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
+    pc1.createDataChannel('not-counted', options);
+    const tokenDataChannel = new Promise(resolve => {
+      pc2.ondatachannel = resolve;
+    });
+    exchangeIceCandidates(pc1, pc2);
+    await exchangeOfferAnswer(pc1, pc2);
+    if (!options.negotiated) {
+      await tokenDataChannel;
+    }
+    let closeExpectedCount = 0;
+    let errorExpectedCount = 0;
+    let resolveCountIsZero;
+    let waitForCountIsZero = new Promise(resolve => {
+      resolveCountIsZero = resolve;
+    });
+    for (let i = 1; i <= 10; i++) {
+      if ('id' in options) {
+        options.id = i;
+      }
+      pc1.createDataChannel('', options);
+      if (options.negotiated) {
+        const channel = pc2.createDataChannel('', options);
+        channel.addEventListener('error', t.step_func(event => {
+          assert_true(event instanceof RTCErrorEvent, 'error event ' + event);
+          errorExpectedCount -= 1;
+        }));
+        channel.addEventListener('close', t.step_func(event => {
+          closeExpectedCount -= 1;
+          if (closeExpectedCount == 0) {
+            resolveCountIsZero();
+          }
+        }));
+      } else {
+        await new Promise(resolve => {
+          pc2.ondatachannel = ({channel}) => {
+            channel.addEventListener('error', t.step_func(event => {
+              assert_true(event instanceof RTCErrorEvent);
+              errorExpectedCount -= 1;
+            }));
+            channel.addEventListener('close', t.step_func(event => {
+              closeExpectedCount -= 1;
+              if (closeExpectedCount == 0) {
+                resolveCountIsZero();
+              }
+            }));
+            resolve();
+          }
+        });
+      }
+      ++closeExpectedCount;
+      ++errorExpectedCount;
+    }
+    assert_equals(closeExpectedCount, 10);
+    // We have to wait until SCTP is connected before we close, otherwise
+    // there will be no signal.
+    // The state is not available under Plan B, and unreliable on negotiated
+    // channels.
+    // TODO(bugs.webrtc.org/12259): Remove dependency on "negotiated"
+    if (pc1.sctp && !options.negotiated) {
+      waitForState(pc1.sctp, 'connected');
+    } else {
+      // Under plan B, we don't have a dtls transport to wait on, so just
+      // wait a bit.
+      await new Promise(resolve => t.step_timeout(resolve, 100));
+    }
+    pc1.close();
+    await waitForCountIsZero;
+    assert_equals(closeExpectedCount, 0);
+    assert_equals(errorExpectedCount, 0);
+  }, `Close peerconnection causes close event and error on many channels, ${mode}`);
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/webusb/resources/manual.js b/tests/wpt/web-platform-tests/webusb/resources/manual.js
new file mode 100644
index 00000000000..869ac450acf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/resources/manual.js
@@ -0,0 +1,38 @@
+let manualTestDevice = null;
+
+navigator.usb.addEventListener('disconnect', (e) => {
+  if (e.device === manualTestDevice) {
+    manualTestDevice = null;
+  }
+})
+
+async function getDeviceForManualTest() {
+  if (manualTestDevice) {
+    return manualTestDevice;
+  }
+
+  const button = document.createElement('button');
+  button.textContent = 'Click to select a device';
+  button.style.display = 'block';
+  button.style.fontSize = '20px';
+  button.style.padding = '10px';
+
+  await new Promise((resolve) => {
+    button.onclick = () => {
+      document.body.removeChild(button);
+      resolve();
+    };
+    document.body.appendChild(button);
+  });
+
+  manualTestDevice = await navigator.usb.requestDevice({filters: []});
+  assert_true(manualTestDevice instanceof USBDevice);
+
+  return manualTestDevice;
+}
+
+function manual_usb_test(func, name, properties) {
+  promise_test(async (test) => {
+    await func(test, await getDeviceForManualTest());
+  }, name, properties);
+}
diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_claimInterface-manual.https.html b/tests/wpt/web-platform-tests/webusb/usbDevice_claimInterface-manual.https.html
new file mode 100644
index 00000000000..991c1a9f31f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/usbDevice_claimInterface-manual.https.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual.js"></script>
+  </head>
+  <body>
+    <p>
+      These tests require a USB device to be connected.
+    </p>
+    <script>
+      manual_usb_test(async (t, device) => {
+        await device.open();
+        const interfacesClaimed = [];
+        t.add_cleanup(async () => {
+          for (const iface of interfacesClaimed) {
+            await device.releaseInterface(iface.interfaceNumber);
+          }
+          await device.close();
+        });
+
+        await device.selectConfiguration(1);
+
+        const promises = [];
+        for (const iface of device.configuration.interfaces) {
+          const promise = device.claimInterface(iface.interfaceNumber);
+          promises.push(promise);
+
+          // Create a subtest for each interface so that success or failure to
+          // claim the interface is visible but does not affect the result of
+          // the overall test.
+          promise_test(async (t) => {
+            await promise;
+
+            interfacesClaimed.push(iface);
+          }, `Can claim interface ${iface.interfaceNumber}`);
+        }
+
+        await Promise.allSettled(promises);
+      }, 'claimInterface() resolves or rejects for all interfaces');
+    </script>
+  </body>
+</html>
\ No newline at end of file