from __future__ import absolute_import, print_function
from array import array
+from binascii import hexlify
from traceback import print_exception
-import sys
+import os, sys
# Please see CODINGSTYLE for important exception handling guidelines
# and the rationale behind add_ex_tb(), add_ex_ctx(), etc.
file=sys.stderr)
sys.exit(2)
- from os import fsencode
+ from os import fsdecode, fsencode
from shlex import quote
+ input = input
range = range
str_type = str
+ int_types = (int,)
+
+ def hexstr(b):
+ """Return hex string (not bytes as with hexlify) representation of b."""
+ return b.hex()
+
+ def reraise(ex):
+ raise ex.with_traceback(sys.exc_info()[2])
def add_ex_tb(ex):
"""Do nothing (already handled by Python 3 infrastructure)."""
def bytes_from_uint(i):
return bytes((i,))
+ def bytes_from_byte(b): # python > 2: b[3] returns ord('x'), not b'x'
+ return bytes((b,))
+
byte_int = lambda x: x
def buffer(object, offset=None, size=None):
else: # Python 2
+ def fsdecode(x):
+ return x
+
def fsencode(x):
return x
from pipes import quote
from os import environ
+
+ from bup.py2raise import reraise
+
+ input = raw_input
range = xrange
str_type = basestring
+ int_types = (int, long)
+
+ hexstr = hexlify
def add_ex_tb(ex):
"""Add a traceback to ex if it doesn't already have one. Return ex.
def bytes_from_uint(i):
return chr(i)
+ def bytes_from_byte(b):
+ return b
+
byte_int = ord
buffer = buffer
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
+
def wrap_main(main):
"""Run main() and raise a SystemExit with the return value if it
returns, pass along any SystemExit it raises, convert