( )⚙ D2688 hgweb: adapt to socket._fileobject changes in Python 3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2688

hgweb: adapt to socket._fileobject changes in Python 3
ClosedPublic

Authored by durin42 on Mar 4 2018, 9:19 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGbf9a04d78084: hgweb: adapt to socket._fileobject changes in Python 3
Summary

These are the only uses of socket._fileobject in the codebase, so
let's just do something inline here rather than adding something to
pycompat.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 4 2018, 9:19 PM
yuja requested changes to this revision.Mar 6 2018, 4:37 AM
yuja added a subscriber: yuja.

As long as self.request is a socket object, we can use request.makefile() on Python 2.

This revision now requires changes to proceed.Mar 6 2018, 4:37 AM
durin42 updated this revision to Diff 6673.Mar 6 2018, 1:42 PM
durin42 added a comment.Mar 6 2018, 1:43 PM

Oh, good catch. Fixed and passes tests on 2.7. :)

yuja accepted this revision.Mar 8 2018, 7:35 AM
This revision is now accepted and ready to land.Mar 8 2018, 7:35 AM
Closed by commit rHGbf9a04d78084: hgweb: adapt to socket._fileobject changes in Python 3 (authored by durin42). · Explain WhyMar 8 2018, 8:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/server.py (4 lines)

Diff 6673

mercurial/hgweb/server.py

httpserver.socket = sslutil.wrapserversocket(httpserver.socket, httpserver.socket = sslutil.wrapserversocket(httpserver.socket,
ui, ui,
certfile=certfile, certfile=certfile,
cafile=cafile, cafile=cafile,
requireclientcert=reqcert) requireclientcert=reqcert)
def setup(self): def setup(self):
self.connection = self.request self.connection = self.request
self.rfile = socket._fileobject(self.request, "rb", self.rbufsize) self.rfile = self.request.makefile(r"rb", self.rbufsize)
self.wfile = socket._fileobject(self.request, "wb", self.wbufsize) self.wfile = self.request.makefile(r"wb", self.wbufsize)
try: try:
import threading import threading
threading.activeCount() # silence pyflakes and bypass demandimport threading.activeCount() # silence pyflakes and bypass demandimport
_mixin = socketserver.ThreadingMixIn _mixin = socketserver.ThreadingMixIn
except ImportError: except ImportError:
if util.safehasattr(os, "fork"): if util.safehasattr(os, "fork"):
_mixin = socketserver.ForkingMixIn _mixin = socketserver.ForkingMixIn