Remove six and other Python 2+3 compatibility code #28776

foolip · 2021-05-01T16:16:50Z

After https://github.com/web-platform-tests/rfcs/blob/master/rfcs/py_3.md there's some cleanup is possible. Most obvious is the use of six, but there are other things like checking sys.version_info as well.

This is a tracking issue just to link them together for discoverability after the fact.

The text was updated successfully, but these errors were encountered:

We can assume Python 3.6 or later. Part of #28776.

Part of #28776.

We can assume Python 3.6 or later. Part of #28776.

These are constants corresponding to just int/str/str in Python 3: https://six.readthedocs.io/#constants This is simple search-replace with the exception of resources/test/conftest.py, where element.text is already a string. If it were None or bytes, then JSON parsing would fail anyway. In service-workers/cache-storage/resources/vary.py, the reason why str(cookie_vary) works was non-obvious. Correct the documentation in tools/wptserve/wptserve/request.py to show that the cookie_vary value would be a CookieValue, not a binary string. Part of #28776.

foolip · 2021-05-03T09:30:56Z

PRs done soon before I filed this issue: #28735 + #28740 + #28747 + #28748

pyvirtualdisplay would perhaps have been nice, but the tests just run on the real display currently. Part of #28776.

These are constants corresponding to just int/str/str in Python 3: https://six.readthedocs.io/#constants This is simple search-replace with the exception of resources/test/conftest.py, where element.text is already a string. If it were None or bytes, then JSON parsing would fail anyway. In service-workers/cache-storage/resources/vary.py, the reason why str(cookie_vary) works was non-obvious. Correct the documentation in tools/wptserve/wptserve/request.py to show that the cookie_vary value would be a CookieValue, not a binary string. Since no use of six remains in tools/wptserve/, it's removed as a dependency in wptserve's setup.py. Part of #28776.

Part of #28776.

These are constants corresponding to just int/str/str in Python 3: https://six.readthedocs.io/#constants This is simple search-replace with the exception of resources/test/conftest.py, where element.text is already a string. If it were None or bytes, then JSON parsing would fail anyway. In service-workers/cache-storage/resources/vary.py, the reason why str(cookie_vary) works was non-obvious. Correct the documentation in tools/wptserve/wptserve/request.py to show that the cookie_vary value would be a CookieValue, not a binary string. Since no use of six remains in tools/wptserve/, it's removed as a dependency in wptserve's setup.py. Part of #28776.

…8760) Part of #28776.

In Python 3, it's an alias for io.BytesIO: https://six.readthedocs.io/#six.BytesIO Part of #28776.

Part of #28776, sort of.

These are constants corresponding to just int/str/str in Python 3: https://six.readthedocs.io/#constants This is simple search-replace with the exception of resources/test/conftest.py, where element.text is already a string. If it were None or bytes, then JSON parsing would fail anyway. In service-workers/cache-storage/resources/vary.py, the reason why str(cookie_vary) works was non-obvious. Correct the documentation in tools/wptserve/wptserve/request.py to show that the cookie_vary value would be a CookieValue, not a binary string. Since no use of six remains in tools/wptserve/, it's removed as a dependency in wptserve's setup.py. Part of #28776.

pyvirtualdisplay would perhaps have been nice, but the tests just run on the real display currently. Part of #28776.

os.environ always uses str on Python 3, there's a new os.environb for a bytes version, which isn't supported on Windows: https://docs.python.org/3/library/os.html#os.environ https://docs.python.org/3/library/os.html#os.environb Simply trust os.environ to be a dict[str, str], and simplify the openssl.py code to something more like in GeckoDriverServer and elsewhere: https://github.com/web-platform-tests/wpt/blob/302039ac7c43c71bc5389104c81871b81d6cc9e0/tools/wptrunner/wptrunner/webdriver_server.py#L187-L193 Part of #28776.

No longer needed on Python 3: https://docs.python.org/3/library/functions.html#func-range Part of #28776.

These are constants corresponding to just int/str/str in Python 3: https://six.readthedocs.io/#constants This is simple search-replace with the exception of resources/test/conftest.py, where element.text is already a string. If it were None or bytes, then JSON parsing would fail anyway. In service-workers/cache-storage/resources/vary.py, the reason why str(cookie_vary) works was non-obvious. Correct the documentation in tools/wptserve/wptserve/request.py to show that the cookie_vary value would be a CookieValue, not a binary string. Since no use of six remains in tools/wptserve/, it's removed as a dependency in wptserve's setup.py. Part of #28776.

