X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=lib%2Fbup%2Fcompat.py;h=fbeee4a478fd3da42976d8b50a05f03558a2996d;hb=e6f05e7e43e0f3e7835140af0f1aba2336b958a9;hp=03041f35de9d08224edb18172137a87a2d69dd38;hpb=b213782c10c0e86ce7c9064e99c40965cfb79c9f;p=bup.git diff --git a/lib/bup/compat.py b/lib/bup/compat.py index 03041f3..fbeee4a 100644 --- a/lib/bup/compat.py +++ b/lib/bup/compat.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, print_function -from array import array from binascii import hexlify from traceback import print_exception import os, sys @@ -13,20 +12,14 @@ py3 = py_maj >= 3 if py3: + # pylint: disable=unused-import + from contextlib import nullcontext from os import environb as environ - - lc_ctype = environ.get(b'LC_CTYPE') - if lc_ctype and lc_ctype.lower() != b'iso-8859-1': - # Because of argv, options.py, pwd, grp, and any number of other issues - print('error: bup currently only works with ISO-8859-1, not LC_CTYPE=%s' - % lc_ctype.decode(), - file=sys.stderr) - print('error: this should already have been arranged, so indicates a bug', - file=sys.stderr) - sys.exit(2) - - from os import fsencode + from os import fsdecode, fsencode from shlex import quote + # pylint: disable=undefined-variable + # (for python2 looking here) + ModuleNotFoundError = ModuleNotFoundError input = input range = range str_type = str @@ -47,6 +40,21 @@ if py3: """Do nothing (already handled by Python 3 infrastructure).""" return ex + class pending_raise: + """If rethrow is true, rethrow ex (if any), unless the body throws. + + (Supports Python 2 compatibility.) + + """ + def __init__(self, ex, rethrow=True): + self.ex = ex + self.rethrow = rethrow + def __enter__(self): + return None + def __exit__(self, exc_type, exc_value, traceback): + if not exc_type and self.ex and self.rethrow: + raise self.ex + def items(x): return x.items() @@ -70,23 +78,40 @@ if py3: return memoryview(object)[offset:] return memoryview(object) - def join_bytes(*items): - """Return the concatenated bytes or memoryview arguments as bytes.""" - return b''.join(items) + def getcwd(): + return fsencode(os.getcwd()) else: # Python 2 + from contextlib import contextmanager + + ModuleNotFoundError = ImportError + + def fsdecode(x): + return x + def fsencode(x): return x from pipes import quote - from os import environ + # pylint: disable=unused-import + from os import environ, getcwd + # pylint: disable=unused-import from bup.py2raise import reraise + @contextmanager + def nullcontext(enter_result=None): + yield enter_result + + # on py3 this causes errors, obviously + # pylint: disable=undefined-variable input = raw_input + # pylint: disable=undefined-variable range = xrange + # pylint: disable=undefined-variable str_type = basestring + # pylint: disable=undefined-variable int_types = (int, long) hexstr = hexlify @@ -109,6 +134,30 @@ else: # Python 2 ex.__context__ = context_ex return ex + class pending_raise: + """If rethrow is true, rethrow ex (if any), unless the body throws. + + If the body does throw, make any provided ex the __context__ + of the newer exception (assuming there's no existing + __context__). Ensure the exceptions have __tracebacks__. + (Supports Python 2 compatibility.) + + """ + def __init__(self, ex, rethrow=True): + self.ex = ex + self.rethrow = rethrow + def __enter__(self): + if self.ex: + add_ex_tb(self.ex) + def __exit__(self, exc_type, exc_value, traceback): + if exc_value: + if self.ex: + add_ex_tb(exc_value) + add_ex_ctx(exc_value, self.ex) + return + if self.rethrow and self.ex: + raise self.ex + def dump_traceback(ex): stack = [ex] next_ex = getattr(ex, '__context__', None) @@ -132,8 +181,7 @@ else: # Python 2 """Return the original bytes passed to main() for an argv argument.""" return x - def bytes_from_uint(i): - return chr(i) + bytes_from_uint = chr def bytes_from_byte(b): return b @@ -142,35 +190,27 @@ else: # Python 2 buffer = buffer - def join_bytes(x, y): - """Return the concatenated bytes or buffer arguments as bytes.""" - if type(x) == buffer: - assert type(y) in (bytes, buffer) - return x + y - assert type(x) == bytes - if type(y) == bytes: - return b''.join((x, y)) - assert type(y) in (bytes, buffer) - return buffer(x) + y - - -def restore_lc_env(): - # Once we're up and running with iso-8859-1, undo the bup-python - # LC_CTYPE hackery, so we don't affect unrelated subprocesses. - bup_lc_all = environ.get(b'BUP_LC_ALL') - if bup_lc_all: - del environ[b'LC_COLLATE'] - del environ[b'LC_CTYPE'] - del environ[b'LC_MONETARY'] - del environ[b'LC_NUMERIC'] - del environ[b'LC_TIME'] - del environ[b'LC_MESSAGES'] - del environ[b'LC_MESSAGES'] - environ[b'LC_ALL'] = bup_lc_all - return - bup_lc_ctype = environ.get(b'BUP_LC_CTYPE') - if bup_lc_ctype: - environ[b'LC_CTYPE'] = bup_lc_ctype +try: + import bup_main +except ModuleNotFoundError: + bup_main = None + +if bup_main: + def get_argvb(): + "Return a new list containing the current process argv bytes." + return bup_main.argv() + if py3: + def get_argv(): + "Return a new list containing the current process argv strings." + return [x.decode(errors='surrogateescape') for x in bup_main.argv()] + else: + def get_argv(): + return bup_main.argv() +else: + def get_argvb(): + raise Exception('get_argvb requires the bup_main module'); + def get_argv(): + raise Exception('get_argv requires the bup_main module'); def wrap_main(main): """Run main() and raise a SystemExit with the return value if it