BIND 10 master, updated. 0613c0e0ebfcc8e3cf37678bd6799889569beb83 [master] addendum to 1345; only do readline fix if readline is actually used

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Nov 2 13:59:14 UTC 2011


The branch, master has been updated
       via  0613c0e0ebfcc8e3cf37678bd6799889569beb83 (commit)
      from  409e800ffc208240ec70eb63bc2e56aadfbb21e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0613c0e0ebfcc8e3cf37678bd6799889569beb83
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Nov 2 14:52:50 2011 +0100

    [master] addendum to 1345; only do readline fix if readline is actually used

-----------------------------------------------------------------------

Summary of changes:
 src/bin/bindctl/bindcmd.py |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 9ff5b96..c464e64 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -46,6 +46,16 @@ except ImportError:
 # if we have readline support, use that, otherwise use normal stdio
 try:
     import readline
+    # This is a fix for the problem described in
+    # http://bind10.isc.org/ticket/1345
+    # If '-' is seen as a word-boundary, the final completion-step
+    # (as handled by the cmd module, and hence outside our reach) can
+    # mistakenly add data twice, resulting in wrong completion results
+    # The solution is to remove it.
+    delims = readline.get_completer_delims()
+    delims = delims.replace('-', '')
+    readline.set_completer_delims(delims)
+
     my_readline = readline.get_line_buffer
 except ImportError:
     my_readline = sys.stdin.readline
@@ -109,18 +119,6 @@ class BindCmdInterpreter(Cmd):
         else:
             self.csv_file_dir = pwd.getpwnam(getpass.getuser()).pw_dir + \
                 os.sep + '.bind10' + os.sep
-        self._update_readline_word_boundary()
-
-    def _update_readline_word_boundary(self):
-        # This is a fix for the problem described in
-        # http://bind10.isc.org/ticket/1345
-        # If '-' is seen as a word-boundary, the final completion-step
-        # (as handled by the cmd module, and hence outside our reach) can
-        # mistakenly add data twice, resulting in wrong completion results
-        # The solution is to remove it.
-        delims = readline.get_completer_delims()
-        delims = delims.replace('-', '')
-        readline.set_completer_delims(delims)
 
     def _get_session_id(self):
         '''Generate one session id for the connection. '''




More information about the bind10-changes mailing list