Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ee890ed
bpo-46337: Enumerate URL types for urllib's scheme-based behavior
oldaccountdeadname Jan 10, 2022
53c6ccc
bpo-46337: Allow caller modification of url classes
oldaccountdeadname Jan 10, 2022
41d3b58
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 10, 2022
eee880c
bpo-46337: Fix grammar of doc comment.
oldaccountdeadname Feb 26, 2022
f9b59dd
bpo-46337: document SchemeClass behavior
oldaccountdeadname Feb 26, 2022
1691a1e
add newline to end of news file
oldaccountdeadname Feb 28, 2022
c7ae936
bpo-46337: fix doctest formatting
oldaccountdeadname Mar 12, 2022
4fc9059
doc: fix some doctests
oldaccountdeadname Mar 12, 2022
c07600c
bpo-43677: fixup PEP 8 style
oldaccountdeadname Mar 13, 2022
07a8576
Merge branch 'main' into urllib-custom-schemes
JelleZijlstra Mar 29, 2022
2c4aa3a
urllib: use an enum.FLAG for SchemeClass's.
oldaccountdeadname Mar 30, 2022
5f81d16
urllib: rename SchemeClass to SchemeFlag
oldaccountdeadname Mar 30, 2022
226bbe9
urllib: remove SchemeFlag.NONE
oldaccountdeadname Mar 31, 2022
ff88881
doc/urllib: remove old references to SchemeClass
oldaccountdeadname Mar 31, 2022
bf64df0
news: update news file to use SchemeFlag name
oldaccountdeadname Mar 31, 2022
6a09c38
doc/urllib: fix formatting and wording
oldaccountdeadname Mar 31, 2022
9d7cfb5
urllib: expose enums SchemeFlag variants directly
oldaccountdeadname Mar 31, 2022
81d3414
urllib: add UNIVERSAL SchemeFlag
oldaccountdeadname Mar 31, 2022
677ed1a
use None rather than SchemeFlag in public API
oldaccountdeadname Apr 21, 2022
0ec4a4e
do not import from enum
oldaccountdeadname Apr 21, 2022
b25e0e8
doc: correct urljoin signature
oldaccountdeadname Apr 21, 2022
2123ad7
make flags parameter keyword-only
oldaccountdeadname Apr 21, 2022
9f50dfb
s/classes/flags
oldaccountdeadname Apr 21, 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
Next Next commit
doc/urllib: remove old references to SchemeClass
This was renamed to urllib; docs should reflect that.
  • Loading branch information
oldaccountdeadname committed Mar 31, 2022
commit ff888811ee68f2c623b265a514e213c6f42cfda9
10 changes: 5 additions & 5 deletions Doc/library/urllib.parse.rst
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,11 @@ or on combining URL components into a URL string.
with an empty query; the RFC states that these are equivalent).


.. function:: urljoin(base, url, allow_fragments=True, classes=SchemeClass.NONE)
.. function:: urljoin(base, url, allow_fragments=True, classes=SchemeFlag.NONE)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/SchemeFlag.NONE/SchemeFlag(0)/


Construct a full ("absolute") URL by combining a "base URL"
(*base*) with another URL (*url*), and with behavior given by a
``SchemeClass`` enum. Informally, this uses components of the base
``SchemeFlag`` flag. Informally, this uses components of the base
URL, in particular the addressing scheme, the network location and
(part of) the path, to provide missing components in the relative
URL. For example:
Expand All @@ -363,7 +363,7 @@ or on combining URL components into a URL string.
'http://www.cwi.nl/%7Eguido/FAQ.html'

The *allow_fragments* argument has the same meaning and default as
for :func:`urlparse`. As in :func:`urlparse`, a ``SchemeClass`` may
for :func:`urlparse`. As in :func:`urlparse`, a ``SchemeFlag`` may
be given to override behavior inferred by the scheme.

.. note::
Expand Down Expand Up @@ -547,8 +547,8 @@ operating on :class:`bytes` or :class:`bytearray` objects:

.. versionadded:: 3.2

Special URL Behaviors and Scheme Classes
----------------------------------------
Special URL Behaviors and Scheme Flags
--------------------------------------

:mod:`urllib.parse` recognizes three special properties of URLs, namely relative
addressing (used in, for instance, the ``ftp``, ``http``, or ``gopher``
Expand Down