comparison mercurial/keepalive.py @ 37665:83250442dc81

py3: use str variables to check keys in request header

The values in header are of str type.

Differential Revision: https://phab.mercurial-scm.org/D3326

37664:483cafc3762a

        headers = util.sortdict(self.parent.addheaders)
        headers.update(sorted(req.headers.items()))
        headers.update(sorted(req.unredirected_hdrs.items()))
        headers = util.sortdict((n.lower(), v) for n, v in headers.items())
        skipheaders = {}
        for n in ('host', 'accept-encoding'):
            if n in headers:
                skipheaders['skip_' + n.replace('-', '_')] = 1
        try:
            if urllibcompat.hasdata(req):
                data = urllibcompat.getdata(req)
                h.putrequest(
                    req.get_method(), urllibcompat.getselector(req),
                    **pycompat.strkwargs(skipheaders))
                if r'content-type' not in headers:
                    h.putheader(r'Content-type',
                                r'application/x-www-form-urlencoded')
                if r'content-length' not in headers:
                    h.putheader(r'Content-length', r'%d' % len(data))
            else:
                h.putrequest(
                    req.get_method(), urllibcompat.getselector(req),
                    **pycompat.strkwargs(skipheaders))
        except socket.error as err:
            raise urlerr.urlerror(err)
        for k, v in headers.items():
            h.putheader(k, v)
        h.endheaders()

37665:83250442dc81

        headers = util.sortdict(self.parent.addheaders)
        headers.update(sorted(req.headers.items()))
        headers.update(sorted(req.unredirected_hdrs.items()))
        headers = util.sortdict((n.lower(), v) for n, v in headers.items())
        skipheaders = {}
        for n in (r'host', r'accept-encoding'):
            if n in headers:
                skipheaders[r'skip_' + n.replace(r'-', r'_')] = 1
        try:
            if urllibcompat.hasdata(req):
                data = urllibcompat.getdata(req)
                h.putrequest(
                    req.get_method(), urllibcompat.getselector(req),
                    skipheaders)
                if r'content-type' not in headers:
                    h.putheader(r'Content-type',
                                r'application/x-www-form-urlencoded')
                if r'content-length' not in headers:
                    h.putheader(r'Content-length', r'%d' % len(data))
            else:
                h.putrequest(
                    req.get_method(), urllibcompat.getselector(req),
                    skipheaders)
        except socket.error as err:
            raise urlerr.urlerror(err)
        for k, v in headers.items():
            h.putheader(k, v)
        h.endheaders()