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

annotate mercurial/pycompat.py @ 40577:1b49b84d5ed5

pycompat: adding Linux detection and fixing Mac Python 3 recommends detecting OSs with the prefix of the platform, but we were comparing the full string for macOS. We also didn't have Linux detection, which is convenient for extensions to use (rather than have some OSs detected by hg and some by the extension). Reference: https://docs.python.org/3/library/sys.html#sys.platform Differential Revision: https://phab.mercurial-scm.org/D5227

author	rdamazio@google.com
date	Mon, 05 Nov 2018 19:52:42 -0800
parents	24e493ec2229
children	2cc453284d5c

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
36216 646002338365 py3: introduce and use pycompat.getargspec Augie Fackler <augie@google.com> parents: 36083 diff changeset	14 import inspect
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	15 import os
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	16 import shlex
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	17 import sys
38197 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37890 diff changeset	18 import tempfile
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	19
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	20 ispy3 = (sys.version_info[0] >= 3)
33624 524b13fc711f util: fix sortdict.update() to call __setitem__() on PyPy (issue5639) Yuya Nishihara <yuya@tcha.org> parents: 32883 diff changeset	21 ispypy = (r'__pypy__' in sys.builtin_module_names)
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	22
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	23 if not ispy3:
31934 12aca6770046 util: make cookielib module available Gregory Szorc <gregory.szorc@gmail.com> parents: 31843 diff changeset	24 import cookielib
29324 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 28882 diff changeset	25 import cPickle as pickle
29455 0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29433 diff changeset	26 import httplib
37890 8fb9985382be pycompat: export queue module instead of symbols in module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37669 diff changeset	27 import Queue as queue
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29432 diff changeset	28 import SocketServer as socketserver
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	29 import xmlrpclib
37628 8da30ceae88f pycompat: export a handle on concurrent.futures Gregory Szorc <gregory.szorc@gmail.com> parents: 37102 diff changeset	30
8da30ceae88f pycompat: export a handle on concurrent.futures Gregory Szorc <gregory.szorc@gmail.com> parents: 37102 diff changeset	31 from .thirdparty.concurrent import futures
37669 1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	32
1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	33 def future_set_exception_info(f, exc_info):
1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	34 f.set_exception_info(*exc_info)
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	35 else:
37628 8da30ceae88f pycompat: export a handle on concurrent.futures Gregory Szorc <gregory.szorc@gmail.com> parents: 37102 diff changeset	36 import concurrent.futures as futures
31942 bc0579a25f82 pycompat: import correct cookie module on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 31934 diff changeset	37 import http.cookiejar as cookielib
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	38 import http.client as httplib
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	39 import pickle
37890 8fb9985382be pycompat: export queue module instead of symbols in module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37669 diff changeset	40 import queue as queue
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	41 import socketserver
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	42 import xmlrpc.client as xmlrpclib
29431 80880ad3fccd py3: conditionalize the urlparse import Pulkit Goyal <7895pulkit@gmail.com> parents: 29414 diff changeset	43
37669 1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	44 def future_set_exception_info(f, exc_info):
1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	45 f.set_exception(exc_info[0])
1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	46
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	47 def identity(a):
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	48 return a
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	49
38576 152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	50 def _rapply(f, xs):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	51 if xs is None:
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	52 # assume None means non-value of optional data
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	53 return xs
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	54 if isinstance(xs, (list, set, tuple)):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	55 return type(xs)(_rapply(f, x) for x in xs)
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	56 if isinstance(xs, dict):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	57 return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	58 return f(xs)
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	59
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	60 def rapply(f, xs):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	61 """Apply function recursively to every item preserving the data structure
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	62
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	63 >>> def f(x):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	64 ... return 'f(%s)' % x
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	65 >>> rapply(f, None) is None
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	66 True
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	67 >>> rapply(f, 'a')
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	68 'f(a)'
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	69 >>> rapply(f, {'a'}) == {'f(a)'}
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	70 True
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	71 >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	72 ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	73
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	74 >>> xs = [object()]
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	75 >>> rapply(identity, xs) is xs
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	76 True
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	77 """
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	78 if f is identity:
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	79 # fast path mainly for py2
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	80 return xs
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	81 return _rapply(f, xs)
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38341 diff changeset	82
30031 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29812 diff changeset	83 if ispy3:
29808 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 29790 diff changeset	84 import builtins
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	85 import functools
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	86 import io
31433 4acc49335a6e py3: optimize py3 compat.bytechr using Struct.pack Martin von Zweigbergk <martinvonz@google.com> parents: 31409 diff changeset	87 import struct
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	88
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	89 fsencode = os.fsencode
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	90 fsdecode = os.fsdecode
36677 6585ac350fd9 py3: make os.curdir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36676 diff changeset	91 oscurdir = os.curdir.encode('ascii')
31778 8181f378b073 pycompat: provide bytes os.linesep Yuya Nishihara <yuya@tcha.org> parents: 31777 diff changeset	92 oslinesep = os.linesep.encode('ascii')
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	93 osname = os.name.encode('ascii')
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	94 ospathsep = os.pathsep.encode('ascii')
36676 052351e3e1cd py3: make os.pardir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36673 diff changeset	95 ospardir = os.pardir.encode('ascii')
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	96 ossep = os.sep.encode('ascii')
30628 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	97 osaltsep = os.altsep
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	98 if osaltsep:
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	99 osaltsep = osaltsep.encode('ascii')
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39658 diff changeset	100
30629 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 30628 diff changeset	101 sysplatform = sys.platform.encode('ascii')
30671 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	102 sysexecutable = sys.executable
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	103 if sysexecutable:
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	104 sysexecutable = os.fsencode(sysexecutable)
36964 644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36940 diff changeset	105 bytesio = io.BytesIO
644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36940 diff changeset	106 # TODO deprecate stringio name, as it is a lie on Python 3.
644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36940 diff changeset	107 stringio = bytesio
36940 dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	108
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	109 def maplist(*args):
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	110 return list(map(*args))
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	111
37067 434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36964 diff changeset	112 def rangelist(*args):
434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36964 diff changeset	113 return list(range(*args))
434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36964 diff changeset	114
36940 dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	115 def ziplist(*args):
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	116 return list(zip(*args))
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36677 diff changeset	117
33874 cfcfbe6c96f8 py3: select input or raw_input by pycompat Yuya Nishihara <yuya@tcha.org> parents: 33624 diff changeset	118 rawinput = input
36216 646002338365 py3: introduce and use pycompat.getargspec Augie Fackler <augie@google.com> parents: 36083 diff changeset	119 getargspec = inspect.getfullargspec
30344 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	120
39473 8d858fbf2759 cbor: teach the encoder to handle python `long` type for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39329 diff changeset	121 long = int
8d858fbf2759 cbor: teach the encoder to handle python `long` type for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39329 diff changeset	122
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	123 # 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	124 # 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	125 stdin = sys.stdin.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	126 stdout = sys.stdout.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	127 stderr = sys.stderr.buffer
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	128
30344 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	129 # 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	130 # 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	131 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	132 # 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	133 #
19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30340 diff changeset	134 # 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	135 # 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	136 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	137 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	138
39658 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39473 diff changeset	139 bytechr = struct.Struct(r'>B').pack
36298 b44fac3a49fb py3: factor out byterepr() which returns an asciified value on py3 Yuya Nishihara <yuya@tcha.org> parents: 36216 diff changeset	140 byterepr = b'%r'.__mod__
31263 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31159 diff changeset	141
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	142 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	143 """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	144
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	145 >>> bytestr(), bytestr(bytearray(b'foo')), bytestr(u'ascii'), bytestr(1)
35943 1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35412 diff changeset	146 ('', 'foo', 'ascii', '1')
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	147 >>> 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	148 >>> 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	149
32488 548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	150 __bytes__() should be called if provided:
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	151
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	152 >>> class bytesable(object):
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	153 ... def __bytes__(self):
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	154 ... return b'bytes'
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	155 >>> bytestr(bytesable())
35943 1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35412 diff changeset	156 'bytes'
32488 548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	157
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	158 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	159 unknown:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	160
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	161 >>> 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	162 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	163 ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	164 UnicodeEncodeError: ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	165
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	166 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	167
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	168 >>> 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	169 >>> 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	170 >>> 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	171 >>> 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	172
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	173 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	174
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	175 >>> 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	176 (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	177 >>> 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	178 ([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	179
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	180 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	181 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	182
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	183 >>> 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	184 >>> 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	185 >>> 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	186 (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	187
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	188 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	189 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	190
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	191 >>> 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	192 >>> 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	193 """
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	194
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	195 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	196 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	197 return s
32488 548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	198 if (not isinstance(s, (bytes, bytearray))
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32232 diff changeset	199 and not hasattr(s, u'__bytes__')): # hasattr-py3-only
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	200 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	201 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	202
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	203 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	204 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	205 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	206 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	207 return s
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	208
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	209 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	210 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	211
35943 1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35412 diff changeset	212 def __repr__(self):
1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35412 diff changeset	213 return bytes.__repr__(self)[1:] # drop b''
1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35412 diff changeset	214
31391 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	215 def iterbytestr(s):
c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	216 """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	217 return map(bytechr, s)
31391 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	218
35944 fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	219 def maybebytestr(s):
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	220 """Promote bytes to bytestr"""
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	221 if isinstance(s, bytes):
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	222 return bytestr(s)
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	223 return s
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	224
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	225 def sysbytes(s):
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	226 """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	227
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	228 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	229 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	230 """
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	231 return s.encode(u'utf-8')
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	232
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	233 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	234 """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	235 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	236
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	237 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	238 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	239 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	240 """
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	241 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	242 return s
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	243 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	244
32877 a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32638 diff changeset	245 def strurl(url):
a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32638 diff changeset	246 """Converts a bytes url back to str"""
36673 e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36585 diff changeset	247 if isinstance(url, bytes):
e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36585 diff changeset	248 return url.decode(u'ascii')
e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36585 diff changeset	249 return url
32877 a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32638 diff changeset	250
32878 f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32877 diff changeset	251 def bytesurl(url):
f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32877 diff changeset	252 """Converts a str url to bytes by encoding in ascii"""
36673 e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36585 diff changeset	253 if isinstance(url, str):
e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36585 diff changeset	254 return url.encode(u'ascii')
e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36585 diff changeset	255 return url
32878 f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32877 diff changeset	256
32232 76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	257 def raisewithtb(exc, tb):
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	258 """Raise exception with the given traceback"""
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	259 raise exc.with_traceback(tb)
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	260
32638 c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	261 def getdoc(obj):
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	262 """Get docstring as bytes; may be None so gettext() won't confuse it
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	263 with _('')"""
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	264 doc = getattr(obj, u'__doc__', None)
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	265 if doc is None:
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	266 return doc
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	267 return sysbytes(doc)
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	268
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	269 def _wrapattrfunc(f):
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	270 @functools.wraps(f)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	271 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	272 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	273 return w
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	274
29811 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29810 diff changeset	275 # 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	276 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	277 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	278 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	279 setattr = _wrapattrfunc(builtins.setattr)
29811 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29810 diff changeset	280 xrange = builtins.range
31843 526e4597cca5 py3: add pycompat.unicode and add it to importer Pulkit Goyal <7895pulkit@gmail.com> parents: 31842 diff changeset	281 unicode = str
29810 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29809 diff changeset	282
39658 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39473 diff changeset	283 def open(name, mode=b'r', buffering=-1, encoding=None):
36585 63fe5ca93b13 pycompat: add support for encoding argument to our wrapper Augie Fackler <augie@google.com> parents: 36367 diff changeset	284 return builtins.open(name, sysstr(mode), buffering, encoding)
31159 76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 30820 diff changeset	285
37102 6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	286 safehasattr = _wrapattrfunc(builtins.hasattr)
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	287
35235 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	288 def _getoptbwrapper(orig, args, shortlist, namelist):
32882 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	289 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	290 Takes bytes arguments, converts them to unicode, pass them to
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	291 getopt.getopt(), convert the returned values back to bytes and then
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	292 return them for Python 3 compatibility as getopt.getopt() don't accepts
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	293 bytes on Python 3.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	294 """
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	295 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	296 shortlist = shortlist.decode('latin-1')
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	297 namelist = [a.decode('latin-1') for a in namelist]
35235 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	298 opts, args = orig(args, shortlist, namelist)
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	299 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	300 for a in opts]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	301 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	302 return opts, args
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	303
30584 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	304 def strkwargs(dic):
32882 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	305 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	306 Converts the keys of a python dictonary to str i.e. unicodes so that
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	307 they can be passed as keyword arguments as dictonaries with bytes keys
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	308 can't be passed as keyword arguments to functions on Python 3.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	309 """
30584 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	310 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	311 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	312
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	313 def byteskwargs(dic):
32882 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	314 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	315 Converts keys of python dictonaries to bytes as they were converted to
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	316 str to pass that dictonary as a keyword argument on Python 3.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	317 """
30584 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	318 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	319 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	320
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	321 # TODO: handle shlex.shlex().
36367 4cd2d1cc2a31 pycompat: correct the shlex.split() proxy method signature in py3 Matt Harbison <matt_harbison@yahoo.com> parents: 36298 diff changeset	322 def shlexsplit(s, comments=False, posix=True):
32882 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	323 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	324 Takes bytes argument, convert it to str i.e. unicodes, pass that into
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	325 shlex.split(), convert the returned value to bytes and return that for
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	326 Python 3 compatibility as shelx.split() don't accept bytes on Python 3.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	327 """
36367 4cd2d1cc2a31 pycompat: correct the shlex.split() proxy method signature in py3 Matt Harbison <matt_harbison@yahoo.com> parents: 36298 diff changeset	328 ret = shlex.split(s.decode('latin-1'), comments, posix)
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	329 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	330
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	331 else:
31381 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	332 import cStringIO
06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31368 diff changeset	333
38822 7eba8f83129b pycompat: add xrange alias for Python 2 Gregory Szorc <gregory.szorc@gmail.com> parents: 38576 diff changeset	334 xrange = xrange
38321 79dd61a4554f py3: replace `unicode` with pycompat.unicode Pulkit Goyal <7895pulkit@gmail.com> parents: 38199 diff changeset	335 unicode = unicode
31263 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31159 diff changeset	336 bytechr = chr
36298 b44fac3a49fb py3: factor out byterepr() which returns an asciified value on py3 Yuya Nishihara <yuya@tcha.org> parents: 36216 diff changeset	337 byterepr = repr
31448 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31434 diff changeset	338 bytestr = str
31391 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31381 diff changeset	339 iterbytestr = iter
35944 fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35943 diff changeset	340 maybebytestr = identity
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31778 diff changeset	341 sysbytes = identity
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	342 sysstr = identity
32877 a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32638 diff changeset	343 strurl = identity
32878 f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32877 diff changeset	344 bytesurl = identity
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30031 diff changeset	345
32232 76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	346 # this can't be parsed on Python 3
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	347 exec('def raisewithtb(exc, tb):\n'
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	348 ' raise exc, None, tb\n')
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	349
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	350 def fsencode(filename):
32882 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	351 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	352 Partial backport from os.py in Python 3, which only accepts bytes.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	353 In Python 2, our paths should only ever be bytes, a unicode path
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	354 indicates a bug.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32878 diff changeset	355 """
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	356 if isinstance(filename, str):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	357 return filename
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	358 else:
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	359 raise TypeError(
39658 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39473 diff changeset	360 r"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	361
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	362 # 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	363 # 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	364 fsdecode = identity
30313 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	365
32638 c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	366 def getdoc(obj):
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	367 return getattr(obj, '__doc__', None)
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32488 diff changeset	368
37102 6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	369 _notset = object()
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	370
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	371 def safehasattr(thing, attr):
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	372 return getattr(thing, attr, _notset) is not _notset
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37067 diff changeset	373
35235 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	374 def _getoptbwrapper(orig, args, shortlist, namelist):
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	375 return orig(args, shortlist, namelist)
30583 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30509 diff changeset	376
31777 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	377 strkwargs = identity
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31579 diff changeset	378 byteskwargs = identity
30584 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30583 diff changeset	379
36677 6585ac350fd9 py3: make os.curdir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36676 diff changeset	380 oscurdir = os.curdir
31778 8181f378b073 pycompat: provide bytes os.linesep Yuya Nishihara <yuya@tcha.org> parents: 31777 diff changeset	381 oslinesep = os.linesep
30315 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30313 diff changeset	382 osname = os.name
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	383 ospathsep = os.pathsep
36676 052351e3e1cd py3: make os.pardir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36673 diff changeset	384 ospardir = os.pardir
30316 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30315 diff changeset	385 ossep = os.sep
30628 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30584 diff changeset	386 osaltsep = os.altsep
39473 8d858fbf2759 cbor: teach the encoder to handle python `long` type for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39329 diff changeset	387 long = long
30481 277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	388 stdin = sys.stdin
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	389 stdout = sys.stdout
277f4fe6d01a py3: provide bytes stdin/out/err through util module Yuya Nishihara <yuya@tcha.org> parents: 30344 diff changeset	390 stderr = sys.stderr
30888 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	391 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	392 sysargv = sys.argv
30629 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 30628 diff changeset	393 sysplatform = sys.platform
30671 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30666 diff changeset	394 sysexecutable = sys.executable
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30671 diff changeset	395 shlexsplit = shlex.split
36964 644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36940 diff changeset	396 bytesio = cStringIO.StringIO
644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36940 diff changeset	397 stringio = bytesio
31508 a1e40ceee640 pycompat: add maplist alias for old map behavior Augie Fackler <augie@google.com> parents: 31448 diff changeset	398 maplist = map
37067 434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36964 diff changeset	399 rangelist = range
35412 e66d6e938d2d py3: introduce pycompat.ziplist as zip is a generator on Python 3 Pulkit Goyal <7895pulkit@gmail.com> parents: 35235 diff changeset	400 ziplist = zip
33874 cfcfbe6c96f8 py3: select input or raw_input by pycompat Yuya Nishihara <yuya@tcha.org> parents: 33624 diff changeset	401 rawinput = raw_input
36216 646002338365 py3: introduce and use pycompat.getargspec Augie Fackler <augie@google.com> parents: 36083 diff changeset	402 getargspec = inspect.getargspec
34639 a568a46751b6 selectors2: do not use platform.system() Jun Wu <quark@fb.com> parents: 34468 diff changeset	403
39658 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39473 diff changeset	404 isjython = sysplatform.startswith(b'java')
34644 c0a6c19690ff pycompat: define operating system constants Jun Wu <quark@fb.com> parents: 34639 diff changeset	405
40577 1b49b84d5ed5 pycompat: adding Linux detection and fixing Mac rdamazio@google.com parents: 39823 diff changeset	406 isdarwin = sysplatform.startswith(b'darwin')
1b49b84d5ed5 pycompat: adding Linux detection and fixing Mac rdamazio@google.com parents: 39823 diff changeset	407 islinux = sysplatform.startswith(b'linux')
39658 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39473 diff changeset	408 isposix = osname == b'posix'
a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39473 diff changeset	409 iswindows = osname == b'nt'
35235 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	410
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	411 def getoptb(args, shortlist, namelist):
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	412 return _getoptbwrapper(getopt.getopt, args, shortlist, namelist)
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	413
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	414 def gnugetoptb(args, shortlist, namelist):
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	415 return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist)
38197 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37890 diff changeset	416
38198 2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38197 diff changeset	417 def mkdtemp(suffix=b'', prefix=b'tmp', dir=None):
2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38197 diff changeset	418 return tempfile.mkdtemp(suffix, prefix, dir)
2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38197 diff changeset	419
38197 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37890 diff changeset	420 # text=True is not supported; use util.from/tonativeeol() instead
aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37890 diff changeset	421 def mkstemp(suffix=b'', prefix=b'tmp', dir=None):
aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37890 diff changeset	422 return tempfile.mkstemp(suffix, prefix, dir)
38199 cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	423
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	424 # mode must include 'b'ytes as encoding= is not supported
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	425 def namedtempfile(mode=b'w+b', bufsize=-1, suffix=b'', prefix=b'tmp', dir=None,
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	426 delete=True):
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	427 mode = sysstr(mode)
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	428 assert r'b' in mode
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	429 return tempfile.NamedTemporaryFile(mode, bufsize, suffix=suffix,
cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38198 diff changeset	430 prefix=prefix, dir=dir, delete=delete)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/pycompat.py @ 40577:1b49b84d5ed5