( )⚙ D1135 webutil: use pycompat.bytestr() instead of str()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1135

webutil: use pycompat.bytestr() instead of str()
ClosedPublic

Authored by durin42 on Oct 16 2017, 10:56 PM.

Details

Reviewers
pulkit
ryanmce
Group Reviewers
hg-reviewers
Commits
rHG3caec3c032c8: webutil: use pycompat.bytestr() instead of str()
Summary

Stops us from choking the templater on Python 3. With this patch
applied, much of hgweb works correctly in Python 3. The notable
exception is the graph page, which chokes because it gets node IDs as
str instead of bytes.

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 16 2017, 10:56 PM
pulkit accepted this revision.Oct 17 2017, 6:42 AM
ryanmce added a subscriber: ryanmce.Oct 17 2017, 8:20 AM
ryanmce added inline comments.
mercurial/hgweb/webutil.py
593–597

Buhhhhh, this looks ugly as sin. Can we drop 'name' to the next line please? (I can do that in-flight, actually)

ryanmce accepted this revision.Oct 17 2017, 8:39 AM

queued

This revision is now accepted and ready to land.Oct 17 2017, 8:39 AM
Closed by commit rHG3caec3c032c8: webutil: use pycompat.bytestr() instead of str() (authored by durin42). · Explain WhyOct 17 2017, 8:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/webutil.py (6 lines)

Diff 2909

mercurial/hgweb/webutil.py

from .. import ( from .. import (
context, context,
error, error,
match, match,
mdiff, mdiff,
patch, patch,
pathutil, pathutil,
pycompat,
templatefilters, templatefilters,
ui as uimod, ui as uimod,
util, util,
) )
def up(p): def up(p):
if p[0] != "/": if p[0] != "/":
p = "/" + p p = "/" + p
return self.vars[key] return self.vars[key]
def __setitem__(self, key, value): def __setitem__(self, key, value):
self.vars[key] = value self.vars[key] = value
def __copy__(self): def __copy__(self):
return sessionvars(copy.copy(self.vars), self.start) return sessionvars(copy.copy(self.vars), self.start)
def __iter__(self): def __iter__(self):
separator = self.start separator = self.start
for key, value in sorted(self.vars.iteritems()): for key, value in sorted(self.vars.iteritems()):
yield {'name': key, 'value': str(value), 'separator': separator} yield {'name': key,
'value': pycompat.bytestr(value),
'separator': separator,
}
separator = '&' separator = '&'
ryanmceUnsubmitted
Not Done

Buhhhhh, this looks ugly as sin. Can we drop 'name' to the next line please? (I can do that in-flight, actually)

ryanmce: Buhhhhh, this looks ugly as sin. Can we drop 'name' to the next line please? (I can do that in…
class wsgiui(uimod.ui): class wsgiui(uimod.ui):
# default termwidth breaks under mod_wsgi # default termwidth breaks under mod_wsgi
def termwidth(self): def termwidth(self):
return 80 return 80
def getwebsubs(repo): def getwebsubs(repo):
websubtable = [] websubtable = []