BIND 10 trac1843, updated. 4cfab0d82574c3501502a9ed9b84c39112d411a8 [1843] import fix

[BIND 10 source code commits]

The branch, trac1843 has been updated
       via  4cfab0d82574c3501502a9ed9b84c39112d411a8 (commit)
      from  bed1681e323f5c278a4271b7c948a44b0605e73b (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 4cfab0d82574c3501502a9ed9b84c39112d411a8
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Apr 19 17:08:16 2012 +0200

    [1843] import fix

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

Summary of changes:
 src/bin/bindctl/bindcmd.py         |    7 ++++---
 src/bin/bindctl/bindctl_main.py.in |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 35ab5b3..3560692 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -23,7 +23,7 @@ from cmd import Cmd
 from bindctl.exception import *
 from bindctl.moduleinfo import *
 from bindctl.cmdparse import BindCmdParse
-import command_sets
+from bindctl import command_sets
 from xml.dom import minidom
 import isc
 import isc.cc.data
@@ -734,8 +734,9 @@ class BindCmdInterpreter(Cmd):
 
     def apply_execute_cmd(self, command):
         '''Handles the 'execute' command, which executes a number of
-           (preset) statements. Currently only 'file' commands are supported,
-           e.g. 'execute file <file>'.'''
+           (preset) statements. The command set to execute is either
+           read from a file (e.g. 'execute file <file>'.) or one
+           of the sets as defined in command_sets.py'''
         if command.command == 'file':
             try:
                 command_file = open(command.params['filename'])
diff --git a/src/bin/bindctl/bindctl_main.py.in b/src/bin/bindctl/bindctl_main.py.in
index c2e4cec..1685355 100755
--- a/src/bin/bindctl/bindctl_main.py.in
+++ b/src/bin/bindctl/bindctl_main.py.in
@@ -22,10 +22,10 @@ import sys; sys.path.append ('@@PYTHONPATH@@')
 
 from bindctl.moduleinfo import *
 from bindctl.bindcmd import *
+from bindctl import command_sets
 import pprint
 from optparse import OptionParser, OptionValueError
 import isc.util.process
-import command_sets
 
 isc.util.process.rename()