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

annotate mercurial/pycompat.py @ 30583:c6ce11f2ee50

py3: make a bytes version of getopt.getopt() getopt.getopt() deals with unicodes on Python 3 internally and if bytes arguments are passed, then it will return TypeError. So we have now pycompat.getoptb() which takes bytes arguments, convert them to unicode, call getopt.getopt() and then convert the returned value back to bytes and then return those value. All the instances of getopt.getopt() are replaced with pycompat.getoptb().

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Tue, 06 Dec 2016 06:36:36 +0530
parents	fc0cfe6c87d7
children	fbc3f73dc802

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
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	15 import sys
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	16
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	17 ispy3 = (sys.version_info[0] >= 3)
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	18
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	19 if not ispy3:
29324 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 28882 diff changeset	20 import cPickle as pickle
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	21 import cStringIO as io
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
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	25 import urlparse
30337 e0d9b6aab4c5 pycompat: introduce an alias for urllib.unquote Augie Fackler <augie@google.com> parents: 30316 diff changeset	26 urlunquote = urlparse.unquote
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	27 import xmlrpclib
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	28 else:
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	29 import http.client as httplib
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	30 import io
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	31 import pickle
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	32 import queue as _queue
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	33 import socketserver
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	34 import urllib.parse as urlparse
30337 e0d9b6aab4c5 pycompat: introduce an alias for urllib.unquote Augie Fackler <augie@google.com> parents: 30316 diff changeset	35 urlunquote = urlparse.unquote_to_bytes
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	36 import xmlrpc.client as xmlrpclib
29431 80880ad3fccd py3: conditionalize the urlparse import Pulkit Goyal <7895pulkit@gmail.com> parents: 29414 diff changeset	37
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	38 if ispy3:
29808 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 29790 diff changeset	39 import builtins
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	40 import functools
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	41 fsencode = os.fsencode
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	42 fsdecode = os.fsdecode
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	43 # A bytes version of os.name.
3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	44 osname = os.name.encode('ascii')
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	45 ospathsep = os.pathsep.encode('ascii')
ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	46 ossep = os.sep.encode('ascii')
30509 fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 30481 diff changeset	47 # 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	48 # returns bytes.
fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 30481 diff changeset	49 getcwd = os.getcwdb
30344 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	50
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	51 # 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	52 # 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	53 stdin = sys.stdin.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	54 stdout = sys.stdout.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	55 stderr = sys.stderr.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	56
30344 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	57 # 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	58 # 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	59 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	60 # 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	61 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	62 # 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	63 # workaround to simulate the Python 2 (i.e. ANSI Win32 API) behavior.
30340 a2f2f694dce9 py3: have bytes version of sys.argv Pulkit Goyal <7895pulkit@gmail.com> parents: 30337 diff changeset	64 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	65
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	66 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	67 """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	68 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	69
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	70 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	71 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	72 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	73 """
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	74 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	75 return s
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	76 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	77
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	78 def _wrapattrfunc(f):
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	79 @functools.wraps(f)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	80 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	81 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	82 return w
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	83
29811 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29810 diff changeset	84 # 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	85 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	86 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	87 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	88 setattr = _wrapattrfunc(builtins.setattr)
29811 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29810 diff changeset	89 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	90
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	91 # 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	92 # 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	93 # 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	94 def getoptb(args, shortlist, namelist):
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	95 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	96 shortlist = shortlist.decode('latin-1')
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	97 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	98 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	99 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	100 for a in opts]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	101 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	102 return opts, args
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	103
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	104 else:
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	105 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	106 return s
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	107
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	108 # 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	109 # 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	110 # indicates a bug.
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	111 def fsencode(filename):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	112 if isinstance(filename, str):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	113 return filename
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	114 else:
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	115 raise TypeError(
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	116 "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	117
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	118 # 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	119 # 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: 30133 diff changeset	120 def fsdecode(filename):
42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	121 return filename
42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	122
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	123 def getoptb(args, shortlist, namelist):
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	124 return getopt.getopt(args, shortlist, namelist)
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	125
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	126 osname = os.name
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	127 ospathsep = os.pathsep
ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	128 ossep = os.sep
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	129 stdin = sys.stdin
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	130 stdout = sys.stdout
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	131 stderr = sys.stderr
30340 a2f2f694dce9 py3: have bytes version of sys.argv Pulkit Goyal <7895pulkit@gmail.com> parents: 30337 diff changeset	132 sysargv = sys.argv
30509 fc0cfe6c87d7 py3: add os.getcwdb() to have bytes path Pulkit Goyal <7895pulkit@gmail.com> parents: 30481 diff changeset	133 getcwd = os.getcwd
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	134
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	135 stringio = io.StringIO
28818 6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	136 empty = _queue.Empty
6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: diff changeset	137 queue = _queue.Queue
28834 2fac032c1269 pycompat: alias xrange to range in py3 timeless <timeless@mozdev.org> parents: 28833 diff changeset	138
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	139 class _pycompatstub(object):
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	140 def __init__(self):
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	141 self._aliases = {}
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	142
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	143 def _registeraliases(self, origin, items):
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	144 """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	145 items = map(sysstr, items)
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30032 diff changeset	146 self._aliases.update(
f3a1089654e3 pycompat: when setting attrs, ensure we use sysstr Augie Fackler <augie@google.com> parents: 30032 diff changeset	147 (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	148 for item in items)
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	149
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	150 def __getattr__(self, name):
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	151 try:
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	152 origin, item = self._aliases[name]
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	153 except KeyError:
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	154 raise AttributeError(name)
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	155 self.__dict__[name] = obj = getattr(origin, item)
c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	156 return obj
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	157
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	158 httpserver = _pycompatstub()
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	159 urlreq = _pycompatstub()
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	160 urlerr = _pycompatstub()
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	161 if not ispy3:
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	162 import BaseHTTPServer
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	163 import CGIHTTPServer
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	164 import SimpleHTTPServer
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	165 import urllib2
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	166 import urllib
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	167 urlreq._registeraliases(urllib, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	168 "addclosehook",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	169 "addinfourl",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	170 "ftpwrapper",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	171 "pathname2url",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	172 "quote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	173 "splitattr",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	174 "splitpasswd",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	175 "splitport",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	176 "splituser",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	177 "unquote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	178 "url2pathname",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	179 "urlencode",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	180 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	181 urlreq._registeraliases(urllib2, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	182 "AbstractHTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	183 "BaseHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	184 "build_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	185 "FileHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	186 "FTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	187 "HTTPBasicAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	188 "HTTPDigestAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	189 "HTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	190 "HTTPPasswordMgrWithDefaultRealm",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	191 "HTTPSHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	192 "install_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	193 "ProxyHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	194 "Request",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	195 "urlopen",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	196 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	197 urlerr._registeraliases(urllib2, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	198 "HTTPError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	199 "URLError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	200 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	201 httpserver._registeraliases(BaseHTTPServer, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	202 "HTTPServer",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	203 "BaseHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	204 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	205 httpserver._registeraliases(SimpleHTTPServer, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	206 "SimpleHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	207 ))
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	208 httpserver._registeraliases(CGIHTTPServer, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	209 "CGIHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	210 ))
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	211
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	212 else:
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	213 import urllib.request
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	214 urlreq._registeraliases(urllib.request, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	215 "AbstractHTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	216 "addclosehook",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	217 "addinfourl",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	218 "BaseHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	219 "build_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	220 "FileHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	221 "FTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	222 "ftpwrapper",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	223 "HTTPHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	224 "HTTPSHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	225 "install_opener",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	226 "pathname2url",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	227 "HTTPBasicAuthHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	228 "HTTPDigestAuthHandler",
29414 2646fbba4ca7 pycompat: add HTTPPasswordMgrWithDefaultRealm to Python 3 block Gregory Szorc <gregory.szorc@gmail.com> parents: 29405 diff changeset	229 "HTTPPasswordMgrWithDefaultRealm",
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	230 "ProxyHandler",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	231 "quote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	232 "Request",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	233 "splitattr",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	234 "splitpasswd",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	235 "splitport",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	236 "splituser",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	237 "unquote",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	238 "url2pathname",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	239 "urlopen",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	240 ))
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	241 import urllib.error
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	242 urlerr._registeraliases(urllib.error, (
28882 800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	243 "HTTPError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	244 "URLError",
800ec7c048b0 pycompat: add util.urlerr util.urlreq classes for py3 compat timeless <timeless@mozdev.org> parents: 28835 diff changeset	245 ))
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	246 import http.server
29812 c63ab0524db7 pycompat: delay loading modules registered to stub Yuya Nishihara <yuya@tcha.org> parents: 29811 diff changeset	247 httpserver._registeraliases(http.server, (
29566 075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	248 "HTTPServer",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	249 "BaseHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	250 "SimpleHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	251 "CGIHTTPRequestHandler",
075146e85bb6 py3: conditionalize BaseHTTPServer, SimpleHTTPServer and CGIHTTPServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29455 diff changeset	252 ))

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/pycompat.py @ 30583:c6ce11f2ee50