mercurial-scm/hg-stable: mercurial/pycompat.py annotate

annotate mercurial/pycompat.py @ 31842:c130d092042a

py3: add a bytes version of urllib.parse.urlencode() to pycompat.py urllib.parse.urlencode() returns unicodes on Python 3. This commit adds a method which will take its output and encode it to bytes so that we can use bytes consistently.

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Fri, 07 Apr 2017 16:00:44 +0530
parents	45761ef1bc93
children	526e4597cca5

rev	line source
28818 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
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	13 import getopt
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	14 import os
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	15 import shlex
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	16 import sys
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	17
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	18 ispy3 = (sys.version_info[0] >= 3)
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	19
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	20 if not ispy3:
29324 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 28882 diff changeset	21 import cPickle as pickle
29455 0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29433 diff changeset	22 import httplib
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	23 import Queue as _queue
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29432 diff changeset	24 import SocketServer as socketserver
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	25 import xmlrpclib
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	26 else:
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	27 import http.client as httplib
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	28 import pickle
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	29 import queue as _queue
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	30 import socketserver
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	31 import xmlrpc.client as xmlrpclib
29431 80880ad3fccd py3: conditionalize the urlparse import Pulkit Goyal <7895pulkit@gmail.com> parents: 29414 diff changeset	32
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	33 def identity(a):
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	34 return a
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	35
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	36 if ispy3:
29808 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 29790 diff changeset	37 import builtins
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	38 import functools
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	39 import io
31433 4acc49335a6e py3: optimize py3 compat.bytechr using Struct.pack Martin von Zweigbergk <martinvonz@google.com> parents: 31409 diff changeset	40 import struct
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	41
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	42 fsencode = os.fsencode
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	43 fsdecode = os.fsdecode
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	44 # A bytes version of os.name.
31778 8181f378b073 pycompat: provide bytes os.linesep Yuya Nishihara <yuya@tcha.org> parents: 31777 diff changeset	45 oslinesep = os.linesep.encode('ascii')
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	46 osname = os.name.encode('ascii')
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	47 ospathsep = os.pathsep.encode('ascii')
ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	48 ossep = os.sep.encode('ascii')
30628 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	49 osaltsep = os.altsep
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	50 if osaltsep:
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	51 osaltsep = osaltsep.encode('ascii')
30509 fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 30481 diff changeset	52 # 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: 30481 diff changeset	53 # returns bytes.
fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 30481 diff changeset	54 getcwd = os.getcwdb
30629 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 30628 diff changeset	55 sysplatform = sys.platform.encode('ascii')
30671 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	56 sysexecutable = sys.executable
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	57 if sysexecutable:
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	58 sysexecutable = os.fsencode(sysexecutable)
31368 73b3bee8febe pycompat: default to BytesIO instead of StringIO Pulkit Goyal <7895pulkit@gmail.com> parents: 31310 diff changeset	59 stringio = io.BytesIO
31508 a1e40ceee640 pycompat: add maplist alias for old map behavior Augie Fackler <augie@google.com> parents: 31448 diff changeset	60 maplist = lambda args: list(map(args))
30344 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	61
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	62 # 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: 30344 diff changeset	63 # 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: 30344 diff changeset	64 stdin = sys.stdin.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	65 stdout = sys.stdout.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	66 stderr = sys.stderr.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	67
30344 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	68 # 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: 30340 diff changeset	69 # 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: 30340 diff changeset	70 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	71 # 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: 30340 diff changeset	72 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	73 # 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: 30340 diff changeset	74 # workaround to simulate the Python 2 (i.e. ANSI Win32 API) behavior.
30888 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	75 if getattr(sys, 'argv', None) is not None:
86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	76 sysargv = list(map(os.fsencode, sys.argv))
29808 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 29790 diff changeset	77
31433 4acc49335a6e py3: optimize py3 compat.bytechr using Struct.pack Martin von Zweigbergk <martinvonz@google.com> parents: 31409 diff changeset	78 bytechr = struct.Struct('>B').pack
31263 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31159 diff changeset	79
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	80 class bytestr(bytes):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	81 """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: 31434 diff changeset	82
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	83 >>> 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: 31434 diff changeset	84 (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: 31434 diff changeset	85 >>> s = bytestr(b'foo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	86 >>> assert s is bytestr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	87
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	88 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: 31434 diff changeset	89 unknown:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	90
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	91 >>> bytestr(chr(0x80)) # doctest: +ELLIPSIS
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	92 Traceback (most recent call last):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	93 ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	94 UnicodeEncodeError: ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	95
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	96 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: 31434 diff changeset	97
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	98 >>> 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: 31434 diff changeset	99 >>> 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: 31434 diff changeset	100 >>> 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: 31434 diff changeset	101 >>> 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: 31434 diff changeset	102
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	103 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: 31434 diff changeset	104
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	105 >>> s[1], s[:2]
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	106 (b'o', b'fo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	107 >>> list(s), list(reversed(s))
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	108 ([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: 31434 diff changeset	109
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	110 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: 31434 diff changeset	111 bytes to bytestr explicitly:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	112
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	113 >>> s = bytestr(b'foo').upper()
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	114 >>> t = bytestr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	115 >>> s[0], t[0]
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	116 (70, b'F')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	117
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	118 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: 31434 diff changeset	119 bytearray-like behavior.
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	120
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	121 >>> 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: 31434 diff changeset	122 >>> assert type(t) is bytes
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	123 """
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	124
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	125 def __new__(cls, s=b''):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	126 if isinstance(s, bytestr):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	127 return s
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	128 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: 31434 diff changeset	129 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: 31434 diff changeset	130 return bytes.__new__(cls, s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	131
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	132 def __getitem__(self, key):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	133 s = bytes.__getitem__(self, key)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	134 if not isinstance(s, bytes):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	135 s = bytechr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	136 return s
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	137
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	138 def __iter__(self):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	139 return iterbytestr(bytes.__iter__(self))
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	140
31391 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	141 def iterbytestr(s):
c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	142 """Iterate bytes as if it were a str object of Python 2"""
31434 63a39d647888 py3: make py3 compat.iterbytestr simpler and faster Martin von Zweigbergk <martinvonz@google.com> parents: 31433 diff changeset	143 return map(bytechr, s)
31391 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	144
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	145 def sysbytes(s):
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	146 """Convert an internal str (e.g. keyword, __doc__) back to bytes
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	147
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	148 This never raises UnicodeEncodeError, but only ASCII characters
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	149 can be round-trip by sysstr(sysbytes(s)).
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	150 """
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	151 return s.encode(u'utf-8')
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	152
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	153 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	154 """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: 30031 diff changeset	155 getattr() and str.encode()
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	156
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	157 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: 30031 diff changeset	158 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: 30031 diff changeset	159 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: 30031 diff changeset	160 """
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	161 if isinstance(s, builtins.str):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	162 return s
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	163 return s.decode(u'latin-1')
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	164
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	165 def _wrapattrfunc(f):
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	166 @functools.wraps(f)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	167 def w(object, name, *args):
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	168 return f(object, sysstr(name), *args)
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	169 return w
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	170
29811 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29810 diff changeset	171 # these wrappers are automagically imported by hgloader
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	172 delattr = _wrapattrfunc(builtins.delattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	173 getattr = _wrapattrfunc(builtins.getattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	174 hasattr = _wrapattrfunc(builtins.hasattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	175 setattr = _wrapattrfunc(builtins.setattr)
29811 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29810 diff changeset	176 xrange = builtins.range
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	177
31159 76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 30820 diff changeset	178 def open(name, mode='r', buffering=-1):
76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 30820 diff changeset	179 return builtins.open(name, sysstr(mode), buffering)
76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 30820 diff changeset	180
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	181 # 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: 30509 diff changeset	182 # 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: 30509 diff changeset	183 # values which we need to convert again to bytes.
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	184 def getoptb(args, shortlist, namelist):
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	185 args = [a.decode('latin-1') for a in args]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	186 shortlist = shortlist.decode('latin-1')
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	187 namelist = [a.decode('latin-1') for a in namelist]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	188 opts, args = getopt.getopt(args, shortlist, namelist)
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	189 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: 30509 diff changeset	190 for a in opts]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	191 args = [a.encode('latin-1') for a in args]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	192 return opts, args
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	193
30584 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	194 # 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: 30583 diff changeset	195 # 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: 30583 diff changeset	196 def strkwargs(dic):
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	197 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: 30583 diff changeset	198 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	199
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	200 # 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: 30583 diff changeset	201 # 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: 30583 diff changeset	202 # 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: 30583 diff changeset	203 def byteskwargs(dic):
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	204 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: 30583 diff changeset	205 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	206
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	207 # 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: 30671 diff changeset	208 # 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: 30671 diff changeset	209 # returned value to bytes and return that.
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	210 # TODO: handle shlex.shlex().
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	211 def shlexsplit(s):
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	212 ret = shlex.split(s.decode('latin-1'))
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	213 return [a.encode('latin-1') for a in ret]
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	214
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	215 else:
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	216 import cStringIO
06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	217
31263 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31159 diff changeset	218 bytechr = chr
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	219 bytestr = str
31391 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	220 iterbytestr = iter
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	221 sysbytes = identity
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	222 sysstr = identity
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	223
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	224 # 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: 30119 diff changeset	225 # 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: 30119 diff changeset	226 # indicates a bug.
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	227 def fsencode(filename):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	228 if isinstance(filename, str):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	229 return filename
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	230 else:
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	231 raise TypeError(
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	232 "expect str, not %s" % type(filename).__name__)
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	233
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	234 # 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: 30133 diff changeset	235 # better not to touch Python 2 part as it's already working fine.
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	236 fsdecode = identity
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	237
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	238 def getoptb(args, shortlist, namelist):
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	239 return getopt.getopt(args, shortlist, namelist)
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	240
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	241 strkwargs = identity
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	242 byteskwargs = identity
30584 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	243
31778 8181f378b073 pycompat: provide bytes os.linesep Yuya Nishihara <yuya@tcha.org> parents: 31777 diff changeset	244 oslinesep = os.linesep
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	245 osname = os.name
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	246 ospathsep = os.pathsep
ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	247 ossep = os.sep
30628 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	248 osaltsep = os.altsep
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	249 stdin = sys.stdin
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	250 stdout = sys.stdout
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	251 stderr = sys.stderr
30888 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	252 if getattr(sys, 'argv', None) is not None:
86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	253 sysargv = sys.argv
30629 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 30628 diff changeset	254 sysplatform = sys.platform
30509 fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 30481 diff changeset	255 getcwd = os.getcwd
30671 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	256 sysexecutable = sys.executable
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	257 shlexsplit = shlex.split
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	258 stringio = cStringIO.StringIO
31508 a1e40ceee640 pycompat: add maplist alias for old map behavior Augie Fackler <augie@google.com> parents: 31448 diff changeset	259 maplist = map
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	260
28818 6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	261 empty = _queue.Empty
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	262 queue = _queue.Queue
28834 2fac032c1269 pycompat: alias xrange to range in py3 timeless <timeless@mozdev.org> parents: 28833 diff changeset	263
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	264 class _pycompatstub(object):
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	265 def __init__(self):
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	266 self._aliases = {}
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	267
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	268 def _registeraliases(self, origin, items):
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	269 """Add items that will be populated at the first access"""
30086 f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30032 diff changeset	270 items = map(sysstr, items)
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30032 diff changeset	271 self._aliases.update(
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30032 diff changeset	272 (item.replace(sysstr('_'), sysstr('')).lower(), (origin, item))
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30032 diff changeset	273 for item in items)
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	274
31572 c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 31508 diff changeset	275 def _registeralias(self, origin, attr, name):
c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 31508 diff changeset	276 """Alias ``origin``.``attr`` as ``name``"""
c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 31508 diff changeset	277 self._aliases[sysstr(name)] = (origin, sysstr(attr))
c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 31508 diff changeset	278
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	279 def __getattr__(self, name):
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	280 try:
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	281 origin, item = self._aliases[name]
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	282 except KeyError:
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	283 raise AttributeError(name)
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	284 self.__dict__[name] = obj = getattr(origin, item)
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	285 return obj
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	286
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	287 httpserver = _pycompatstub()
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	288 urlreq = _pycompatstub()
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	289 urlerr = _pycompatstub()
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	290 if not ispy3:
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	291 import BaseHTTPServer
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	292 import CGIHTTPServer
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	293 import SimpleHTTPServer
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	294 import urllib2
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	295 import urllib
31575 e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	296 import urlparse
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	297 urlreq._registeraliases(urllib, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	298 "addclosehook",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	299 "addinfourl",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	300 "ftpwrapper",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	301 "pathname2url",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	302 "quote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	303 "splitattr",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	304 "splitpasswd",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	305 "splitport",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	306 "splituser",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	307 "unquote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	308 "url2pathname",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	309 "urlencode",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	310 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	311 urlreq._registeraliases(urllib2, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	312 "AbstractHTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	313 "BaseHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	314 "build_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	315 "FileHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	316 "FTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	317 "HTTPBasicAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	318 "HTTPDigestAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	319 "HTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	320 "HTTPPasswordMgrWithDefaultRealm",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	321 "HTTPSHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	322 "install_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	323 "ProxyHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	324 "Request",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	325 "urlopen",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	326 ))
31575 e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	327 urlreq._registeraliases(urlparse, (
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	328 "urlparse",
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	329 "urlunparse",
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	330 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	331 urlerr._registeraliases(urllib2, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	332 "HTTPError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	333 "URLError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	334 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	335 httpserver._registeraliases(BaseHTTPServer, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	336 "HTTPServer",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	337 "BaseHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	338 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	339 httpserver._registeraliases(SimpleHTTPServer, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	340 "SimpleHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	341 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	342 httpserver._registeraliases(CGIHTTPServer, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	343 "CGIHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	344 ))
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	345
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	346 else:
31408 1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	347 import urllib.parse
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	348 urlreq._registeraliases(urllib.parse, (
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	349 "splitattr",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	350 "splitpasswd",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	351 "splitport",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	352 "splituser",
31575 e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	353 "urlparse",
e68932dfbb55 pycompat: define urlreq.urlparse and urlreq.unparse aliases Gregory Szorc <gregory.szorc@gmail.com> parents: 31574 diff changeset	354 "urlunparse",
31408 1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	355 ))
31572 c6df6a23dfe5 pycompat: alias urlreq.unquote to unquote_to_bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 31508 diff changeset	356 urlreq._registeralias(urllib.parse, "unquote_to_bytes", "unquote")
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	357 import urllib.request
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	358 urlreq._registeraliases(urllib.request, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	359 "AbstractHTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	360 "BaseHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	361 "build_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	362 "FileHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	363 "FTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	364 "ftpwrapper",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	365 "HTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	366 "HTTPSHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	367 "install_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	368 "pathname2url",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	369 "HTTPBasicAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	370 "HTTPDigestAuthHandler",
29414 2646fbba4ca7 pycompat: add HTTPPasswordMgrWithDefaultRealm to Python 3 block Gregory Szorc <gregory.szorc@gmail.com> parents: 29405 diff changeset	371 "HTTPPasswordMgrWithDefaultRealm",
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	372 "ProxyHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	373 "Request",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	374 "url2pathname",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	375 "urlopen",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	376 ))
31408 1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	377 import urllib.response
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	378 urlreq._registeraliases(urllib.response, (
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	379 "addclosehook",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	380 "addinfourl",
1ed169c5e235 pycompat: alias urllib symbols directly Gregory Szorc <gregory.szorc@gmail.com> parents: 31391 diff changeset	381 ))
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	382 import urllib.error
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	383 urlerr._registeraliases(urllib.error, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	384 "HTTPError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	385 "URLError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	386 ))
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	387 import http.server
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	388 httpserver._registeraliases(http.server, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	389 "HTTPServer",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	390 "BaseHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	391 "SimpleHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	392 "CGIHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	393 ))
31409 fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	394
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	395 # 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: 31408 diff changeset	396 # (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: 31408 diff changeset	397 # implementation that only accepts bytes and emits bytes.
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	398 def quote(s, safe=r'/'):
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	399 s = urllib.parse.quote_from_bytes(s, safe=safe)
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	400 return s.encode('ascii', 'strict')
fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	401
31842 c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	402 # urllib.parse.urlencode() returns str. We use this function to make
c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	403 # sure we return bytes.
c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	404 def urlencode(query, doseq=False):
c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	405 s = urllib.parse.urlencode(query, doseq=doseq)
c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	406 return s.encode('ascii')
c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	407
31409 fb1f70331ee6 pycompat: custom implementation of urllib.parse.quote() Gregory Szorc <gregory.szorc@gmail.com> parents: 31408 diff changeset	408 urlreq.quote = quote
31842 c130d092042a py3: add a bytes version of urllib.parse.urlencode() to pycompat.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31820 diff changeset	409 urlreq.urlencode = urlencode

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/pycompat.py @ 31842:c130d092042a