This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3343

hgweb: these strings should be sysstrs, not bytes
ClosedPublic

Authored by durin42 on Apr 14 2018, 12:31 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa1110db1e455: hgweb: these strings should be sysstrs, not bytes
Summary

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.Apr 14 2018, 12:31 AM
durin42 updated this revision to Diff 8311.Apr 16 2018, 4:17 PM
indygreg accepted this revision.Apr 16 2018, 7:08 PM
This revision is now accepted and ready to land.Apr 16 2018, 7:08 PM
Closed by commit rHGa1110db1e455: hgweb: these strings should be sysstrs, not bytes (authored by durin42). · Explain WhyApr 16 2018, 7:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 8337

mercurial/hgweb/common.py

def __getattr__(self, attr): def __getattr__(self, attr):
if attr in ('close', 'readline', 'readlines', '__iter__'): if attr in ('close', 'readline', 'readlines', '__iter__'):
return getattr(self.f, attr) return getattr(self.f, attr)
raise AttributeError raise AttributeError
def _statusmessage(code): def _statusmessage(code):
responses = httpserver.basehttprequesthandler.responses responses = httpserver.basehttprequesthandler.responses
return responses.get(code, ('Error', 'Unknown error'))[0] return pycompat.bytesurl(
responses.get(code, (r'Error', r'Unknown error'))[0])
def statusmessage(code, message=None): def statusmessage(code, message=None):
return '%d %s' % (code, message or _statusmessage(code)) return '%d %s' % (code, message or _statusmessage(code))
def get_stat(spath, fn): def get_stat(spath, fn):
"""stat fn if it exists, spath otherwise""" """stat fn if it exists, spath otherwise"""
cl_path = os.path.join(spath, fn) cl_path = os.path.join(spath, fn)
if os.path.exists(cl_path): if os.path.exists(cl_path):