Remove use of six.integer_types/string_types/text_type #28789
Conversation
wpt-pr-bot
requested review from
andreastt,
asutherland,
AutomatedTester,
inexorabletash,
jdm,
jgraham,
LukeZielinski,
mikewest,
mjzffr,
mkruisselbrink,
shs96c,
wanderview,
whimboo and
zqzhang
foolip
force-pushed
the
foolip/six_constants
branch
3 times, most recently
from
49e4c05
to
9c1d8d6
Compare
|
I was about to ask if you understood the WebDriver failures, but now you pushed a new version (and of course there's no good interdiff) :) |
|
@jgraham I didn't change anything, I just wanted to rebase on top of other six changes to ensure no new lint failures. I just commented on part of the webdriver diffs. Overall, any times I've touched webdriver/ recently the claimed differences have been large. There seems to be a lot of flakiness, have you seen the same? To be expected? |
|
Understanding the CI failures. wpt-chrome-dev-stability and wpt-firefox-nightly-stability timed out in repetition 5 / 10 because too many tests (171) are affected. There are a lot of apparent changes in the webdriver test results, but there could be flakiness. Combining the two set of before/after runs to look for consistent regressions: Yes, I did break stuff! "FAIL message: NameError: name 'six' is not defined" I'll iterate until there are no unexplained regressions and the request review. |
|
Care must be taken when merging this and #28757. Both change |
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.
foolip
force-pushed
the
foolip/six_constants
branch
from
ff350f9
to
89be305
Compare
|
OK, this has now been rebased and the issue in #28789 (comment) sorted. Ready for final review. |
|
I've taken a final look for regressions using two runs to filter out flakiness, and all that remains is the expected changes due to test names being fixed: |
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.