mercurial-source: mercurial/pycompat.py annotate

annotate mercurial/pycompat.py @ 32348:e68932dfbb55

pycompat: define urlreq.urlparse and urlreq.unparse aliases Currently, we export urlparse via util.urlparse then call util.urlparse.urlparse() and util.urlparse.urlunparse() in a few places. This is the only url* module exported from pycompat, making it a one-off. So let's transition to urlreq to match everything else. Yes, we double import "urlparse" now on Python 2. This will be cleaned up in a subsequent patch. Also, the Python 3 functions trade in str/unicode not bytes. So we'll likely need to write a custom implementation that speaks bytes. But moving everyone to an abstracted API is a good first step.

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Tue, 21 Mar 2017 22:34:17 -0700 (2017-03-22)
parents	6c9772867344
children	55c6788c54e2

rev	line source
29568 6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	1 # pycompat.py - portability shim for python 3
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	2 #
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	3 # This software may be used and distributed according to the terms of the
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	4 # GNU General Public License version 2 or any later version.
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	5
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	6 """Mercurial portability shim for python 3.
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	7
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	8 This contains aliases to hide python version-specific details from the core.
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	9 """
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	10
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	11 from __future__ import absolute_import
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	12
31357 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	13 import getopt
31081 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 31079 diff changeset	14 import os
31457 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	15 import shlex
30345 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	16 import sys
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	17
30810 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 30571 diff changeset	18 ispy3 = (sys.version_info[0] >= 3)
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 30571 diff changeset	19
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 30571 diff changeset	20 if not ispy3:
30074 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 29632 diff changeset	21 import cPickle as pickle
30216 0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 30194 diff changeset	22 import httplib
30345 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	23 import Queue as _queue
30194 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30193 diff changeset	24 import SocketServer as socketserver
30345 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	25 import urlparse
30193 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 30192 diff changeset	26 import xmlrpclib
30345 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	27 else:
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	28 import http.client as httplib
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	29 import pickle
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	30 import queue as _queue
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	31 import socketserver
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 30327 diff changeset	32 import urllib.parse as urlparse
30193 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 30192 diff changeset	33 import xmlrpc.client as xmlrpclib
30192 80880ad3fccd py3: conditionalize the urlparse import Pulkit Goyal <7895pulkit@gmail.com> parents: 30175 diff changeset	34
30810 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 30571 diff changeset	35 if ispy3:
30567 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 30540 diff changeset	36 import builtins
30569 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	37 import functools
32151 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 32138 diff changeset	38 import io
32203 4acc49335a6e py3: optimize py3 compat.bytechr using Struct.pack Martin von Zweigbergk <martinvonz@google.com> parents: 32179 diff changeset	39 import struct
32151 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 32138 diff changeset	40
30898 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30865 diff changeset	41 fsencode = os.fsencode
31079 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30912 diff changeset	42 fsdecode = os.fsdecode
31081 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 31079 diff changeset	43 # A bytes version of os.name.
3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 31079 diff changeset	44 osname = os.name.encode('ascii')
31082 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 31081 diff changeset	45 ospathsep = os.pathsep.encode('ascii')
ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 31081 diff changeset	46 ossep = os.sep.encode('ascii')
31402 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 31358 diff changeset	47 osaltsep = os.altsep
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 31358 diff changeset	48 if osaltsep:
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 31358 diff changeset	49 osaltsep = osaltsep.encode('ascii')
31279 fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 31251 diff changeset	50 # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which
fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 31251 diff changeset	51 # returns bytes.
fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 31251 diff changeset	52 getcwd = os.getcwdb
31403 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 31402 diff changeset	53 sysplatform = sys.platform.encode('ascii')
31447 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 31442 diff changeset	54 sysexecutable = sys.executable
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 31442 diff changeset	55 if sysexecutable:
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 31442 diff changeset	56 sysexecutable = os.fsencode(sysexecutable)
32138 73b3bee8febe pycompat: default to BytesIO instead of StringIO Pulkit Goyal <7895pulkit@gmail.com> parents: 32080 diff changeset	57 stringio = io.BytesIO
32280 a1e40ceee640 pycompat: add maplist alias for old map behavior Augie Fackler <augie@google.com> parents: 32218 diff changeset	58 maplist = lambda args: list(map(args))
31113 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	59
31251 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	60 # TODO: .buffer might not exist if std streams were replaced; we'll need
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	61 # a silly wrapper to make a bytes stream backed by a unicode one.
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	62 stdin = sys.stdin.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	63 stdout = sys.stdout.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	64 stderr = sys.stderr.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	65
31113 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	66 # Since Python 3 converts argv to wchar_t type by Py_DecodeLocale() on Unix,
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	67 # we can use os.fsencode() to get back bytes argv.
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	68 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	69 # https://hg.python.org/cpython/file/v3.5.1/Programs/python.c#l55
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	70 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	71 # TODO: On Windows, the native argv is wchar_t, so we'll need a different
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 31109 diff changeset	72 # workaround to simulate the Python 2 (i.e. ANSI Win32 API) behavior.
32056 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 31599 diff changeset	73 if getattr(sys, 'argv', None) is not None:
86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 31599 diff changeset	74 sysargv = list(map(os.fsencode, sys.argv))
30567 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 30540 diff changeset	75
32203 4acc49335a6e py3: optimize py3 compat.bytechr using Struct.pack Martin von Zweigbergk <martinvonz@google.com> parents: 32179 diff changeset	76 bytechr = struct.Struct('>B').pack
32032 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31928 diff changeset	77
32218 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	78 class bytestr(bytes):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	79 """A bytes which mostly acts as a Python 2 str
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	80
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	81 >>> bytestr(), bytestr(bytearray(b'foo')), bytestr(u'ascii'), bytestr(1)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	82 (b'', b'foo', b'ascii', b'1')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	83 >>> s = bytestr(b'foo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	84 >>> assert s is bytestr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	85
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	86 There's no implicit conversion from non-ascii str as its encoding is
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	87 unknown:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	88
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	89 >>> bytestr(chr(0x80)) # doctest: +ELLIPSIS
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	90 Traceback (most recent call last):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	91 ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	92 UnicodeEncodeError: ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	93
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	94 Comparison between bytestr and bytes should work:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	95
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	96 >>> assert bytestr(b'foo') == b'foo'
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	97 >>> assert b'foo' == bytestr(b'foo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	98 >>> assert b'f' in bytestr(b'foo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	99 >>> assert bytestr(b'f') in b'foo'
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	100
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	101 Sliced elements should be bytes, not integer:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	102
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	103 >>> s[1], s[:2]
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	104 (b'o', b'fo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	105 >>> list(s), list(reversed(s))
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	106 ([b'f', b'o', b'o'], [b'o', b'o', b'f'])
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	107
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	108 As bytestr type isn't propagated across operations, you need to cast
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	109 bytes to bytestr explicitly:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	110
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	111 >>> s = bytestr(b'foo').upper()
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	112 >>> t = bytestr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	113 >>> s[0], t[0]
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	114 (70, b'F')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	115
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	116 Be careful to not pass a bytestr object to a function which expects
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	117 bytearray-like behavior.
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	118
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	119 >>> t = bytes(t) # cast to bytes
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	120 >>> assert type(t) is bytes
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	121 """
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	122
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	123 def __new__(cls, s=b''):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	124 if isinstance(s, bytestr):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	125 return s
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	126 if not isinstance(s, (bytes, bytearray)):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	127 s = str(s).encode(u'ascii')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	128 return bytes.__new__(cls, s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	129
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	130 def __getitem__(self, key):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	131 s = bytes.__getitem__(self, key)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	132 if not isinstance(s, bytes):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	133 s = bytechr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	134 return s
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	135
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	136 def __iter__(self):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	137 return iterbytestr(bytes.__iter__(self))
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	138
32161 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 32151 diff changeset	139 def iterbytestr(s):
c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 32151 diff changeset	140 """Iterate bytes as if it were a str object of Python 2"""
32204 63a39d647888 py3: make py3 compat.iterbytestr simpler and faster Martin von Zweigbergk <martinvonz@google.com> parents: 32203 diff changeset	141 return map(bytechr, s)
32161 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 32151 diff changeset	142
30811 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	143 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	144 """Return a keyword str to be passed to Python functions such as
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	145 getattr() and str.encode()
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	146
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	147 This never raises UnicodeDecodeError. Non-ascii characters are
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	148 considered invalid and mapped to arbitrary but unique code points
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	149 such that 'sysstr(a) != sysstr(b)' for all 'a != b'.
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	150 """
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	151 if isinstance(s, builtins.str):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	152 return s
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	153 return s.decode(u'latin-1')
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	154
30569 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	155 def _wrapattrfunc(f):
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	156 @functools.wraps(f)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	157 def w(object, name, *args):
30811 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	158 return f(object, sysstr(name), *args)
30569 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	159 return w
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	160
30570 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 30569 diff changeset	161 # these wrappers are automagically imported by hgloader
30569 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	162 delattr = _wrapattrfunc(builtins.delattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	163 getattr = _wrapattrfunc(builtins.getattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	164 hasattr = _wrapattrfunc(builtins.hasattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	165 setattr = _wrapattrfunc(builtins.setattr)
30570 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 30569 diff changeset	166 xrange = builtins.range
30569 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 30568 diff changeset	167
31928 76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 31599 diff changeset	168 def open(name, mode='r', buffering=-1):
76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 31599 diff changeset	169 return builtins.open(name, sysstr(mode), buffering)
76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 31599 diff changeset	170
31357 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	171 # getopt.getopt() on Python 3 deals with unicodes internally so we cannot
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	172 # pass bytes there. Passing unicodes will result in unicodes as return
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	173 # values which we need to convert again to bytes.
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	174 def getoptb(args, shortlist, namelist):
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	175 args = [a.decode('latin-1') for a in args]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	176 shortlist = shortlist.decode('latin-1')
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	177 namelist = [a.decode('latin-1') for a in namelist]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	178 opts, args = getopt.getopt(args, shortlist, namelist)
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	179 opts = [(a[0].encode('latin-1'), a[1].encode('latin-1'))
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	180 for a in opts]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	181 args = [a.encode('latin-1') for a in args]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	182 return opts, args
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	183
31358 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	184 # keys of keyword arguments in Python need to be strings which are unicodes
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	185 # Python 3. This function takes keyword arguments, convert the keys to str.
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	186 def strkwargs(dic):
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	187 dic = dict((k.decode('latin-1'), v) for k, v in dic.iteritems())
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	188 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	189
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	190 # keys of keyword arguments need to be unicode while passing into
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	191 # a function. This function helps us to convert those keys back to bytes
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	192 # again as we need to deal with bytes.
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	193 def byteskwargs(dic):
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	194 dic = dict((k.encode('latin-1'), v) for k, v in dic.iteritems())
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	195 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	196
31457 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	197 # shlex.split() accepts unicodes on Python 3. This function takes bytes
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	198 # argument, convert it into unicodes, pass into shlex.split(), convert the
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	199 # returned value to bytes and return that.
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	200 # TODO: handle shlex.shlex().
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	201 def shlexsplit(s):
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	202 ret = shlex.split(s.decode('latin-1'))
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	203 return [a.encode('latin-1') for a in ret]
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	204
30811 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	205 else:
32151 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 32138 diff changeset	206 import cStringIO
06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 32138 diff changeset	207
32032 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31928 diff changeset	208 bytechr = chr
32218 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 32204 diff changeset	209 bytestr = str
32161 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 32151 diff changeset	210 iterbytestr = iter
32032 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31928 diff changeset	211
30811 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	212 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	213 return s
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30810 diff changeset	214
30912 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	215 # Partial backport from os.py in Python 3, which only accepts bytes.
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	216 # In Python 2, our paths should only ever be bytes, a unicode path
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	217 # indicates a bug.
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	218 def fsencode(filename):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	219 if isinstance(filename, str):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	220 return filename
30898 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30865 diff changeset	221 else:
30912 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	222 raise TypeError(
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30898 diff changeset	223 "expect str, not %s" % type(filename).__name__)
30898 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30865 diff changeset	224
31079 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30912 diff changeset	225 # In Python 2, fsdecode() has a very chance to receive bytes. So it's
42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30912 diff changeset	226 # better not to touch Python 2 part as it's already working fine.
42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30912 diff changeset	227 def fsdecode(filename):
42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30912 diff changeset	228 return filename
42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30912 diff changeset	229
31357 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	230 def getoptb(args, shortlist, namelist):
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	231 return getopt.getopt(args, shortlist, namelist)
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 31279 diff changeset	232
31358 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	233 def strkwargs(dic):
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	234 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	235
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	236 def byteskwargs(dic):
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	237 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31357 diff changeset	238
31081 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 31079 diff changeset	239 osname = os.name
31082 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 31081 diff changeset	240 ospathsep = os.pathsep
ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 31081 diff changeset	241 ossep = os.sep
31402 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 31358 diff changeset	242 osaltsep = os.altsep
31251 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	243 stdin = sys.stdin
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	244 stdout = sys.stdout
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 31113 diff changeset	245 stderr = sys.stderr
32056 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 31599 diff changeset	246 if getattr(sys, 'argv', None) is not None:
86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 31599 diff changeset	247 sysargv = sys.argv
31403 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 31402 diff changeset	248 sysplatform = sys.platform
31279 fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 31251 diff changeset	249 getcwd = os.getcwd
31447 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 31442 diff changeset	250 sysexecutable = sys.executable
31457 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 31447 diff changeset	251 shlexsplit = shlex.split
32151 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 32138 diff changeset	252 stringio = cStringIO.StringIO
32280 a1e40ceee640 pycompat: add maplist alias for old map behavior Augie Fackler <augie@google.com> parents: 32218 diff changeset	253 maplist = map
31081 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 31079 diff changeset	254
29568 6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	255 empty = _queue.Empty
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	256 queue = _queue.Queue
29584 2fac032c1269 pycompat: alias xrange to range in py3 timeless <timeless@mozdev.org> parents: 29583 diff changeset	257
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	258 class _pycompatstub(object):
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	259 def __init__(self):
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	260 self._aliases = {}
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	261
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	262 def _registeraliases(self, origin, items):
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	263 """Add items that will be populated at the first access"""
30865 f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30811 diff changeset	264 items = map(sysstr, items)
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30811 diff changeset	265 self._aliases.update(
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30811 diff changeset	266 (item.replace(sysstr('_'), sysstr('')).lower(), (origin, item))
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30811 diff changeset	267 for item in items)
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	268
32345 c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 32280 diff changeset	269 def _registeralias(self, origin, attr, name):
c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 32280 diff changeset	270 """Alias ``origin``.``attr`` as ``name``"""
c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 32280 diff changeset	271 self._aliases[sysstr(name)] = (origin, sysstr(attr))
c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 32280 diff changeset	272
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	273 def __getattr__(self, name):
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	274 try:
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	275 origin, item = self._aliases[name]
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	276 except KeyError:
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	277 raise AttributeError(name)
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	278 self.__dict__[name] = obj = getattr(origin, item)
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	279 return obj
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	280
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	281 httpserver = _pycompatstub()
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	282 urlreq = _pycompatstub()
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	283 urlerr = _pycompatstub()
30810 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 30571 diff changeset	284 if not ispy3:
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	285 import BaseHTTPServer
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	286 import CGIHTTPServer
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	287 import SimpleHTTPServer
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	288 import urllib2
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	289 import urllib
32348 e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	290 import urlparse
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	291 urlreq._registeraliases(urllib, (
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	292 "addclosehook",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	293 "addinfourl",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	294 "ftpwrapper",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	295 "pathname2url",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	296 "quote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	297 "splitattr",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	298 "splitpasswd",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	299 "splitport",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	300 "splituser",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	301 "unquote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	302 "url2pathname",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	303 "urlencode",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	304 ))
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	305 urlreq._registeraliases(urllib2, (
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	306 "AbstractHTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	307 "BaseHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	308 "build_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	309 "FileHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	310 "FTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	311 "HTTPBasicAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	312 "HTTPDigestAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	313 "HTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	314 "HTTPPasswordMgrWithDefaultRealm",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	315 "HTTPSHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	316 "install_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	317 "ProxyHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	318 "Request",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	319 "urlopen",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	320 ))
32348 e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	321 urlreq._registeraliases(urlparse, (
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	322 "urlparse",
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	323 "urlunparse",
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	324 ))
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	325 urlerr._registeraliases(urllib2, (
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	326 "HTTPError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	327 "URLError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	328 ))
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	329 httpserver._registeraliases(BaseHTTPServer, (
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	330 "HTTPServer",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	331 "BaseHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	332 ))
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	333 httpserver._registeraliases(SimpleHTTPServer, (
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	334 "SimpleHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	335 ))
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	336 httpserver._registeraliases(CGIHTTPServer, (
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	337 "CGIHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	338 ))
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	339
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	340 else:
32178 1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	341 import urllib.parse
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	342 urlreq._registeraliases(urllib.parse, (
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	343 "splitattr",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	344 "splitpasswd",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	345 "splitport",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	346 "splituser",
32348 e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	347 "urlparse",
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 32347 diff changeset	348 "urlunparse",
32178 1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	349 ))
32345 c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 32280 diff changeset	350 urlreq._registeralias(urllib.parse, "unquote_to_bytes", "unquote")
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	351 import urllib.request
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	352 urlreq._registeraliases(urllib.request, (
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	353 "AbstractHTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	354 "BaseHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	355 "build_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	356 "FileHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	357 "FTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	358 "ftpwrapper",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	359 "HTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	360 "HTTPSHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	361 "install_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	362 "pathname2url",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	363 "HTTPBasicAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	364 "HTTPDigestAuthHandler",
30175 2646fbba4ca7 pycompat: add HTTPPasswordMgrWithDefaultRealm to Python 3 block Gregory Szorc <gregory.szorc@gmail.com> parents: 30166 diff changeset	365 "HTTPPasswordMgrWithDefaultRealm",
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	366 "ProxyHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	367 "Request",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	368 "url2pathname",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	369 "urlopen",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	370 ))
32178 1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	371 import urllib.response
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	372 urlreq._registeraliases(urllib.response, (
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	373 "addclosehook",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	374 "addinfourl",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 32161 diff changeset	375 ))
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	376 import urllib.error
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	377 urlerr._registeraliases(urllib.error, (
29632 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	378 "HTTPError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	379 "URLError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 29585 diff changeset	380 ))
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	381 import http.server
30571 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 30570 diff changeset	382 httpserver._registeraliases(http.server, (
30327 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	383 "HTTPServer",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	384 "BaseHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	385 "SimpleHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	386 "CGIHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 30216 diff changeset	387 ))
32179 fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	388
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	389 # urllib.parse.quote() accepts both str and bytes, decodes bytes
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	390 # (if necessary), and returns str. This is wonky. We provide a custom
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	391 # implementation that only accepts bytes and emits bytes.
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	392 def quote(s, safe=r'/'):
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	393 s = urllib.parse.quote_from_bytes(s, safe=safe)
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	394 return s.encode('ascii', 'strict')
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	395
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 32178 diff changeset	396 urlreq.quote = quote

Mercurial > hg > mercurial-source

annotate mercurial/pycompat.py @ 32348:e68932dfbb55