X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=lib%2Fbup%2Fcompat.py;h=9002025a6d49ec76cda219bc46468f10769ca905;hb=ca1b82ee3ab053c50fc7c1fc491928c5c2c8fc19;hp=37b31f107806d08a37fdf094e0e415850253a4c7;hpb=a4f58b2e4bb1a0208a9cec4b76a596d36134a881;p=bup.git

diff --git a/lib/bup/compat.py b/lib/bup/compat.py
index 37b31f1..9002025 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,13 @@ py3 = py_maj >= 3
 
 if py3:
 
+    # pylint: disable=unused-import
     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 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 +39,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()
 
@@ -75,6 +82,8 @@ if py3:
 
 else:  # Python 2
 
+    ModuleNotFoundError = ImportError
+
     def fsdecode(x):
         return x
 
@@ -82,13 +91,20 @@ else:  # Python 2
         return x
 
     from pipes import quote
+    # pylint: disable=unused-import
     from os import environ, getcwd
 
+    # pylint: disable=unused-import
     from bup.py2raise import reraise
 
+    # 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
@@ -111,6 +127,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)
@@ -143,59 +183,27 @@ else:  # Python 2
 
     buffer = buffer
 
+try:
+    import bup_main
+except ModuleNotFoundError:
+    bup_main = None
 
-argv = None
-argvb = None
-
-def _configure_argv():
-    global argv, argvb
-    assert not argv
-    assert not argvb
-    if len(sys.argv) > 1:
-        if environ.get(b'BUP_ARGV_0'):
-            print('error: BUP_ARGV* set and sys.argv not empty', file=sys.stderr)
-            sys.exit(2)
-        argv = sys.argv
-        argvb = [argv_bytes(x) for x in argv]
-        return
-    args = []
-    i = 0
-    arg = environ.get(b'BUP_ARGV_%d' % i)
-    while arg is not None:
-        args.append(arg)
-        i += 1
-        arg = environ.get(b'BUP_ARGV_%d' % i)
-    i -= 1
-    while i >= 0:
-        del environ[b'BUP_ARGV_%d' % i]
-        i -= 1
-    argvb = args
-    # System encoding?
+if bup_main:
+    def get_argvb():
+        "Return a new list containing the current process argv bytes."
+        return bup_main.argv()
     if py3:
-        argv = [x.decode(errors='surrogateescape') for x in args]
+        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:
-        argv = argvb
-
-_configure_argv()
-
-
-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 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