BIND 10 master, updated. c430e464860b4460a0ab32454e53918a1cc7444b Merge branch 'trac1273'

[BIND 10 source code commits]

The branch, master has been updated
       via  c430e464860b4460a0ab32454e53918a1cc7444b (commit)
       via  39e529c506a4350cd676bf5ddff6d61686e8814f (commit)
      from  abe73e885b980aace1fd0df492fa321bdd35f01f (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 c430e464860b4460a0ab32454e53918a1cc7444b
Merge: abe73e885b980aace1fd0df492fa321bdd35f01f 39e529c506a4350cd676bf5ddff6d61686e8814f
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Sep 30 12:11:02 2011 +0200

    Merge branch 'trac1273'

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

Summary of changes:
 src/lib/python/isc/datasrc/Makefile.am |    5 ++---
 src/lib/python/isc/datasrc/__init__.py |   11 ++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/datasrc/Makefile.am b/src/lib/python/isc/datasrc/Makefile.am
index d8f6b08..ca2d9b4 100644
--- a/src/lib/python/isc/datasrc/Makefile.am
+++ b/src/lib/python/isc/datasrc/Makefile.am
@@ -1,17 +1,16 @@
 SUBDIRS = . tests
 
 # old data, should be removed in the near future once conversion is done
+pythondir = $(pyexecdir)/isc/datasrc
 python_PYTHON = __init__.py master.py sqlite3_ds.py
 
-#pythondir = $(pyexecdir)/isc/pydatasrc
 
 # new data
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(SQLITE_CFLAGS)
 
-pythondir = $(pyexecdir)/isc
-pyexec_LTLIBRARIES = datasrc.la
+python_LTLIBRARIES = datasrc.la
 datasrc_la_SOURCES = datasrc.cc datasrc.h
 datasrc_la_SOURCES += client_python.cc client_python.h
 datasrc_la_SOURCES += iterator_python.cc iterator_python.h
diff --git a/src/lib/python/isc/datasrc/__init__.py b/src/lib/python/isc/datasrc/__init__.py
index 53711db..0b4ed98 100644
--- a/src/lib/python/isc/datasrc/__init__.py
+++ b/src/lib/python/isc/datasrc/__init__.py
@@ -1,12 +1,21 @@
 import sys
 import os
 
+# this setup is a temporary workaround to deal with the problem of
+# having both 'normal' python modules and a wrapper module
+# Once all programs use the new interface, we should remove the
+# old, and the setup can be made similar to that of the log wrappers.
+intree = False
 for base in sys.path[:]:
     datasrc_libdir = os.path.join(base, 'isc/datasrc/.libs')
     if os.path.exists(datasrc_libdir):
         sys.path.insert(0, datasrc_libdir)
+        intree = True
 
-from datasrc import *
+if intree:
+    from datasrc import *
+else:
+    from isc.datasrc.datasrc import *
 from isc.datasrc.sqlite3_ds import *
 from isc.datasrc.master import *