This is an archive of the discontinued Mercurial Phabricator instance.

Differential D966

hgweb: produce native string for etag value
ClosedPublic

Authored by durin42 on Oct 5 2017, 5:32 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG67873ec0f4ce: hgweb: produce native string for etag value
rHGef4046642089: hgweb: produce native string for etag value
rHG9fdcc560a2ae: hgweb: produce native string for etag value
Summary

Also use %d since we know mtime is numeric.

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

durin42 created this revision.Oct 5 2017, 5:32 PM
quark added a subscriber: quark.Oct 5 2017, 9:58 PM
quark added inline comments.
mercurial/hgweb/common.py
211

It seems we are depending on os.stat_float_times(False). But that is deprecated in Python 3. If the API gets removed, mtime might be a float.

indygreg accepted this revision.Oct 6 2017, 9:42 AM
indygreg added a subscriber: indygreg.

I need to brush off my static immutable series so we can do something sensible with caching.

The reliance on stat_float_times() is a bit concerning. But Python 3 support is still very much a work in progress and we can fix this issue later. It would be nice to have a TODO to track it though.

This revision is now accepted and ready to land.Oct 6 2017, 9:42 AM
Closed by commit rHG9fdcc560a2ae: hgweb: produce native string for etag value (authored by durin42). · Explain WhyOct 8 2017, 4:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/common.py (2 lines)

Diff 2526

mercurial/hgweb/common.py

web.contact is the primary source, but if that is not set, try web.contact is the primary source, but if that is not set, try
ui.username or $EMAIL as a fallback to display something useful. ui.username or $EMAIL as a fallback to display something useful.
""" """
return (config("web", "contact") or return (config("web", "contact") or
config("ui", "username") or config("ui", "username") or
encoding.environ.get("EMAIL") or "") encoding.environ.get("EMAIL") or "")
def caching(web, req): def caching(web, req):
tag = 'W/"%s"' % web.mtime tag = r'W/"%d"' % web.mtime
quarkUnsubmitted
Not Done

It seems we are depending on os.stat_float_times(False). But that is deprecated in Python 3. If the API gets removed, mtime might be a float.

quark: It seems we are depending on `os.stat_float_times(False)`. But that is deprecated in Python 3.
if req.env.get('HTTP_IF_NONE_MATCH') == tag: if req.env.get('HTTP_IF_NONE_MATCH') == tag:
raise ErrorResponse(HTTP_NOT_MODIFIED) raise ErrorResponse(HTTP_NOT_MODIFIED)
req.headers.append(('ETag', tag)) req.headers.append(('ETag', tag))
def cspvalues(ui): def cspvalues(ui):
"""Obtain the Content-Security-Policy header and nonce value. """Obtain the Content-Security-Policy header and nonce value.
Returns a 2-tuple of the CSP header value and the nonce value. Returns a 2-tuple of the CSP header value and the nonce value.