get: adjust for python 3 and test there

[bup.git] / lib / bup / compat.py

diff --git a/lib/bup/compat.py b/lib/bup/compat.py
index f5f9dc0ffa3801632d74dbca79e3bfa67104a4a9..985d8ac4bd61be75e7d244b3a8536ddc3a592336 100644 (file)
--- a/lib/bup/compat.py
+++ b/lib/bup/compat.py
@@ -3,7 +3,7 @@ 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.
@@ -25,8 +25,9 @@ if py3:
               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,)
@@ -35,6 +36,9 @@ if py3:
         """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)."""
         return ex
@@ -53,6 +57,9 @@ if py3:
     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):
@@ -67,13 +74,23 @@ if py3:
         """Return the concatenated bytes or memoryview arguments as bytes."""
         return b''.join(items)
 
+    def getcwd():
+        return fsencode(os.getcwd())
+
 else:  # Python 2
 
+    def fsdecode(x):
+        return x
+
     def fsencode(x):
         return x
 
     from pipes import quote
-    from os import environ
+    from os import environ, getcwd
+
+    from bup.py2raise import reraise
+
+    input = raw_input
     range = xrange
     str_type = basestring
     int_types = (int, long)
@@ -124,6 +141,9 @@ else:  # Python 2
     def bytes_from_uint(i):
         return chr(i)
 
+    def bytes_from_byte(b):
+        return b
+
     byte_int = ord
 
     buffer = buffer