ftp: accommodate python 3 and test there

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

diff --git a/lib/bup/compat.py b/lib/bup/compat.py
index 397920a3d333ee8d8b27effab7e90abdd84c074e..03041f35de9d08224edb18172137a87a2d69dd38 100644 (file)
--- a/lib/bup/compat.py
+++ b/lib/bup/compat.py
@@ -27,6 +27,7 @@ if py3:
 
     from os import fsencode
     from shlex import quote
+    input = input
     range = range
     str_type = str
     int_types = (int,)
@@ -56,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):
@@ -80,6 +84,7 @@ else:  # Python 2
 
     from bup.py2raise import reraise
 
+    input = raw_input
     range = xrange
     str_type = basestring
     int_types = (int, long)
@@ -130,6 +135,9 @@ else:  # Python 2
     def bytes_from_uint(i):
         return chr(i)
 
+    def bytes_from_byte(b):
+        return b
+
     byte_int = ord
 
     buffer = buffer