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 692bd9c1d48518b66b7750f1955a0ea05b5dbe9a..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,)
@@ -83,6 +84,7 @@ else:  # Python 2
 
     from bup.py2raise import reraise
 
+    input = raw_input
     range = xrange
     str_type = basestring
     int_types = (int, long)