]> arthur.barton.de Git - bup.git/commitdiff
cmd/ftp: don't die if we can't import the ctypes module.
authorAvery Pennarun <apenwarr@gmail.com>
Sun, 22 Aug 2010 06:44:49 +0000 (23:44 -0700)
committerAvery Pennarun <apenwarr@gmail.com>
Sun, 22 Aug 2010 06:44:49 +0000 (23:44 -0700)
It's only needed on some rare broken versions of readline anyway.  If we
can't find the module, chances are the system doesn't have that broken
version of readline.

Based on suggestions by Gabriel Filion and Aaron Ucko.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
cmd/ftp-cmd.py

index f61b1eef13c4665a69d46f993d20c9a0e3a130a5..f103a61f3867e344b6c3330d8cf09366202004f6 100755 (executable)
@@ -97,7 +97,13 @@ def find_readline_lib():
 def init_readline_vars():
     """Work around trailing space automatically inserted by readline.
     See http://bugs.python.org/issue5833"""
-    import ctypes
+    try:
+        import ctypes
+    except ImportError:
+        # python before 2.5 didn't have the ctypes module; but those
+        # old systems probably also didn't have this readline bug, so
+        # just ignore it.
+        return
     lib_name = find_readline_lib()
     if lib_name is not None:
         lib = ctypes.cdll.LoadLibrary(lib_name)