This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2598

httpconnection: convert url to bytes in readauthforuri
ClosedPublic

Authored by durin42 on Mar 3 2018, 2:30 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG6b1eb4c610b4: httpconnection: convert url to bytes in readauthforuri
Summary

This method is sometimes called by the stdlib, so we just need to
accept both bytes and unicodes here. Awesome.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 3 2018, 2:30 PM
yuja accepted this revision.Mar 3 2018, 2:43 PM
This revision is now accepted and ready to land.Mar 3 2018, 2:43 PM
Closed by commit rHG6b1eb4c610b4: httpconnection: convert url to bytes in readauthforuri (authored by durin42). · Explain WhyMar 3 2018, 3:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httpconnection.py (2 lines)

Diff 6450

mercurial/httpconnection.py

# httpconnection.py - urllib2 handler for new http support # httpconnection.py - urllib2 handler for new http support
# #
# Copyright 2005, 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> # Copyright 2005, 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
# Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br> # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
# Copyright 2011 Google, Inc. # Copyright 2011 Google, Inc.
# #
# 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 os import os
from .i18n import _ from .i18n import _
from . import ( from . import (
pycompat,
util, util,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
# moved here from url.py to avoid a cycle # moved here from url.py to avoid a cycle
class httpsendfile(object): class httpsendfile(object):
def __enter__(self): def __enter__(self):
return self return self
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
self.close() self.close()
# moved here from url.py to avoid a cycle # moved here from url.py to avoid a cycle
def readauthforuri(ui, uri, user): def readauthforuri(ui, uri, user):
uri = pycompat.bytesurl(uri)
# Read configuration # Read configuration
groups = {} groups = {}
for key, val in ui.configitems('auth'): for key, val in ui.configitems('auth'):
if key in ('cookiefile',): if key in ('cookiefile',):
continue continue
if '.' not in key: if '.' not in key:
ui.warn(_("ignoring invalid [auth] key '%s'\n") % key) ui.warn(_("ignoring invalid [auth] key '%s'\n") % key)