annotate roundup/anypy/html.py @ 8185:e84d4585b16d

fix(web): issue2551356. Add etag header for not-modified (304) request. When a 304 is returned to a conditional request for a static file, print an ETag for the response. ETag was always sent with a 200 response. This also adds initial support for if-none-match conditional requests for static files. Changes: Refactors the if-modified-since code out to a method. It moves a file stat call from serve_static_file to _serve_file so that an etag can be generated by both serve_static_file and serve_file which call _serve_file. Tests added. This does not test the codepath where serve_file pulls content from the database rather than from a local file on disk. Test mocking _serve_file changed to account for 5th argument to serve_file BREAKING CHANGE: function signature for client.py-Client::_serve_file() now has 5 not 4 parameters (added etag param). Since this is a "hidden" method I am not too worried about it.
author John Rouillard <rouilj@ieee.org>
date Tue, 10 Dec 2024 16:06:13 -0500
parents 7f888f046857
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5837
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
1 try:
6027
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
2 from html import escape as html_escape_ # python 3
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
3
7769
7f888f046857 chore: ruff lint: replace str variable name with string
John Rouillard <rouilj@ieee.org>
parents: 6027
diff changeset
4 def html_escape(string, quote=False):
5837
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
5 # html_escape under python 3 sets quote to true by default
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
6 # make it python 2 compatible
7769
7f888f046857 chore: ruff lint: replace str variable name with string
John Rouillard <rouilj@ieee.org>
parents: 6027
diff changeset
7 return html_escape_(string, quote=quote)
5837
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
8 except ImportError:
6027
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
9 # python 2 fallback
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
10 from cgi import escape as html_escape # noqa: F401

Roundup Issue Tracker: http://roundup-tracker.org/