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

annotate mercurial/pycompat.py @ 48674:f7086f6173f8 stable

dirstate-v2: rename the configuration to enable the format The rename of the old experimental name was overlooked before the 6.0 release. We rename everything to use the new name (and keep the released name as an alias for compatibility). Differential Revision: https://phab.mercurial-scm.org/D12129

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 01 Feb 2022 16:36:20 +0100
parents	6ffcaba7d122
children	a0da5075bca3

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
30578 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	13 import getopt
36178 646002338365 py3: introduce and use pycompat.getargspec Augie Fackler <augie@google.com> parents: 36045 diff changeset	14 import inspect
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	15 import json
30302 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30300 diff changeset	16 import os
30678 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30668 diff changeset	17 import shlex
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	18 import sys
38164 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37844 diff changeset	19 import tempfile
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	20
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	21 ispy3 = sys.version_info[0] >= 3
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43503 diff changeset	22 ispypy = '__pypy__' in sys.builtin_module_names
43773 7b14d649af1b typing: consolidate "if not globals():" trick Yuya Nishihara <yuya@tcha.org> parents: 43768 diff changeset	23 TYPE_CHECKING = False
7b14d649af1b typing: consolidate "if not globals():" trick Yuya Nishihara <yuya@tcha.org> parents: 43768 diff changeset	24
7b14d649af1b typing: consolidate "if not globals():" trick Yuya Nishihara <yuya@tcha.org> parents: 43768 diff changeset	25 if not globals(): # hide this from non-pytype users
7b14d649af1b typing: consolidate "if not globals():" trick Yuya Nishihara <yuya@tcha.org> parents: 43768 diff changeset	26 import typing
7b14d649af1b typing: consolidate "if not globals():" trick Yuya Nishihara <yuya@tcha.org> parents: 43768 diff changeset	27
7b14d649af1b typing: consolidate "if not globals():" trick Yuya Nishihara <yuya@tcha.org> parents: 43768 diff changeset	28 TYPE_CHECKING = typing.TYPE_CHECKING
30030 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29801 diff changeset	29
0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29801 diff changeset	30 if not ispy3:
31934 12aca6770046 util: make cookielib module available Gregory Szorc <gregory.szorc@gmail.com> parents: 31843 diff changeset	31 import cookielib
29324 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 28882 diff changeset	32 import cPickle as pickle
29455 0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29433 diff changeset	33 import httplib
37844 8fb9985382be pycompat: export queue module instead of symbols in module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37669 diff changeset	34 import Queue as queue
29433 33770d2b6cf9 py3: conditionalize SocketServer import Pulkit Goyal <7895pulkit@gmail.com> parents: 29432 diff changeset	35 import SocketServer as socketserver
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	36 import xmlrpclib
37628 8da30ceae88f pycompat: export a handle on concurrent.futures Gregory Szorc <gregory.szorc@gmail.com> parents: 37099 diff changeset	37
8da30ceae88f pycompat: export a handle on concurrent.futures Gregory Szorc <gregory.szorc@gmail.com> parents: 37099 diff changeset	38 from .thirdparty.concurrent import futures
37669 1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	39
1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	40 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	41 f.set_exception_info(*exc_info)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	42
47857 2b76255a4f74 template: FileNotFoundError is actually a built in exception Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46570 diff changeset	43 # this is close enough for our usage
2b76255a4f74 template: FileNotFoundError is actually a built in exception Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46570 diff changeset	44 FileNotFoundError = OSError
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	45
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	46 else:
48298 6ffcaba7d122 compat: don't rely on cpython-specific builtins manipulation Rapha?l Gom?s <rgomes@octobus.net> parents: 48006 diff changeset	47 import builtins
37628 8da30ceae88f pycompat: export a handle on concurrent.futures Gregory Szorc <gregory.szorc@gmail.com> parents: 37099 diff changeset	48 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	49 import http.cookiejar as cookielib
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	50 import http.client as httplib
06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	51 import pickle
37844 8fb9985382be pycompat: export queue module instead of symbols in module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37669 diff changeset	52 import queue as queue
29584 06587edd1233 pycompat: make pycompat demandimport friendly Pulkit Goyal <7895pulkit@gmail.com> parents: 29566 diff changeset	53 import socketserver
29432 34b914ac573e py3: conditionalize xmlrpclib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29431 diff changeset	54 import xmlrpc.client as xmlrpclib
29431 80880ad3fccd py3: conditionalize the urlparse import Pulkit Goyal <7895pulkit@gmail.com> parents: 29414 diff changeset	55
37669 1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	56 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	57 f.set_exception(exc_info[0])
1cb54e6193a6 py3: paper over differences in future exception handling Augie Fackler <augie@google.com> parents: 37628 diff changeset	58
48298 6ffcaba7d122 compat: don't rely on cpython-specific builtins manipulation Rapha?l Gom?s <rgomes@octobus.net> parents: 48006 diff changeset	59 FileNotFoundError = builtins.FileNotFoundError
47857 2b76255a4f74 template: FileNotFoundError is actually a built in exception Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46570 diff changeset	60
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	61
31774 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	62 def identity(a):
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	63 return a
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	64
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	65
38575 152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	66 def _rapply(f, xs):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	67 if xs is None:
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	68 # assume None means non-value of optional data
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	69 return xs
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	70 if isinstance(xs, (list, set, tuple)):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	71 return type(xs)(_rapply(f, x) for x in xs)
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	72 if isinstance(xs, dict):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	73 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: 38332 diff changeset	74 return f(xs)
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	75
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	76
38575 152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	77 def rapply(f, xs):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	78 """Apply function recursively to every item preserving the data structure
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	79
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	80 >>> def f(x):
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	81 ... return 'f(%s)' % x
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	82 >>> rapply(f, None) is None
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	83 True
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	84 >>> rapply(f, 'a')
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	85 'f(a)'
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	86 >>> rapply(f, {'a'}) == {'f(a)'}
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	87 True
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	88 >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	89 ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	90
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	91 >>> xs = [object()]
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	92 >>> rapply(identity, xs) is xs
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	93 True
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	94 """
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	95 if f is identity:
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	96 # fast path mainly for py2
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	97 return xs
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	98 return _rapply(f, xs)
152f4822d210 pycompat: move rapply() from util Yuya Nishihara <yuya@tcha.org> parents: 38332 diff changeset	99
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	100
30030 0f6d6fdd3c2a pycompat: provide 'ispy3' constant Yuya Nishihara <yuya@tcha.org> parents: 29801 diff changeset	101 if ispy3:
29797 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 29779 diff changeset	102 import builtins
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	103 import codecs
29799 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	104 import functools
31372 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31359 diff changeset	105 import io
31424 4acc49335a6e py3: optimize py3 compat.bytechr using Struct.pack Martin von Zweigbergk <martinvonz@google.com> parents: 31400 diff changeset	106 import struct
31372 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31359 diff changeset	107
43432 8d5489b048b7 py3: enable legacy fs encoding to fix filename compatibility on Windows Yuya Nishihara <yuya@tcha.org> parents: 43117 diff changeset	108 if os.name == r'nt' and sys.version_info >= (3, 6):
8d5489b048b7 py3: enable legacy fs encoding to fix filename compatibility on Windows Yuya Nishihara <yuya@tcha.org> parents: 43117 diff changeset	109 # MBCS (or ANSI) filesystem encoding must be used as before.
8d5489b048b7 py3: enable legacy fs encoding to fix filename compatibility on Windows Yuya Nishihara <yuya@tcha.org> parents: 43117 diff changeset	110 # Otherwise non-ASCII filenames in existing repositories would be
8d5489b048b7 py3: enable legacy fs encoding to fix filename compatibility on Windows Yuya Nishihara <yuya@tcha.org> parents: 43117 diff changeset	111 # corrupted.
8d5489b048b7 py3: enable legacy fs encoding to fix filename compatibility on Windows Yuya Nishihara <yuya@tcha.org> parents: 43117 diff changeset	112 # This must be set once prior to any fsencode/fsdecode calls.
43768 fe73ec69350e windows: suppress pytype warnings for Windows imports and functions Matt Harbison <matt_harbison@yahoo.com> parents: 43506 diff changeset	113 sys._enablelegacywindowsfsencoding() # pytype: disable=module-attr
43432 8d5489b048b7 py3: enable legacy fs encoding to fix filename compatibility on Windows Yuya Nishihara <yuya@tcha.org> parents: 43117 diff changeset	114
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	115 fsencode = os.fsencode
30300 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	116 fsdecode = os.fsdecode
36648 6585ac350fd9 py3: make os.curdir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36647 diff changeset	117 oscurdir = os.curdir.encode('ascii')
31775 8181f378b073 pycompat: provide bytes os.linesep Yuya Nishihara <yuya@tcha.org> parents: 31774 diff changeset	118 oslinesep = os.linesep.encode('ascii')
30302 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30300 diff changeset	119 osname = os.name.encode('ascii')
30303 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30302 diff changeset	120 ospathsep = os.pathsep.encode('ascii')
36647 052351e3e1cd py3: make os.pardir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36644 diff changeset	121 ospardir = os.pardir.encode('ascii')
30303 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30302 diff changeset	122 ossep = os.sep.encode('ascii')
30623 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30579 diff changeset	123 osaltsep = os.altsep
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30579 diff changeset	124 if osaltsep:
c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30579 diff changeset	125 osaltsep = osaltsep.encode('ascii')
43790 765a9c299c44 py3: make a pycompat.osdevnull, use it in extdiff Kyle Lippincott <spectral@google.com> parents: 43773 diff changeset	126 osdevnull = os.devnull.encode('ascii')
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39642 diff changeset	127
30624 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 30623 diff changeset	128 sysplatform = sys.platform.encode('ascii')
30668 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30663 diff changeset	129 sysexecutable = sys.executable
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30663 diff changeset	130 if sysexecutable:
3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30663 diff changeset	131 sysexecutable = os.fsencode(sysexecutable)
36958 644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36934 diff changeset	132 bytesio = io.BytesIO
644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36934 diff changeset	133 # 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: 36934 diff changeset	134 stringio = bytesio
36934 dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	135
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	136 def maplist(*args):
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	137 return list(map(*args))
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	138
37064 434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36958 diff changeset	139 def rangelist(*args):
434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36958 diff changeset	140 return list(range(*args))
434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36958 diff changeset	141
36934 dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	142 def ziplist(*args):
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	143 return list(zip(*args))
dbae581010ea pycompat: name maplist() and ziplist() for better traceback message Yuya Nishihara <yuya@tcha.org> parents: 36648 diff changeset	144
33853 cfcfbe6c96f8 py3: select input or raw_input by pycompat Yuya Nishihara <yuya@tcha.org> parents: 33626 diff changeset	145 rawinput = input
36178 646002338365 py3: introduce and use pycompat.getargspec Augie Fackler <augie@google.com> parents: 36045 diff changeset	146 getargspec = inspect.getfullargspec
30334 19d8e19fde5b py3: document why os.fsencode() can be used to get back bytes argv Yuya Nishihara <yuya@tcha.org> parents: 30330 diff changeset	147
39456 8d858fbf2759 cbor: teach the encoder to handle python `long` type for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39302 diff changeset	148 long = int
8d858fbf2759 cbor: teach the encoder to handle python `long` type for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39302 diff changeset	149
31277 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	150 if getattr(sys, 'argv', None) is not None:
44651 00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	151 # On POSIX, the char** argv array is converted to Python str using
44998 f2de8f31cb59 pycompat: use os.fsencode() to re-encode sys.argv Manuel Jacob <me@manueljacob.de> parents: 44977 diff changeset	152 # Py_DecodeLocale(). The inverse of this is Py_EncodeLocale(), which
f2de8f31cb59 pycompat: use os.fsencode() to re-encode sys.argv Manuel Jacob <me@manueljacob.de> parents: 44977 diff changeset	153 # isn't directly callable from Python code. In practice, os.fsencode()
f2de8f31cb59 pycompat: use os.fsencode() to re-encode sys.argv Manuel Jacob <me@manueljacob.de> parents: 44977 diff changeset	154 # can be used instead (this is recommended by Python's documentation
f2de8f31cb59 pycompat: use os.fsencode() to re-encode sys.argv Manuel Jacob <me@manueljacob.de> parents: 44977 diff changeset	155 # for sys.argv).
44651 00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	156 #
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	157 # On Windows, the wchar_t **argv is passed into the interpreter as-is.
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	158 # Like POSIX, we need to emulate what Py_EncodeLocale() would do. But
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	159 # there's an additional wrinkle. What we really want to access is the
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	160 # ANSI codepage representation of the arguments, as this is what
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	161 # `int main()` would receive if Python 3 didn't define `int wmain()`
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	162 # (this is how Python 2 worked). To get that, we encode with the mbcs
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	163 # encoding, which will pass CP_ACP to the underlying Windows API to
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	164 # produce bytes.
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	165 if os.name == r'nt':
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	166 sysargv = [a.encode("mbcs", "ignore") for a in sys.argv]
00e0c5c06ed5 pycompat: change argv conversion semantics Gregory Szorc <gregory.szorc@gmail.com> parents: 44452 diff changeset	167 else:
44998 f2de8f31cb59 pycompat: use os.fsencode() to re-encode sys.argv Manuel Jacob <me@manueljacob.de> parents: 44977 diff changeset	168 sysargv = [fsencode(a) for a in sys.argv]
29797 965c91bad9e3 py3: move xrange alias next to import lines Yuya Nishihara <yuya@tcha.org> parents: 29779 diff changeset	169
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43503 diff changeset	170 bytechr = struct.Struct('>B').pack
36265 b44fac3a49fb py3: factor out byterepr() which returns an asciified value on py3 Yuya Nishihara <yuya@tcha.org> parents: 36178 diff changeset	171 byterepr = b'%r'.__mod__
31253 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31149 diff changeset	172
31439 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	173 class bytestr(bytes):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	174 """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: 31425 diff changeset	175
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	176 >>> bytestr(), bytestr(bytearray(b'foo')), bytestr(u'ascii'), bytestr(1)
35903 1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35405 diff changeset	177 ('', 'foo', 'ascii', '1')
31439 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	178 >>> s = bytestr(b'foo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	179 >>> assert s is bytestr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	180
32450 548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	181 __bytes__() should be called if provided:
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	182
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	183 >>> class bytesable(object):
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	184 ... def __bytes__(self):
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	185 ... return b'bytes'
548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	186 >>> bytestr(bytesable())
35903 1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35405 diff changeset	187 'bytes'
32450 548478efc46c pycompat: try __bytes__() to convert object to bytestr Yuya Nishihara <yuya@tcha.org> parents: 32186 diff changeset	188
31439 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	189 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: 31425 diff changeset	190 unknown:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	191
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	192 >>> bytestr(chr(0x80)) # doctest: +ELLIPSIS
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	193 Traceback (most recent call last):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	194 ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	195 UnicodeEncodeError: ...
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	196
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	197 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: 31425 diff changeset	198
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	199 >>> 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: 31425 diff changeset	200 >>> 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: 31425 diff changeset	201 >>> 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: 31425 diff changeset	202 >>> 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: 31425 diff changeset	203
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	204 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: 31425 diff changeset	205
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	206 >>> s[1], s[:2]
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	207 (b'o', b'fo')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	208 >>> list(s), list(reversed(s))
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	209 ([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: 31425 diff changeset	210
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	211 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: 31425 diff changeset	212 bytes to bytestr explicitly:
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	213
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	214 >>> s = bytestr(b'foo').upper()
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	215 >>> t = bytestr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	216 >>> s[0], t[0]
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	217 (70, b'F')
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	218
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	219 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: 31425 diff changeset	220 bytearray-like behavior.
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	221
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	222 >>> 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: 31425 diff changeset	223 >>> assert type(t) is bytes
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	224 """
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	225
48006 1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	226 # Trick pytype into not demanding Iterable[int] be passed to __new__(),
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	227 # since the appropriate bytes format is done internally.
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	228 #
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	229 # https://github.com/google/pytype/issues/500
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	230 if TYPE_CHECKING:
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	231
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	232 def __init__(self, s=b''):
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	233 pass
1fda8c9358ce typing: add a fake `__init__()` to bytestr to distract pytype Matt Harbison <matt_harbison@yahoo.com> parents: 47857 diff changeset	234
31439 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	235 def __new__(cls, s=b''):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	236 if isinstance(s, bytestr):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	237 return s
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	238 if not isinstance(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	239 s, (bytes, bytearray)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	240 ) and not hasattr( # hasattr-py3-only
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	241 s, u'__bytes__'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	242 ):
43091 127cc1f72e70 py3: stop normalizing .encode()/.decode() arguments to unicode Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	243 s = str(s).encode('ascii')
31439 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	244 return bytes.__new__(cls, s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	245
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	246 def __getitem__(self, key):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	247 s = bytes.__getitem__(self, key)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	248 if not isinstance(s, bytes):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	249 s = bytechr(s)
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	250 return s
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	251
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	252 def __iter__(self):
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	253 return iterbytestr(bytes.__iter__(self))
b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	254
35903 1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35405 diff changeset	255 def __repr__(self):
1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35405 diff changeset	256 return bytes.__repr__(self)[1:] # drop b''
1a31111e6239 py3: always drop b'' prefix from repr() of bytestr Yuya Nishihara <yuya@tcha.org> parents: 35405 diff changeset	257
31382 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31372 diff changeset	258 def iterbytestr(s):
c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31372 diff changeset	259 """Iterate bytes as if it were a str object of Python 2"""
31425 63a39d647888 py3: make py3 compat.iterbytestr simpler and faster Martin von Zweigbergk <martinvonz@google.com> parents: 31424 diff changeset	260 return map(bytechr, s)
31382 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31372 diff changeset	261
35904 fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	262 def maybebytestr(s):
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	263 """Promote bytes to bytestr"""
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	264 if isinstance(s, bytes):
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	265 return bytestr(s)
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	266 return s
fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	267
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	268 def sysbytes(s):
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	269 """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: 31775 diff changeset	270
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	271 This never raises UnicodeEncodeError, but only ASCII characters
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	272 can be round-trip by sysstr(sysbytes(s)).
45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	273 """
43870 66af68d4c751 pycompat: allow pycompat.sysbytes() even if input already is bytes Martin von Zweigbergk <martinvonz@google.com> parents: 43790 diff changeset	274 if isinstance(s, bytes):
66af68d4c751 pycompat: allow pycompat.sysbytes() even if input already is bytes Martin von Zweigbergk <martinvonz@google.com> parents: 43790 diff changeset	275 return s
43091 127cc1f72e70 py3: stop normalizing .encode()/.decode() arguments to unicode Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	276 return s.encode('utf-8')
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	277
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	278 def sysstr(s):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	279 """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: 30030 diff changeset	280 getattr() and str.encode()
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	281
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	282 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: 30030 diff changeset	283 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: 30030 diff changeset	284 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: 30030 diff changeset	285 """
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	286 if isinstance(s, builtins.str):
2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	287 return s
43091 127cc1f72e70 py3: stop normalizing .encode()/.decode() arguments to unicode Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	288 return s.decode('latin-1')
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	289
32859 a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32615 diff changeset	290 def strurl(url):
a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32615 diff changeset	291 """Converts a bytes url back to str"""
36644 e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36556 diff changeset	292 if isinstance(url, bytes):
43091 127cc1f72e70 py3: stop normalizing .encode()/.decode() arguments to unicode Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	293 return url.decode('ascii')
36644 e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36556 diff changeset	294 return url
32859 a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32615 diff changeset	295
32860 f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32859 diff changeset	296 def bytesurl(url):
f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32859 diff changeset	297 """Converts a str url to bytes by encoding in ascii"""
36644 e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36556 diff changeset	298 if isinstance(url, str):
43091 127cc1f72e70 py3: stop normalizing .encode()/.decode() arguments to unicode Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	299 return url.encode('ascii')
36644 e2b87e19c6ef pycompat: prevent encoding or decoding values if not required Pulkit Goyal <7895pulkit@gmail.com> parents: 36556 diff changeset	300 return url
32860 f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32859 diff changeset	301
32186 76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	302 def raisewithtb(exc, tb):
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	303 """Raise exception with the given traceback"""
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	304 raise exc.with_traceback(tb)
76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	305
32615 c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	306 def getdoc(obj):
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	307 """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: 32450 diff changeset	308 with _('')"""
43103 c95b2f40db7c py3: stop normalizing 2nd argument of attr() to unicode Gregory Szorc <gregory.szorc@gmail.com>* parents: 43096 diff changeset	309 doc = getattr(obj, '__doc__', None)
32615 c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	310 if doc is None:
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	311 return doc
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	312 return sysbytes(doc)
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	313
29799 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	314 def _wrapattrfunc(f):
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	315 @functools.wraps(f)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	316 def w(object, name, *args):
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	317 return f(object, sysstr(name), *args)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	318
29799 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	319 return w
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	320
29800 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29799 diff changeset	321 # these wrappers are automagically imported by hgloader
29799 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	322 delattr = _wrapattrfunc(builtins.delattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	323 getattr = _wrapattrfunc(builtins.getattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	324 hasattr = _wrapattrfunc(builtins.hasattr)
45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	325 setattr = _wrapattrfunc(builtins.setattr)
29800 178c89e8519a py3: import builtin wrappers automagically by code transformer Yuya Nishihara <yuya@tcha.org> parents: 29799 diff changeset	326 xrange = builtins.range
31843 526e4597cca5 py3: add pycompat.unicode and add it to importer Pulkit Goyal <7895pulkit@gmail.com> parents: 31842 diff changeset	327 unicode = str
29799 45fa8de47a0f py3: provide (del\|get\|has\|set)attr wrappers that accepts bytes Yuya Nishihara <yuya@tcha.org> parents: 29798 diff changeset	328
39642 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39456 diff changeset	329 def open(name, mode=b'r', buffering=-1, encoding=None):
36556 63fe5ca93b13 pycompat: add support for encoding argument to our wrapper Augie Fackler <augie@google.com> parents: 36334 diff changeset	330 return builtins.open(name, sysstr(mode), buffering, encoding)
31149 76a64c1e5439 py3: add pycompat.open and replace open() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 30820 diff changeset	331
37099 6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	332 safehasattr = _wrapattrfunc(builtins.hasattr)
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	333
35226 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	334 def _getoptbwrapper(orig, args, shortlist, namelist):
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	335 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	336 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: 32860 diff changeset	337 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: 32860 diff changeset	338 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: 32860 diff changeset	339 bytes on Python 3.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	340 """
30578 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	341 args = [a.decode('latin-1') for a in args]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	342 shortlist = shortlist.decode('latin-1')
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	343 namelist = [a.decode('latin-1') for a in namelist]
35226 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	344 opts, args = orig(args, shortlist, namelist)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	345 opts = [(a[0].encode('latin-1'), a[1].encode('latin-1')) for a in opts]
30578 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	346 args = [a.encode('latin-1') for a in args]
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	347 return opts, args
c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	348
30579 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	349 def strkwargs(dic):
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	350 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	351 Converts the keys of a python dictonary to str i.e. unicodes so that
46178 e3d595b7fbaa pycompat: fix typos Joerg Sonnenberger <joerg@bec.de> parents: 45727 diff changeset	352 they can be passed as keyword arguments as dictionaries with bytes keys
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	353 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: 32860 diff changeset	354 """
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43870 diff changeset	355 dic = {k.decode('latin-1'): v for k, v in dic.items()}
30579 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	356 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	357
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	358 def byteskwargs(dic):
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	359 """
46178 e3d595b7fbaa pycompat: fix typos Joerg Sonnenberger <joerg@bec.de> parents: 45727 diff changeset	360 Converts keys of python dictionaries to bytes as they were converted to
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	361 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: 32860 diff changeset	362 """
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43870 diff changeset	363 dic = {k.encode('latin-1'): v for k, v in dic.items()}
30579 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	364 return dic
fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	365
30678 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30668 diff changeset	366 # TODO: handle shlex.shlex().
36334 4cd2d1cc2a31 pycompat: correct the shlex.split() proxy method signature in py3 Matt Harbison <matt_harbison@yahoo.com> parents: 36265 diff changeset	367 def shlexsplit(s, comments=False, posix=True):
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	368 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	369 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: 32860 diff changeset	370 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: 32860 diff changeset	371 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: 32860 diff changeset	372 """
36334 4cd2d1cc2a31 pycompat: correct the shlex.split() proxy method signature in py3 Matt Harbison <matt_harbison@yahoo.com> parents: 36265 diff changeset	373 ret = shlex.split(s.decode('latin-1'), comments, posix)
30678 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30668 diff changeset	374 return [a.encode('latin-1') for a in ret]
caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30668 diff changeset	375
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	376 iteritems = lambda x: x.items()
43104 74802979dd9d py3: define and use pycompat.itervalues() Gregory Szorc <gregory.szorc@gmail.com> parents: 43103 diff changeset	377 itervalues = lambda x: x.values()
43019 2cc453284d5c patchbomb: protect email addresses from shell Floris Bruynooghe <flub@google.com> parents: 40527 diff changeset	378
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	379 # Python 3.5's json.load and json.loads require str. We polyfill its
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	380 # code for detecting encoding from bytes.
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	381 if sys.version_info[0:2] < (3, 6):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	382
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	383 def _detect_encoding(b):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	384 bstartswith = b.startswith
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	385 if bstartswith((codecs.BOM_UTF32_BE, codecs.BOM_UTF32_LE)):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	386 return 'utf-32'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	387 if bstartswith((codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE)):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	388 return 'utf-16'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	389 if bstartswith(codecs.BOM_UTF8):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	390 return 'utf-8-sig'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	391
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	392 if len(b) >= 4:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	393 if not b[0]:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	394 # 00 00 -- -- - utf-32-be
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	395 # 00 XX -- -- - utf-16-be
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	396 return 'utf-16-be' if b[1] else 'utf-32-be'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	397 if not b[1]:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	398 # XX 00 00 00 - utf-32-le
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	399 # XX 00 00 XX - utf-16-le
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	400 # XX 00 XX -- - utf-16-le
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	401 return 'utf-16-le' if b[2] or b[3] else 'utf-32-le'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	402 elif len(b) == 2:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	403 if not b[0]:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	404 # 00 XX - utf-16-be
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	405 return 'utf-16-be'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	406 if not b[1]:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	407 # XX 00 - utf-16-le
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	408 return 'utf-16-le'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	409 # default
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	410 return 'utf-8'
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	411
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	412 def json_loads(s, args, *kwargs):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	413 if isinstance(s, (bytes, bytearray)):
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	414 s = s.decode(_detect_encoding(s), 'surrogatepass')
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	415
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	416 return json.loads(s, args, *kwargs)
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	417
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	418 else:
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	419 json_loads = json.loads
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	420
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	421 else:
31372 06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31359 diff changeset	422 import cStringIO
06440ba06bc0 pycompat: move imports of cStringIO/io to where they are used Yuya Nishihara <yuya@tcha.org> parents: 31359 diff changeset	423
38782 7eba8f83129b pycompat: add xrange alias for Python 2 Gregory Szorc <gregory.szorc@gmail.com> parents: 38575 diff changeset	424 xrange = xrange
38312 79dd61a4554f py3: replace `unicode` with pycompat.unicode Pulkit Goyal <7895pulkit@gmail.com> parents: 38166 diff changeset	425 unicode = unicode
31253 64596338ba10 py3: factor out bytechr() function Yuya Nishihara <yuya@tcha.org> parents: 31149 diff changeset	426 bytechr = chr
36265 b44fac3a49fb py3: factor out byterepr() which returns an asciified value on py3 Yuya Nishihara <yuya@tcha.org> parents: 36178 diff changeset	427 byterepr = repr
31439 b70407bd84d5 pycompat: add bytestr wrapper which mostly acts as a Python 2 str Yuya Nishihara <yuya@tcha.org> parents: 31425 diff changeset	428 bytestr = str
31382 c9fd842dc886 pycompat: add helper to iterate each char in bytes Yuya Nishihara <yuya@tcha.org> parents: 31372 diff changeset	429 iterbytestr = iter
35904 fc44c2657dc5 py3: drop b'' from repr() of smartset Yuya Nishihara <yuya@tcha.org> parents: 35903 diff changeset	430 maybebytestr = identity
31820 45761ef1bc93 py3: have registrar process docstrings in bytes Yuya Nishihara <yuya@tcha.org> parents: 31775 diff changeset	431 sysbytes = identity
31774 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	432 sysstr = identity
32859 a05f3675c46a py3: add a new strurl() which will convert a bytes url to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32615 diff changeset	433 strurl = identity
32860 f22f39d56bb5 py3: add a new bytesurl() to convert a str url into bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32859 diff changeset	434 bytesurl = identity
43085 eef9a2d67051 py3: manually import pycompat.open into files that need it Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	435 open = open
43090 1f339b503a40 py3: manually import pycompat.delattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	436 delattr = delattr
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43088 diff changeset	437 getattr = getattr
43088 0d612db7047c py3: stop injecting pycompat.hasattr into modules Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	438 hasattr = hasattr
43087 66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	439 setattr = setattr
30032 2219f4f82ede pycompat: extract function that converts attribute or encoding name to str Yuya Nishihara <yuya@tcha.org> parents: 30030 diff changeset	440
32186 76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	441 # this can't be parsed on Python 3
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	442 exec(b'def raisewithtb(exc, tb):\n raise exc, None, tb\n')
32186 76f9a0009b4b pycompat: extract helper to raise exception with traceback Yuya Nishihara <yuya@tcha.org> parents: 31942 diff changeset	443
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	444 def fsencode(filename):
32864 f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	445 """
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	446 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: 32860 diff changeset	447 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: 32860 diff changeset	448 indicates a bug.
f57f1f37290d pycompat: move multiline comments above a function to function doc Pulkit Goyal <7895pulkit@gmail.com> parents: 32860 diff changeset	449 """
30133 f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	450 if isinstance(filename, str):
f6dcda7505f9 pycompat: only accept a bytestring filepath in Python 2 Martijn Pieters <mjpieters@fb.com> parents: 30119 diff changeset	451 return filename
30119 f4a5e0e86a7e py3: add an os.fsencode backport to ease path handling Martijn Pieters <mjpieters@fb.com> parents: 30086 diff changeset	452 else:
43503 313e3a279828 cleanup: remove pointless r-prefixes on double-quoted strings Augie Fackler <augie@google.com> parents: 43437 diff changeset	453 raise TypeError("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	454
30300 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	455 # 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	456 # better not to touch Python 2 part as it's already working fine.
31774 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	457 fsdecode = identity
30300 42af0590f4b9 py3: add os.fsdecode() as pycompat.fsdecode() Pulkit Goyal <7895pulkit@gmail.com> parents: 30133 diff changeset	458
32615 c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	459 def getdoc(obj):
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	460 return getattr(obj, '__doc__', None)
c9318beb7c1a py3: convert __doc__ back to bytes in help.py Yuya Nishihara <yuya@tcha.org> parents: 32450 diff changeset	461
37099 6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	462 _notset = object()
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	463
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	464 def safehasattr(thing, attr):
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	465 return getattr(thing, attr, _notset) is not _notset
6ca5f825a0ca util: make safehasattr() a pycompat function Yuya Nishihara <yuya@tcha.org> parents: 37064 diff changeset	466
35226 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	467 def _getoptbwrapper(orig, args, shortlist, namelist):
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	468 return orig(args, shortlist, namelist)
30578 c6ce11f2ee50 py3: make a bytes version of getopt.getopt() Pulkit Goyal <7895pulkit@gmail.com> parents: 30500 diff changeset	469
31774 7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	470 strkwargs = identity
7d2cbe11ae48 pycompat: introduce identity function as a compat stub Yuya Nishihara <yuya@tcha.org> parents: 31573 diff changeset	471 byteskwargs = identity
30579 fbc3f73dc802 py3: utility functions to convert keys of kwargs to bytes/unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 30578 diff changeset	472
36648 6585ac350fd9 py3: make os.curdir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36647 diff changeset	473 oscurdir = os.curdir
31775 8181f378b073 pycompat: provide bytes os.linesep Yuya Nishihara <yuya@tcha.org> parents: 31774 diff changeset	474 oslinesep = os.linesep
30302 3874ddba1ab4 py3: add a bytes version of os.name Pulkit Goyal <7895pulkit@gmail.com> parents: 30300 diff changeset	475 osname = os.name
30303 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30302 diff changeset	476 ospathsep = os.pathsep
36647 052351e3e1cd py3: make os.pardir a bytes Yuya Nishihara <yuya@tcha.org> parents: 36644 diff changeset	477 ospardir = os.pardir
30303 ad40d307a9f0 py3: have pycompat.ospathsep and pycompat.ossep Pulkit Goyal <7895pulkit@gmail.com> parents: 30302 diff changeset	478 ossep = os.sep
30623 c6026c20a3ce py3: have a bytes version of os.altsep Pulkit Goyal <7895pulkit@gmail.com> parents: 30579 diff changeset	479 osaltsep = os.altsep
43790 765a9c299c44 py3: make a pycompat.osdevnull, use it in extdiff Kyle Lippincott <spectral@google.com> parents: 43773 diff changeset	480 osdevnull = os.devnull
39456 8d858fbf2759 cbor: teach the encoder to handle python `long` type for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39302 diff changeset	481 long = long
31277 86cd1f2cfff5 pycompat: verify sys.argv exists before forwarding it (issue5493) Augie Fackler <augie@google.com> parents: 30820 diff changeset	482 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	483 sysargv = sys.argv
30624 a82a6eee2613 py3: have a bytes version of sys.platform Pulkit Goyal <7895pulkit@gmail.com> parents: 30623 diff changeset	484 sysplatform = sys.platform
30668 3fcaf0f660ce py3: have bytes version of sys.executable Pulkit Goyal <7895pulkit@gmail.com> parents: 30663 diff changeset	485 sysexecutable = sys.executable
30678 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30668 diff changeset	486 shlexsplit = shlex.split
36958 644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36934 diff changeset	487 bytesio = cStringIO.StringIO
644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 36934 diff changeset	488 stringio = bytesio
31501 a1e40ceee640 pycompat: add maplist alias for old map behavior Augie Fackler <augie@google.com> parents: 31439 diff changeset	489 maplist = map
37064 434e520adb8c annotate: do not construct attr.s object per line while computing history Yuya Nishihara <yuya@tcha.org> parents: 36958 diff changeset	490 rangelist = range
35405 e66d6e938d2d py3: introduce pycompat.ziplist as zip is a generator on Python 3 Pulkit Goyal <7895pulkit@gmail.com> parents: 35226 diff changeset	491 ziplist = zip
33853 cfcfbe6c96f8 py3: select input or raw_input by pycompat Yuya Nishihara <yuya@tcha.org> parents: 33626 diff changeset	492 rawinput = raw_input
36178 646002338365 py3: introduce and use pycompat.getargspec Augie Fackler <augie@google.com> parents: 36045 diff changeset	493 getargspec = inspect.getargspec
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	494 iteritems = lambda x: x.iteritems()
43104 74802979dd9d py3: define and use pycompat.itervalues() Gregory Szorc <gregory.szorc@gmail.com> parents: 43103 diff changeset	495 itervalues = lambda x: x.itervalues()
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43117 diff changeset	496 json_loads = json.loads
34639 a568a46751b6 selectors2: do not use platform.system() Jun Wu <quark@fb.com> parents: 34467 diff changeset	497
39642 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39456 diff changeset	498 isjython = sysplatform.startswith(b'java')
34644 c0a6c19690ff pycompat: define operating system constants Jun Wu <quark@fb.com> parents: 34639 diff changeset	499
40527 1b49b84d5ed5 pycompat: adding Linux detection and fixing Mac rdamazio@google.com parents: 39818 diff changeset	500 isdarwin = sysplatform.startswith(b'darwin')
1b49b84d5ed5 pycompat: adding Linux detection and fixing Mac rdamazio@google.com parents: 39818 diff changeset	501 islinux = sysplatform.startswith(b'linux')
39642 a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39456 diff changeset	502 isposix = osname == b'posix'
a407f9009392 py3: byteify strings in pycompat Matt Harbison <matt_harbison@yahoo.com> parents: 39456 diff changeset	503 iswindows = osname == b'nt'
35226 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	504
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	505
35226 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	506 def getoptb(args, shortlist, namelist):
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	507 return _getoptbwrapper(getopt.getopt, args, shortlist, namelist)
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	508
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	509
35226 5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	510 def gnugetoptb(args, shortlist, namelist):
5b569d512fbd fancyopts: use getopt.gnu_getopt() Yuya Nishihara <yuya@tcha.org> parents: 34644 diff changeset	511 return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist)
38164 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37844 diff changeset	512
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	513
38165 2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38164 diff changeset	514 def mkdtemp(suffix=b'', prefix=b'tmp', dir=None):
2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38164 diff changeset	515 return tempfile.mkdtemp(suffix, prefix, dir)
2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38164 diff changeset	516
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	517
38164 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37844 diff changeset	518 # 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: 37844 diff changeset	519 def mkstemp(suffix=b'', prefix=b'tmp', dir=None):
aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 37844 diff changeset	520 return tempfile.mkstemp(suffix, prefix, dir)
38166 cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38165 diff changeset	521
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	522
45727 d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	523 # TemporaryFile does not support an "encoding=" argument on python2.
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	524 # This wrapper file are always open in byte mode.
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	525 def unnamedtempfile(mode=None, args, *kwargs):
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	526 if mode is None:
46570 7a29d9002250 pycompat: fix a bytes vs str issue in `unnamedtempfile()` Matt Harbison <matt_harbison@yahoo.com> parents: 46178 diff changeset	527 mode = 'w+b'
45727 d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	528 else:
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	529 mode = sysstr(mode)
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	530 assert 'b' in mode
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	531 return tempfile.TemporaryFile(mode, args, *kwargs)
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	532
d4c4391aa7f2 pycompat: add an entry for unnamedtmpfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45726 diff changeset	533
45726 d1072cba8aff pycompat: update comment about unnamedtempfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45056 diff changeset	534 # NamedTemporaryFile does not support an "encoding=" argument on python2.
d1072cba8aff pycompat: update comment about unnamedtempfile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45056 diff changeset	535 # This wrapper file are always open in byte mode.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	536 def namedtempfile(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	537 mode=b'w+b', bufsize=-1, suffix=b'', prefix=b'tmp', dir=None, delete=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	538 ):
38166 cc9aa88792fe py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name Yuya Nishihara <yuya@tcha.org> parents: 38165 diff changeset	539 mode = sysstr(mode)
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43503 diff changeset	540 assert 'b' in mode
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	541 return tempfile.NamedTemporaryFile(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	542 mode, bufsize, suffix=suffix, prefix=prefix, dir=dir, delete=delete
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	543 )

Mercurial > public > mercurial-scm > hg

annotate mercurial/pycompat.py @ 48674:f7086f6173f8 stable