Changeset 187 for cleverbox/trunk

Timestamp:

08/14/07 13:03:10 (5 years ago)

Author:

trivoallan

Message:

cleverbox Fixed circular imports problem.

Location:

cleverbox/trunk/cleverbox

Files:

• client.py (modified) (2 diffs)
• project.py (modified) (1 diff)
• scripts/admin.py (modified) (1 diff)

cleverbox/trunk/cleverbox/client.py

@@ -192 +192 @@
 
     # Disable client's projects
-    for project_name in project.get(environment, client_name, 'enabled'):
+    for project_name in get_projects(environment, client_name, 'enabled'):
         project.disable(environment, (client_name, project_name))
 
@@ -236 +236 @@
     print "Client '%s' has been disabled" % client_name
     print "Apache configuration needs to be reloaded for this to be effective."
+
+def get_projects(environment, client_name, status=None):
+    """
+    Returns client's projects in environment.
+    If "status" parameter is supplied, returned list is limited to projects with this status.
+    """
+
+    # Having the import here avoids a circular import problem with project.py
+    from cleverbox import project
+    return project.get(environment, client_name, status)

cleverbox/trunk/cleverbox/project.py

@@ -83 +83 @@
     
     # Make sure client exists
+    from cleverbox import client
     if not client.exists(environment, client_name):
         raise Exception, "Client '%s' does not exist." % client_name

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -305 +305 @@
         project.enable(environment, client_name, project_name)
 
-    def _do_project_add(self, args, t):
+    def _do_project_add(self, args):
         if not len(args) == 2:
             self.do_help('project')