Skip to content

Drop support for EOL Python 2.7, 3.5 and 3.6 #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Drop support for EOL Python 2.7, 3.5 and 3.6 #536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
637e90b
Drop support for EOL Python 2.7 and 3.5
hugovk Jan 11, 2021
2f1d6e0
Upgrade Python syntax with pyupgrade --py3-plus
hugovk May 24, 2021
f375ba8
Remove six
hugovk May 24, 2021
c289f9d
Upgrade Python syntax with pyupgrade --py36-plus
hugovk May 24, 2021
03f46e2
AppVeyor: Use Python 3.6 as base version
hugovk May 24, 2021
c99417d
Merge remote-tracking branch 'upstream/master' into rm-eol
hugovk Apr 3, 2022
a090381
Universal wheels for supporting Python 2 and 3
hugovk Apr 3, 2022
043c019
Remove unused mock dependency
hugovk Apr 3, 2022
589b01c
Fix PytestRemovedIn8Warning: The (fspath: py.path.local) argument to …
hugovk Apr 20, 2022
4d975c6
Drop support for EOL Python 3.6
hugovk Jul 6, 2022
67b42b7
Upgrade Python syntax for Python 3.7+
hugovk Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Upgrade Python syntax for Python 3.7+
  • Loading branch information
@hugovk
hugovk committed Jul 6, 2022
commit 67b42b705cdb129e5833f113914764aaecc9e34b
10 changes: 2 additions & 8 deletions html5lib/_tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from collections import deque, OrderedDict
from sys import version_info
from collections import deque

from .constants import spaceCharacters
from .constants import entities
Expand All @@ -14,11 +13,6 @@

entitiesTrie = Trie(entities)

if version_info >= (3, 7):
attributeMap = dict
else:
attributeMap = OrderedDict


class HTMLTokenizer:
""" This class takes care of tokenizing HTML.
Expand Down Expand Up @@ -232,7 +226,7 @@ def emitCurrentToken(self):
token["name"] = token["name"].translate(asciiUpper2Lower)
if token["type"] == tokenTypes["StartTag"]:
raw = token["data"]
data = attributeMap(raw)
data = dict(raw)
if len(raw) > len(data):
# we had some duplicated attribute, fix so first wins
data.update(raw[::-1])
Expand Down
9 changes: 4 additions & 5 deletions html5lib/tests/test_treewalkers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import itertools
import sys

import pytest

Expand Down Expand Up @@ -139,8 +138,8 @@ def test_lxml_xml():
@pytest.mark.parametrize("treeName",
[pytest.param(treeName, marks=[getattr(pytest.mark, treeName),
pytest.mark.skipif(
treeName != "lxml" or
sys.version_info < (3, 7), reason="dict order undef")])
treeName != "lxml",
reason="dict order undef")])
for treeName in sorted(treeTypes.keys())])
def test_maintain_attribute_order(treeName):
treeAPIs = treeTypes[treeName]
Expand Down Expand Up @@ -172,8 +171,8 @@ def test_maintain_attribute_order(treeName):
@pytest.mark.parametrize("treeName",
[pytest.param(treeName, marks=[getattr(pytest.mark, treeName),
pytest.mark.skipif(
treeName != "lxml" or
sys.version_info < (3, 7), reason="dict order undef")])
treeName != "lxml",
reason="dict order undef")])
for treeName in sorted(treeTypes.keys())])
def test_maintain_attribute_order_adjusted(treeName):
treeAPIs = treeTypes[treeName]
Expand Down