Part of #28776.

Part of #28776. See also #28929.

Implementation of this for Python 3: https://github.com/web-platform-tests/wpt/blob/aa9b753e75bb0c7de5a05277c91cef3a7a7348e4/tools/third_party/six/six.py#L697-L706 Simplifying that step by step leads to the new code. Part of #28776.

Part of #28776.

Part of #28776. See also #28929.

Part of #28776.

foolip · 2021-05-10T12:36:11Z

There are pull requests up for all remaining use of six now, with #28935 still a draft. I'd like to enably mypy for that code first to trust the change more.

…28930) Part of #28776. See also #28929.

…ypes/text_type, a=testonly Automatic update from web-platform-tests Remove use of six.integer_types/string_types/text_type (#28789) These are constants corresponding to just int/str/str in Python 3: https://six.readthedocs.io/#constants This is simple search-replace with the exception of resources/test/conftest.py, where element.text is already a string. If it were None or bytes, then JSON parsing would fail anyway. In service-workers/cache-storage/resources/vary.py, the reason why str(cookie_vary) works was non-obvious. Correct the documentation in tools/wptserve/wptserve/request.py to show that the cookie_vary value would be a CookieValue, not a binary string. Since no use of six remains in tools/wptserve/, it's removed as a dependency in wptserve's setup.py. Part of web-platform-tests/wpt#28776. -- wpt-commits: 3d43b6e82565100055bf160373a10a2388472cfe wpt-pr: 28789

…to only accept strings, a=testonly Automatic update from web-platform-tests Simplify GitHubChecksOutputter.output() to only accept strings (#28920) All of the call sites are ultimately using string literals: https://github.com/web-platform-tests/wpt/blob/53b3a8eda25cce01aec86f70d0d1c4354ea7e09f/tools/ci/tc/sink_task.py#L32-L43 https://github.com/web-platform-tests/wpt/blob/53b3a8eda25cce01aec86f70d0d1c4354ea7e09f/tools/ci/tc/sink_task.py#L59-L63 https://github.com/web-platform-tests/wpt/blob/53b3a8eda25cce01aec86f70d0d1c4354ea7e09f/tools/lint/lint.py#L885-L902 https://github.com/web-platform-tests/wpt/blob/53b3a8eda25cce01aec86f70d0d1c4354ea7e09f/tools/lint/lint.py#L850-L856 https://github.com/web-platform-tests/wpt/blob/53b3a8eda25cce01aec86f70d0d1c4354ea7e09f/tools/lint/lint.py#L1105-L1106 https://github.com/web-platform-tests/wpt/blob/53b3a8eda25cce01aec86f70d0d1c4354ea7e09f/tools/wptrunner/wptrunner/stability.py#L181-L202 Part of web-platform-tests/wpt#28776. -- wpt-commits: 79d642cba49526a5a6529e6c47c6f3b855ab17e8 wpt-pr: 28920

…r (never bytes), a=testonly Automatic update from web-platform-tests Rely on argparse argument types being str (never bytes) (#28921) Tweak the test to no longer test bytes input, but do test that a trailing newline is stripped, which could matter. Part of web-platform-tests/wpt#28776. -- wpt-commits: ea77e651548088e996ea1c50b5acf7ff4c66c078 wpt-pr: 28921

…hunker, a=testonly Automatic update from web-platform-tests Remove use of six.ensure_binary in HashChunker (#28923) Encoding as iso-8859-1 would be faster and could never fail, but stick with the default utf8 encoding to not change the existing order. Part of web-platform-tests/wpt#28776. -- wpt-commits: 208e86d5df6cb4c197e85e46f404a71f86bbc834 wpt-pr: 28923

…testonly Automatic update from web-platform-tests Tear down the load_and_update facade (#28922) Part of web-platform-tests/wpt#28776. -- wpt-commits: 3bdf00edecac0b70aaac05797d73d9171140074d wpt-pr: 28922

… bytes), a=testonly Automatic update from web-platform-tests Rely on os.path.* returning strings (not bytes) (#28926) Part of web-platform-tests/wpt#28776. -- wpt-commits: d25f59487c39042b3d2ee9309f8cc740e48236da wpt-pr: 28926

Automatic update from web-platform-tests Remove use of six.reraise (#28887) Implementation of this for Python 3: https://github.com/web-platform-tests/wpt/blob/aa9b753e75bb0c7de5a05277c91cef3a7a7348e4/tools/third_party/six/six.py#L697-L706 Simplifying that step by step leads to the new code. Part of web-platform-tests/wpt#28776. -- wpt-commits: 402658bca3671639b2873ea4834d83af815e924b wpt-pr: 28887

…ndary, a=testonly Automatic update from web-platform-tests Clean up around PathFilter str/bytes boundary (#28927) Part of web-platform-tests/wpt#28776. -- wpt-commits: 70f4ba37b49c4b4f09d2a85843870e502e532afc wpt-pr: 28927

…() for screenshot decoding, a=testonly Automatic update from web-platform-tests Replace six.ensure_str with just .decode() for screenshot decoding (#28930) Part of web-platform-tests/wpt#28776. See also web-platform-tests/wpt#28929. -- wpt-commits: 9c9f86c4a4ca0c5842a046d7dad2525649f37ae1 wpt-pr: 28930

ConditionalValue.set_value was by all appearances unused, with no other matches for "set_value" in the code base. Part of #28776.

This is by all appearances unused, with no other matches for "set_value" in the code base. This removal brings along with it a use of six.ensure_text. Part of web-platform-tests#28776.

This is by all appearances unused, with no other matches for "set_value" in the code base. This removal brings along with it a use of six.ensure_text. Part of #28776.

ConditionalValue.set_value was by all appearances unused, with no other matches for "set_value" in the code base. Part of #28776.

Fixes #28776.

…, a=testonly Automatic update from web-platform-tests Remove unused ConditionalValue.set_value (#33444) This is by all appearances unused, with no other matches for "set_value" in the code base. This removal brings along with it a use of six.ensure_text. Part of web-platform-tests/wpt#28776. -- wpt-commits: 8678fd4c89c2efe2440f82a0a172dcafff462ff6 wpt-pr: 33444

foolip added the python3 label May 1, 2021

This was referenced May 1, 2021

Remove dead code guarded by sys.version_info checks #28746

Merged

[ci] Remove obsolete PY2_FLAG from ci_wptrunner_infrastructure.sh #28760

Merged

foolip added a commit that referenced this issue May 1, 2021

Remove dead code guarded by sys.version_info checks

a4d4f03

We can assume Python 3.6 or later. Part of #28776.

foolip added a commit that referenced this issue May 1, 2021

[ci] Remove obsolete PY2_FLAG from ci_wptrunner_infrastructure.sh

a44a30e

Part of #28776.

foolip added a commit that referenced this issue May 3, 2021

Remove dead code guarded by sys.version_info checks (#28746)

7d2b160

We can assume Python 3.6 or later. Part of #28776.

foolip mentioned this issue May 3, 2021

Remove use of six.integer_types/string_types/text_type #28789

Merged

foolip added a commit that referenced this issue May 3, 2021

Remove unused dependencies in resources/test/tox.ini

4aaea4c

pyvirtualdisplay would perhaps have been nice, but the tests just run on the real display currently. Part of #28776.

foolip mentioned this issue May 3, 2021

Remove unused dependencies in resources/test/tox.ini #28777

Merged

foolip added a commit that referenced this issue May 3, 2021

[ci] Remove obsolete PY2_FLAG from ci_wptrunner_infrastructure.sh

72f3486

Part of #28776.

foolip added a commit that referenced this issue May 3, 2021

[ci] Remove obsolete PY2_FLAG from ci_wptrunner_infrastructure.sh (#2…

ef8bcba

…8760) Part of #28776.

This was referenced May 3, 2021

Survey of vendored dependencies (tools/third_party/) #28801

Closed

Survey of installed Python dependencies (requirements.txt, commands.json, tox.ini, etc.) #28809

Closed

foolip added a commit that referenced this issue May 4, 2021

Remove use of six.BytesIO

374d1f3

In Python 3, it's an alias for io.BytesIO: https://six.readthedocs.io/#six.BytesIO Part of #28776.

foolip mentioned this issue May 4, 2021

Remove use of six.BytesIO #28818

Merged

foolip added a commit that referenced this issue May 4, 2021

Remove/update obsolete comments about Python 2 issues

b21a46f

Part of #28776, sort of.

foolip mentioned this issue May 4, 2021

Remove/update obsolete comments about Python 2 issues #28822

Merged

jgraham pushed a commit that referenced this issue May 5, 2021

Remove unused dependencies in resources/test/tox.ini

6bff4cd

pyvirtualdisplay would perhaps have been nice, but the tests just run on the real display currently. Part of #28776.

This was referenced May 5, 2021

Simplify code converting os.environ to strings (avoiding six) #28848

Merged

Drop Python 2 support GoogleChromeLabs/pywebsocket3#29

Open

foolip added a commit that referenced this issue May 6, 2021

Remove use of six.range

273d80d

No longer needed on Python 3: https://docs.python.org/3/library/functions.html#func-range Part of #28776.

This was referenced May 6, 2021

Remove use of six.range #28867

Merged

Get all infra working on Python 3 #8820

Closed

foolip added a commit that referenced this issue May 10, 2021

Tear down the load_and_update facade (#28922)

3bdf00e

Part of #28776.

foolip added a commit that referenced this issue May 10, 2021

Rely on os.path.* returning strings (not bytes) (#28926)

d25f594

Part of #28776.

foolip added a commit that referenced this issue May 10, 2021

Replace six.ensure_str with just .decode() for screenshot decoding

c7a7726

Part of #28776. See also #28929.

foolip mentioned this issue May 10, 2021

Replace six.ensure_str with just .decode() for screenshot decoding #28930

Merged

foolip added a commit that referenced this issue May 10, 2021

Clean up around PathFilter str/bytes boundary (#28927)

70f4ba3

Part of #28776.

foolip added a commit that referenced this issue May 10, 2021

Replace six.ensure_str with just .decode() for screenshot decoding

5b6bf28

Part of #28776. See also #28929.

foolip added a commit that referenced this issue May 10, 2021

Remove use of six.ensure_str/ensure_text in wptrunner

0e323f8

Part of #28776.

foolip mentioned this issue May 10, 2021

Remove use of six.ensure_str/ensure_text in wptrunner #28935

Draft

foolip added a commit that referenced this issue May 10, 2021

Replace six.ensure_str with just .decode() for screenshot decoding (#…

9c9f86c

…28930) Part of #28776. See also #28929.

foolip added a commit that referenced this issue Sep 10, 2021

Remove use of six.ensure_str/ensure_text in wptrunner

1b0b650

ConditionalValue.set_value was by all appearances unused, with no other matches for "set_value" in the code base. Part of #28776.

foolip added a commit that referenced this issue Mar 25, 2022

Remove use of six.ensure_str/ensure_text in wptrunner

2afcaa3

ConditionalValue.set_value was by all appearances unused, with no other matches for "set_value" in the code base. Part of #28776.

foolip mentioned this issue Mar 31, 2022

Remove unused ConditionalValue.set_value #33444

Merged

foolip added a commit that referenced this issue Mar 31, 2022

Remove unused ConditionalValue.set_value (#33444)

8678fd4

This is by all appearances unused, with no other matches for "set_value" in the code base. This removal brings along with it a use of six.ensure_text. Part of #28776.

foolip added a commit that referenced this issue Mar 31, 2022

Remove use of six.ensure_str/ensure_text in wptrunner

90af724

ConditionalValue.set_value was by all appearances unused, with no other matches for "set_value" in the code base. Part of #28776.

foolip added a commit that referenced this issue Apr 1, 2022

Remove use of six.ensure_str/ensure_text in wptrunner

087c8ac

Fixes #28776.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove six and other Python 2+3 compatibility code #28776

Remove six and other Python 2+3 compatibility code #28776

foolip commented May 1, 2021

foolip commented May 3, 2021

foolip commented May 10, 2021

Remove six and other Python 2+3 compatibility code #28776

Remove six and other Python 2+3 compatibility code #28776

Comments

foolip commented May 1, 2021

foolip commented May 3, 2021

foolip commented May 10, 2021