This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6840

hgweb: add a `message` attribute to `hgweb.common.ErrorResponse`
ClosedPublic

Authored by sheehan on Sep 10 2019, 4:10 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8d9322b6e687: hgweb: add a `message` attribute to `hgweb.common.ErrorResponse`
Summary

This fixes a Python 3 bug where hgweb assumes an Exception
subclass will have a .message attribute after running
Exception.__init__.[1] The Python 3 way to get this info would
be e.args[0], but adding a new named attribute is more
ergonomic in my view.

[1] https://www.mercurial-scm.org/repo/hg-committed/file/6ccf539aec71/mercurial/hgweb/hgwebdir_mod.py#l459

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

sheehan created this revision.Sep 10 2019, 4:10 PM
sheehan added a comment.Sep 10 2019, 4:13 PM

The error I mentioned looks like this:

Traceback (most recent call last):
  File "/var/hg/venv_hgweb/lib64/python3.6/site-packages/mercurial/hgweb/hgwebdir_mod.py", line 358, in run_wsgi
    for r in self._runwsgi(req, res):
  File "/var/hg/venv_hgweb/lib64/python3.6/site-packages/mercurial/hgweb/hgwebdir_mod.py", line 463, in _runwsgi
    res.setbodygen(tmpl.generate('error', {'error': e.message or ''}))
AttributeError: 'ErrorResponse' object has no attribute 'message'
pulkit accepted this revision.Sep 11 2019, 2:26 AM
This revision is now accepted and ready to land.Sep 11 2019, 2:26 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/common.py (1 line)

Diff 16513

mercurial/hgweb/common.py

def __init__(self, code, message=None, headers=None): def __init__(self, code, message=None, headers=None):
if message is None: if message is None:
message = _statusmessage(code) message = _statusmessage(code)
Exception.__init__(self, pycompat.sysstr(message)) Exception.__init__(self, pycompat.sysstr(message))
self.code = code self.code = code
if headers is None: if headers is None:
headers = [] headers = []
self.headers = headers self.headers = headers
self.message = message
class continuereader(object): class continuereader(object):
"""File object wrapper to handle HTTP 100-continue. """File object wrapper to handle HTTP 100-continue.
This is used by servers so they automatically handle Expect: 100-continue This is used by servers so they automatically handle Expect: 100-continue
request headers. On first read of the request body, the 100 Continue request headers. On first read of the request body, the 100 Continue
response is sent. This should trigger the client into actually sending response is sent. This should trigger the client into actually sending
the request body. the request body.