Changeset 1567

Show
Ignore:
Timestamp:
06/15/06 07:03:21 (2 years ago)
Author:
kevin
Message:

quickstart support for Python 2.3 (#837)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0/turbogears/command/quickstart.py

    r1566 r1567  
    2424                pkg_resources.get_distribution('turbogears').version) 
    2525        vars.setdefault('sys_executable', os.path.normpath(sys.executable)) 
     26        # define version-compatible decorator syntax 
     27        if sys.version_info >= (2, 4): 
     28            vars['b'] = '@' 
     29            vars['e'] = '' 
     30        else: 
     31            vars['b'] = '[' 
     32            vars['e'] = ']' 
    2633        super(TGTemplate, self).run(command, output_dirs, vars) 
    2734 

  • branches/1.0/turbogears/qstemplates/quickstartbig/+package+/controllers/root.py_tmpl

    r1457 r1567  
    1414 
    1515class Root(controllers.RootController): 
    16     @expose(template="${package}.templates.welcome") 
     16    ${b}expose(template="${package}.templates.welcome")${e} 
    1717    def index(self): 
    1818        import time 
    …… 
    2121#if $identity != "none" 
    2222 
    23     @expose(template="${package}.templates.login") 
     23    ${b}expose(template="${package}.templates.login")${e} 
    2424    def login(self, forward_url=None, previous_url=None, *args, **kw): 
    2525 
    …… 
    4646                    forward_url=forward_url) 
    4747 
    48     @expose() 
     48    ${b}expose()${e} 
    4949    def logout(self): 
    5050        identity.current.logout() 

  • branches/1.0/turbogears/qstemplates/quickstart/+package+/controllers.py_tmpl

    r1457 r1567  
    1414 
    1515class Root(controllers.RootController): 
    16     @expose(template="${package}.templates.welcome") 
     16    ${b}expose(template="${package}.templates.welcome")${e} 
    1717    def index(self): 
    1818        import time 
    …… 
    2121#if $identity != "none" 
    2222 
    23     @expose(template="${package}.templates.login") 
     23    ${b}expose(template="${package}.templates.login")${e} 
    2424    def login(self, forward_url=None, previous_url=None, *args, **kw): 
    2525 
    …… 
    4646                    forward_url=forward_url) 
    4747 
    48     @expose() 
     48    ${b}expose()${e} 
    4949    def logout(self): 
    5050        identity.current.logout() 

  • branches/1.0/turbogears/qstemplates/quickstart/+package+/json.py_tmpl

    r1252 r1567  
    1616from ${package}.model import User, Group, Permission 
    1717 
    18 @jsonify.when('isinstance(obj, Group)') 
     18${b}jsonify.when('isinstance(obj, Group)')${e} 
    1919def jsonify_group(obj): 
    2020    result = jsonify_sqlobject( obj ) 
    …… 
    2323    return result 
    2424 
    25 @jsonify.when('isinstance(obj, User)') 
     25${b}jsonify.when('isinstance(obj, User)')${e} 
    2626def jsonify_user(obj): 
    2727    result = jsonify_sqlobject( obj ) 
    …… 
    3131    return result 
    3232 
    33 @jsonify.when('isinstance(obj, Permission)') 
     33${b}jsonify.when('isinstance(obj, Permission)')${e} 
    3434def jsonify_permission(obj): 
    3535    result = jsonify_sqlobject( obj ) 

  • branches/1.0/turbogears/qstemplates/quickstart/+package+/model.py_tmpl

    r1549 r1567  
    164164        groups = many_to_many( "Group", user_group, backref="users" ) 
    165165 
    166     @property 
    167166    def permissions( self ): 
    168167        perms = set() 
    …… 
    170169            perms = perms | set(g.permissions) 
    171170        return perms 
     171    permissions = property(permissions) 
    172172         
    173173