This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2094

wireprotoserver: define and use parse_qs from urllib
ClosedPublic

Authored by indygreg on Feb 8 2018, 12:21 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa3d42d1865f1: wireprotoserver: define and use parse_qs from urllib
Summary

The cgi module is deprecated since Python 2.6. Let's replace uses
of it in wireprotoserver with a similar function from urllib.

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

indygreg created this revision.Feb 8 2018, 12:21 AM
durin42 accepted this revision.Feb 12 2018, 4:26 PM
This revision is now accepted and ready to land.Feb 12 2018, 4:26 PM
Closed by commit rHGa3d42d1865f1: wireprotoserver: define and use parse_qs from urllib (authored by indygreg). · Explain WhyFeb 12 2018, 4:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5538

mercurial/urllibcompat.py

urlreq._registeraliases(urllib.parse, ( urlreq._registeraliases(urllib.parse, (
"splitattr", "splitattr",
"splitpasswd", "splitpasswd",
"splitport", "splitport",
"splituser", "splituser",
"urlparse", "urlparse",
"urlunparse", "urlunparse",
)) ))
urlreq._registeralias(urllib.parse, "parse_qs", "parseqs")
urlreq._registeralias(urllib.parse, "unquote_to_bytes", "unquote") urlreq._registeralias(urllib.parse, "unquote_to_bytes", "unquote")
import urllib.request import urllib.request
urlreq._registeraliases(urllib.request, ( urlreq._registeraliases(urllib.request, (
"AbstractHTTPHandler", "AbstractHTTPHandler",
"BaseHandler", "BaseHandler",
"build_opener", "build_opener",
"FileHandler", "FileHandler",
"FTPHandler", "FTPHandler",
"ProxyHandler", "ProxyHandler",
"Request", "Request",
"urlopen", "urlopen",
)) ))
urlreq._registeraliases(urlparse, ( urlreq._registeraliases(urlparse, (
"urlparse", "urlparse",
"urlunparse", "urlunparse",
)) ))
urlreq._registeralias(urlparse, "parse_qs", "parseqs")
urlerr._registeraliases(urllib2, ( urlerr._registeraliases(urllib2, (
"HTTPError", "HTTPError",
"URLError", "URLError",
)) ))
httpserver._registeraliases(BaseHTTPServer, ( httpserver._registeraliases(BaseHTTPServer, (
"HTTPServer", "HTTPServer",
"BaseHTTPRequestHandler", "BaseHTTPRequestHandler",
)) ))

mercurial/wireprotoserver.py

# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import abc import abc
import cgi
import contextlib import contextlib
import struct import struct
import sys import sys
from .i18n import _ from .i18n import _
from . import ( from . import (
encoding, encoding,
error, error,
else: else:
data[k] = knownargs[k][0] data[k] = knownargs[k][0]
return [data[k] for k in keys] return [data[k] for k in keys]
def _args(self): def _args(self):
args = util.rapply(pycompat.bytesurl, self._req.form.copy()) args = util.rapply(pycompat.bytesurl, self._req.form.copy())
postlen = int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0)) postlen = int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0))
if postlen: if postlen:
args.update(cgi.parse_qs( args.update(urlreq.parseqs(
self._req.read(postlen), keep_blank_values=True)) self._req.read(postlen), keep_blank_values=True))
return args return args
argvalue = decodevaluefromheaders(self._req, r'X-HgArg') argvalue = decodevaluefromheaders(self._req, r'X-HgArg')
args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) args.update(urlreq.parseqs(argvalue, keep_blank_values=True))
return args return args
def forwardpayload(self, fp): def forwardpayload(self, fp):
length = int(self._req.env[r'CONTENT_LENGTH']) length = int(self._req.env[r'CONTENT_LENGTH'])
# If httppostargs is used, we need to read Content-Length # If httppostargs is used, we need to read Content-Length
# minus the amount that was consumed by args. # minus the amount that was consumed by args.
length -= int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0)) length -= int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0))
for s in util.filechunkiter(self._req, limit=length): for s in util.filechunkiter(self._req, limit=length):