[gnue] r9952 - in trunk/gnue-common: module/base src src/base

[reinhard]

Author: reinhard
Date: 2009-10-09 06:54:17 -0500 (Fri, 09 Oct 2009)
New Revision: 9952

Modified:
   trunk/gnue-common/module/base/__init__.py
   trunk/gnue-common/src/__init__.py
   trunk/gnue-common/src/base/__init__.py
Log:
Initialize basic modules in gnue.__init__ instead of gnue.common.base.__init__,
so setup.py can easily import gnue.common.base.version.


Modified: trunk/gnue-common/module/base/__init__.py
===================================================================
--- trunk/gnue-common/module/base/__init__.py   2009-10-09 11:41:05 UTC (rev 
9951)
+++ trunk/gnue-common/module/base/__init__.py   2009-10-09 11:54:17 UTC (rev 
9952)
@@ -22,12 +22,15 @@
 # $Id$
 
 """
-GNUe base module.  All gnue.* modules depend on gnue.common, so import
-gnue.<whatever>" will cause gnue.common.base to be loaded. This sets up a GNUe
-environment.
+GNUe base module.
 """
 
-import gnue.common.base
+# These modules add functions to the builtin namespace.
+from gnue.common.lib import checktype
+from gnue.common.base import i18n
 
+# Initialize logging
+from gnue.common.base import log
+
 # For compatibility
 import gnue.common.apps

Modified: trunk/gnue-common/src/__init__.py
===================================================================
--- trunk/gnue-common/src/__init__.py   2009-10-09 11:41:05 UTC (rev 9951)
+++ trunk/gnue-common/src/__init__.py   2009-10-09 11:54:17 UTC (rev 9952)
@@ -25,7 +25,8 @@
 of the modules can also be used outside GNUe.
 """
 
-from gnue.common.base import version
+# Import with relative path so setup.py can import this file.
+from base import version
 
 try:
     import svnrev

Modified: trunk/gnue-common/src/base/__init__.py
===================================================================
--- trunk/gnue-common/src/base/__init__.py      2009-10-09 11:41:05 UTC (rev 
9951)
+++ trunk/gnue-common/src/base/__init__.py      2009-10-09 11:54:17 UTC (rev 
9952)
@@ -28,10 +28,3 @@
 All the functions here in one way or the other depend on (or implement) some
 special aspect of the GNU Enterprise infrastructure.
 """
-
-# These modules add functions to the builtin namespace.
-from gnue.common.lib import checktype
-from gnue.common.base import i18n
-
-# Initialize logging
-from gnue.common.base import log