r5274 - in branches/play_plumage/cumin: bin python/cumin python/cumin/account python/cumin/grid python/cumin/inventory python/cumin/messaging python/cumin/usergrid

Author: tmckay
Date: 2012-03-27 20:28:39 +0000 (Tue, 27 Mar 2012)
New Revision: 5274

Modified:
   branches/play_plumage/cumin/bin/cumin-admin
   branches/play_plumage/cumin/bin/cumin-web
   branches/play_plumage/cumin/python/cumin/__init__.py
   branches/play_plumage/cumin/python/cumin/account/main.py
   branches/play_plumage/cumin/python/cumin/grid/main.py
   branches/play_plumage/cumin/python/cumin/inventory/main.py
   branches/play_plumage/cumin/python/cumin/messaging/main.py
   branches/play_plumage/cumin/python/cumin/usergrid/main.py
Log:
Remove circular dependencies for rosemary_model caused by import in cumin/__init__.py


Modified: branches/play_plumage/cumin/bin/cumin-admin
===================================================================
--- branches/play_plumage/cumin/bin/cumin-admin	2012-03-25 20:56:51 UTC (rev 5273)
+++ branches/play_plumage/cumin/bin/cumin-admin	2012-03-27 20:28:39 UTC (rev 5274)
@@ -13,7 +13,7 @@
 
 from parsley.collectionsex import defaultdict
 
-from cumin import *
+from cumin.main import *
 from cumin.config import *
 from cumin.util import *
 from cumin.admin import SchemaMissing

Modified: branches/play_plumage/cumin/bin/cumin-web
===================================================================
--- branches/play_plumage/cumin/bin/cumin-web	2012-03-25 20:56:51 UTC (rev 5273)
+++ branches/play_plumage/cumin/bin/cumin-web	2012-03-27 20:28:39 UTC (rev 5274)
@@ -1,11 +1,12 @@
 #!/usr/bin/python
 import os
 import sys
+import traceback
 
 home = os.environ.get("CUMIN_HOME",
os.path.normpath("/usr/share/cumin"))
 sys.path.append(os.path.join(home, "python"))
 
-from cumin import *
+from cumin.main import *
 from cumin.config import *
 from cumin.util import *
 from parsley.loggingex import PipeLogThread
@@ -82,7 +83,7 @@
             sys.stdout = os.fdopen(out_w, "w", 0)
         except:
             restore_IO()
-            print_exc()
+            traceback.print_exc()
             pipeThread = None
 
     # Use ArgError to jump to the finally block and exit 
@@ -197,7 +198,7 @@
         return_code = CuminErrors.SCHEMA_VER_ERROR
 
     except:
-        print_exc()
+        traceback.print_exc()
         return_code = CuminErrors.UNHANDLED_ERROR
 
     if cumin:

Modified: branches/play_plumage/cumin/python/cumin/__init__.py
===================================================================
--- branches/play_plumage/cumin/python/cumin/__init__.py	2012-03-25 20:56:51 UTC (rev
5273)
+++ branches/play_plumage/cumin/python/cumin/__init__.py	2012-03-27 20:28:39 UTC (rev
5274)
@@ -1 +1,5 @@
-from main import *
+# Doing this here is a problem, since subpieces of cumin like cumin.util or cumin.formats
are
+# widely used in other modules like mint or rosemary.  This causes everything to be
touched
+# when cumin.x is referenced, and it causes circular dependencies.
+
+#from main import *

Modified: branches/play_plumage/cumin/python/cumin/account/main.py
===================================================================
--- branches/play_plumage/cumin/python/cumin/account/main.py	2012-03-25 20:56:51 UTC (rev
5273)
+++ branches/play_plumage/cumin/python/cumin/account/main.py	2012-03-27 20:28:39 UTC (rev
5274)
@@ -1,8 +1,6 @@
-from cumin import *
-from cumin.util import *
+from cumin.main import CuminModule
+from widgets import LoginPage, AccountPage
 
-from widgets import *
-
 class Module(CuminModule):
     def __init__(self, app, name):
         super(Module, self).__init__(app, name)

Modified: branches/play_plumage/cumin/python/cumin/grid/main.py
===================================================================
--- branches/play_plumage/cumin/python/cumin/grid/main.py	2012-03-25 20:56:51 UTC (rev
5273)
+++ branches/play_plumage/cumin/python/cumin/grid/main.py	2012-03-27 20:28:39 UTC (rev
5274)
@@ -2,7 +2,7 @@
 from wooly.widgets import *
 from wooly.resources import *
 
-from cumin import *
+from cumin.main import CuminModule
 from cumin.objecttask import *
 from cumin.util import *
 

Modified: branches/play_plumage/cumin/python/cumin/inventory/main.py
===================================================================
--- branches/play_plumage/cumin/python/cumin/inventory/main.py	2012-03-25 20:56:51 UTC
(rev 5273)
+++ branches/play_plumage/cumin/python/cumin/inventory/main.py	2012-03-27 20:28:39 UTC
(rev 5274)
@@ -2,7 +2,7 @@
 from wooly.widgets import *
 from wooly.resources import *
 
-from cumin import *
+from cumin.main import CuminModule
 from cumin.widgets import *
 from cumin.util import *
 

Modified: branches/play_plumage/cumin/python/cumin/messaging/main.py
===================================================================
--- branches/play_plumage/cumin/python/cumin/messaging/main.py	2012-03-25 20:56:51 UTC
(rev 5273)
+++ branches/play_plumage/cumin/python/cumin/messaging/main.py	2012-03-27 20:28:39 UTC
(rev 5274)
@@ -2,7 +2,7 @@
 from wooly.widgets import *
 from wooly.resources import *
 
-from cumin import *
+from cumin.main import CuminModule
 from cumin.util import *
 
 from broker import *

Modified: branches/play_plumage/cumin/python/cumin/usergrid/main.py
===================================================================
--- branches/play_plumage/cumin/python/cumin/usergrid/main.py	2012-03-25 20:56:51 UTC (rev
5273)
+++ branches/play_plumage/cumin/python/cumin/usergrid/main.py	2012-03-27 20:28:39 UTC (rev
5274)
@@ -1,4 +1,4 @@
-from cumin import *
+from cumin.main import CuminModule
 from cumin.util import *
 
 from widgets import *