[pytango] 454/483: database is now installed as module of PyTango

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 2e31130a7150c1bbc271ba6b5c7ef287291ae6da
Author: Sébastien Petitdemange <sebastien.petitdemange at esrf.fr>
Date:   Tue Mar 31 13:09:18 2015 +0200

    database is now installed as module of PyTango
---
 setup.py                                        | 2 ++
 src/boost/python/databaseds/__init__.py         | 0
 src/boost/python/databaseds/database.py         | 4 ++--
 src/boost/python/databaseds/db_access/beacon.py | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 5ceef5a..f707bae 100644
--- a/setup.py
+++ b/setup.py
@@ -399,6 +399,8 @@ def setup_args():
         'PyTango.ipython.ipython_00_10',
         'PyTango.ipython.ipython_00_11',
         'PyTango.ipython.ipython_10_00',
+        'PyTango.databaseds',
+        'PyTango.databaseds.db_access',
     ]
 
     py_modules = []
diff --git a/src/boost/python/databaseds/__init__.py b/src/boost/python/databaseds/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/boost/python/databaseds/database.py b/src/boost/python/databaseds/database.py
index d67a715..b06224c 100644
--- a/src/boost/python/databaseds/database.py
+++ b/src/boost/python/databaseds/database.py
@@ -161,8 +161,8 @@ class DataBase(Device):
         self.attr_Timing_index_read = ['']
         self.attr_Timing_info_read = ['']
         self.init_timing_stats()
-        m = __import__('db_access.%s' % (options.db_access),None,None,
-                       'db_access.%s' % (options.db_access))
+        m = __import__('%s.%s' % (db_access.__package__,options.db_access),None,None,
+                       '%s.%s' % (db_access.__package__,options.db_access))
         self.db = m.get_db(personal_name = options.argv[1])
         try:
             global WILDCARD_REPLACEMENT
diff --git a/src/boost/python/databaseds/db_access/beacon.py b/src/boost/python/databaseds/db_access/beacon.py
index 2fc9330..6e63720 100644
--- a/src/boost/python/databaseds/db_access/beacon.py
+++ b/src/boost/python/databaseds/db_access/beacon.py
@@ -13,7 +13,7 @@ import PyTango
 
 th_exc = PyTango.Except.throw_exception
 
-from db_errors import *
+from ..db_errors import *
 
 from beacon import static,settings
 import itertools

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git