Changeset 211

Show
Ignore:
Timestamp:
11/30/07 16:42:09 (1 year ago)
Author:
trivoallan
Message:

cleverbox : created a cleverbox.model module.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cleverbox/trunk/cleverbox/model/client.py

    r209 r211  
    206206        raise Exception, 'Client "%s" is already disabled.' % client_name 
    207207 
    208     import cleverbox.project 
     208    from cleverbox.model import project 
    209209    client_projects = get_projects(environment, client_name, 'enabled') 
    210210    if len(client_projects): 
    211211        print 
    212212        for project_name in client_projects: 
    213             cleverbox.project.disable(environment, client_name, project_name) 
     213            project.disable(environment, client_name, project_name) 
    214214 
    215215    linkname = os.path.join(environment.path, 'clients-enabled', client_name) 
    …… 
    228228 
    229229    # Having the import here avoids a circular import problem with project.py 
    230     from cleverbox import project 
     230    from cleverbox.model import project 
    231231    return project.get(environment, client_name, status) 

  • cleverbox/trunk/cleverbox/model/project.py

    r209 r211  
    8888     
    8989    # Make sure client exists 
    90     from cleverbox import client 
     90    from cleverbox.model import client 
    9191    if not client.exists(environment, client_name): 
    9292        raise Exception, "Client '%s' does not exist." % client_name 

  • cleverbox/trunk/cleverbox/scripts/admin.py

    r210 r211  
    55from trac.scripts.admin import TracAdmin 
    66from cleverbox.utils import termcolors, styles 
    7 from cleverbox.environment import Environment 
    8 from cleverbox import client, project 
     7from cleverbox.model.environment import Environment 
     8from cleverbox.model import client, project 
    99import cleverbox.log 
    1010 

  • cleverbox/trunk/cleverbox/tests/__init__.py

    r209 r211  
    2828 
    2929    import os, tempfile 
    30     from cleverbox.environment import Environment 
     30    from cleverbox.model.environment import Environment 
    3131 
    3232    test_root = os.path.join(tempfile.gettempdir(), 'cleverbox-tempenv') 

  • cleverbox/trunk/cleverbox/tests/client_test.py

    r209 r211  
    22 
    33import logging, os, shutil, tempfile 
    4 from cleverbox.environment import Environment 
     4from cleverbox.model.environment import Environment 
    55from cleverbox.scripts.admin import CleverboxAdmin 
    6 from cleverbox import client 
     6from cleverbox.model import client 
    77import cleverbox.tests 
    88 

  • cleverbox/trunk/cleverbox/tests/environment_test.py

    r209 r211  
    11import grp, logging, os, pwd, shutil, stat, tempfile, unittest 
    2 from cleverbox.environment import Environment 
     2from cleverbox.model.environment import Environment 
    33import cleverbox.tests 
    44 

  • cleverbox/trunk/cleverbox/tests/project_test.py

    r209 r211  
    22 
    33import logging, os, shutil, tempfile 
    4 from cleverbox.environment import Environment 
     4from cleverbox.model.environment import Environment 
    55from cleverbox.scripts.admin import CleverboxAdmin 
    6 from cleverbox import client, project 
     6from cleverbox.model import client, project 
    77import cleverbox.tests 
    88