install bindctl .py files, and change imports and scripts to reflect

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1410 e5f2f494-b856-4b98-b285-d166d9295462

src/bin/bindctl/Makefile.am

@@ -3,6 +3,9 @@ man_MANS = bindctl.1
 
 EXTRA_DIST = $(man_MANS)
 
+python_PYTHON = __init__.py bindcmd.py cmdparse.py exception.py moduleinfo.py mycollections.py
+pythondir = $(pyexecdir)/bindctl
+
 CLEANFILES = bindctl
 
 bindctl: bindctl.py

src/bin/bindctl/bindcmd.py

@@ -16,9 +16,9 @@
 import sys
 import readline
 from cmd import Cmd
-from exception import *
-from moduleinfo import *
-from cmdparse import BindCmdParse
+from bindctl.exception import *
+from bindctl.moduleinfo import *
+from bindctl.cmdparse import BindCmdParse
 from xml.dom import minidom
 import isc
 import isc.cc.data
@@ -36,7 +36,7 @@ import ast
 try:
     from collections import OrderedDict
 except ImportError:
-    from mycollections import OrderedDict
+    from bindctl.mycollections import OrderedDict
 
 
 CONST_BINDCTL_HELP = """BindCtl, verstion 0.1

src/bin/bindctl/bindctl.py.in

@@ -17,10 +17,10 @@
 
 
 import sys; sys.path.append ('@@PYTHONPATH@@')
-
-from moduleinfo  import *
-from bindcmd import *
-import isc
+
+import bindctl
+from bindctl.moduleinfo import *
+from bindctl.bindcmd import *
 import pprint
 from optparse import OptionParser, OptionValueError
 

src/bin/bindctl/cmdparse.py

@@ -14,11 +14,11 @@
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import re
-from exception import *
+from bindctl.exception import *
 try:
     from collections import OrderedDict
 except ImportError:
-    from mycollections import OrderedDict
+    from bindctl.mycollections import OrderedDict
 
 param_name_str = "^\s*(?P<param_name>[\w]+)\s*=\s*"
 param_value_str = "(?P<param_value>[\w\./-]+)"

src/bin/bindctl/moduleinfo.py

@@ -17,7 +17,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from mycollections import OrderedDict
+    from bindctl.mycollections import OrderedDict
 
 # Define value type
 STRING_TYPE = "string"

src/bin/bindctl/run_bindctl.sh.in

@@ -5,7 +5,7 @@ export PYTHON_EXEC
 
 BINDCTL_PATH=@abs_top_srcdir@/src/bin/bindctl
 
-PYTHONPATH=@abs_top_builddir@/src/lib/python
+PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin
 export PYTHONPATH
 
 cd ${BINDCTL_PATH}