Skip to content

Commit 692b7f0

Browse files
committed
Remove vendored six and webencodings
urllib3 vendors six and webencodings was last used by html5lib.
1 parent a7369ba commit 692b7f0

19 files changed

+2
-2172
lines changed

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ repos:
4040
'types-docutils==0.20.0.3',
4141
'types-setuptools==68.2.0.0',
4242
'types-freezegun==1.1.10',
43-
'types-six==1.16.21.9',
4443
'types-pyyaml==6.0.12.12',
4544
]
4645

MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ recursive-include src/pip/_vendor py.typed
2929
recursive-include docs *.css *.py *.rst *.md
3030
recursive-include docs *.dot *.png
3131

32-
exclude src/pip/_vendor/six
33-
exclude src/pip/_vendor/six/moves
3432
recursive-exclude src/pip/_vendor *.pyi
3533

3634
prune .github

news/six.vendor.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove vendored six.

news/webencodings.vendor.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove vendored webencodings.

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,13 @@ drop = [
139139
]
140140

141141
[tool.vendoring.typing-stubs]
142-
six = ["six.__init__", "six.moves.__init__", "six.moves.configparser"]
143142
distro = []
144143

145144
[tool.vendoring.license.directories]
146145
setuptools = "pkg_resources"
147146

148147
[tool.vendoring.license.fallback-urls]
149148
distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
150-
webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"
151149

152150
######################################################################################
153151
# ruff

src/pip/_vendor/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ def vendored(modulename):
6363
vendored("colorama")
6464
vendored("distlib")
6565
vendored("distro")
66-
vendored("six")
67-
vendored("six.moves")
68-
vendored("six.moves.urllib")
69-
vendored("six.moves.urllib.parse")
7066
vendored("packaging")
7167
vendored("packaging.version")
7268
vendored("packaging.specifiers")

src/pip/_vendor/six.LICENSE

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)