This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12308

hgweb: remove Python 3 conditional
ClosedPublic

Authored by indygreg on Mar 2 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7eebe5630bcc: hgweb: remove Python 3 conditional
Summary

We probably have a better tobytes() implementation somewhere in pycompat.
But I don't want to bloat scope of this commit.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 2 2022, 6:31 PM
Alphare requested changes to this revision.Mar 3 2022, 5:39 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/hgweb/request.py
162–163

Maybe remove the Python 2 mention here since it's not useful anymore?

This revision now requires changes to proceed.Mar 3 2022, 5:39 AM
indygreg updated this revision to Diff 32470.Mar 3 2022, 11:09 AM
Alphare accepted this revision.Mar 3 2022, 11:19 AM
This revision is now accepted and ready to land.Mar 3 2022, 11:19 AM
indygreg added a commit: rHG7eebe5630bcc: hgweb: remove Python 3 conditional.Mar 3 2022, 11:56 AM
Closed by commit rHG7eebe5630bcc: hgweb: remove Python 3 conditional (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/request.py (32 lines)

Diff 32521

mercurial/hgweb/request.py

from. If not defined, ``wsgi.input`` from the environment dict is used. from. If not defined, ``wsgi.input`` from the environment dict is used.
""" """
# PEP 3333 defines the WSGI spec and is a useful reference for this code. # PEP 3333 defines the WSGI spec and is a useful reference for this code.
# We first validate that the incoming object conforms with the WSGI spec. # We first validate that the incoming object conforms with the WSGI spec.
# We only want to be dealing with spec-conforming WSGI implementations. # We only want to be dealing with spec-conforming WSGI implementations.
# TODO enable this once we fix internal violations. # TODO enable this once we fix internal violations.
# wsgiref.validate.check_environ(env) # wsgiref.validate.check_environ(env)
# PEP-0333 states that environment keys and values are native strings # PEP-0333 states that environment keys and values are native strings.
AlphareUnsubmitted
Not Done

Maybe remove the Python 2 mention here since it's not useful anymore?

Alphare: Maybe remove the Python 2 mention here since it's not useful anymore?
# (bytes on Python 2 and str on Python 3). The code points for the Unicode # The code points for the Unicode strings on Python 3 must be between
# strings on Python 3 must be between \00000-\000FF. We deal with bytes # \00000-\000FF. We deal with bytes in Mercurial, so mass convert string
# in Mercurial, so mass convert string keys and values to bytes. # keys and values to bytes.
if pycompat.ispy3:
def tobytes(s): def tobytes(s):
if not isinstance(s, str): if not isinstance(s, str):
return s return s
if pycompat.iswindows: if pycompat.iswindows:
# This is what mercurial.encoding does for os.environ on # This is what mercurial.encoding does for os.environ on
# Windows. # Windows.
return encoding.strtolocal(s) return encoding.strtolocal(s)
else: else:
# This is what is documented to be used for os.environ on Unix. # This is what is documented to be used for os.environ on Unix.
return pycompat.fsencode(s) return pycompat.fsencode(s)
env = {tobytes(k): tobytes(v) for k, v in pycompat.iteritems(env)} env = {tobytes(k): tobytes(v) for k, v in pycompat.iteritems(env)}
# Some hosting solutions are emulating hgwebdir, and dispatching directly # Some hosting solutions are emulating hgwebdir, and dispatching directly
# to an hgweb instance using this environment variable. This was always # to an hgweb instance using this environment variable. This was always
# checked prior to d7fd203e36cc; keep doing so to avoid breaking them. # checked prior to d7fd203e36cc; keep doing so to avoid breaking them.
if not reponame: if not reponame:
reponame = env.get(b'REPO_NAME') reponame = env.get(b'REPO_NAME')
if altbaseurl: if altbaseurl: