← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/dispatch/__init__.py

  • Committer: mattgiuca
  • Date: 2008-01-12 12:37:53 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:195
Configuration: Moved "default_app" setting from conf/conf.py to conf/apps.py.
    Reason: This is not user-configurable, much more relevant to apps.
Updated setup.py so as to not write this variable to conf.py.
setup.py: Also made a bit more robust, can handle an existing conf.py with
    missing variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/dispatch/__init__.py
61
61
 
62
62
    # app is the App object for the chosen app
63
63
    if req.app is None:
64
 
        app = conf.apps.app_url[conf.default_app]
 
64
        app = conf.apps.app_url[conf.apps.default_app]
65
65
    else:
66
66
        app = conf.apps.app_url[req.app]
67
67
 
77
77
        # If user did not specify an app, HTTP redirect to default app and
78
78
        # exit.
79
79
        if req.app is None:
80
 
            req.throw_redirect(util.make_path(conf.default_app))
 
80
            req.throw_redirect(util.make_path(conf.apps.default_app))
81
81
 
82
82
        # Set the default title to the app's tab name, if any. Otherwise URL
83
83
        # name.