durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2688 AFFECTED FILES mercurial/hgweb/server.py CHANGE DETAILS diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -257,8 +257,10 @@ def setup(self): self.connection = self.request - self.rfile = socket._fileobject(self.request, "rb", self.rbufsize) - self.wfile = socket._fileobject(self.request, "wb", self.wbufsize) + fo = getattr(socket, '_fileobject', + lambda s, mode, bufsize: s.makefile(mode, bufsize)) + self.rfile = fo(self.request, r"rb", self.rbufsize) + self.wfile = fo(self.request, r"wb", self.wbufsize) try: import threading To: durin42, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel