This is an archive of the discontinued Mercurial Phabricator instance.

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

			Path	Packages
M			mercurial/hgweb/common.py (2 lines)

Status	Author	Revision
Closed	durin42	D970 hgweb: extract function for loading style from request context
Closed	durin42	D969 request: coerce content-type to native str
Closed	durin42	D968 request: use trivial iterator over dictionary keys
Closed	durin42	D967 hgweb: when constructing or adding to a wsgi environ dict, use native strs
Closed	durin42	D966 hgweb: produce native string for etag value
Closed	durin42	D965 templatefilters: be sure we always feed cgi.escape a str
Closed	durin42	D964 python3: move from using func_name to __name__
Closed	durin42	D963 hgweb: in protocol adapter, look for bytes instances, not str
Closed	durin42	D962 hgweb: in protocol adapter, avoid control reaching end of non-void function

Diff 2482

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.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2482		Oct 5 2017, 5:32 PM	★	★
Diff 2	2526	rHG9fdcc560a2ae9326886002050b2d966625498036	Oct 5 2017, 2:17 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

hgweb: produce native string for etag valueClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2482

mercurial/hgweb/common.py

hgweb: produce native string for etag value
ClosedPublic

Revision Contents
Changeset List