diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-12 19:53:18 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-12 19:53:18 -0500 |
| commit | c7b6c1373ff3c971012964ad2dcab069f2548fb2 (patch) | |
| tree | 2f2738ea49bab730d46c71709ae17f1e8949ab77 | |
| parent | cfec2bd8ddf58c6cefcda30a924d45e6f6c39087 (diff) | |
| download | pyramid-c7b6c1373ff3c971012964ad2dcab069f2548fb2.tar.gz pyramid-c7b6c1373ff3c971012964ad2dcab069f2548fb2.tar.bz2 pyramid-c7b6c1373ff3c971012964ad2dcab069f2548fb2.zip | |
make relocatable (as per Ken's changes)
| -rw-r--r-- | pyramid/scaffolds/starter/+package+/__init__.py | 10 | ||||
| -rw-r--r-- | pyramid/scaffolds/starter/+package+/__init__.py_tmpl | 12 | ||||
| -rw-r--r-- | pyramid/scaffolds/starter/+package+/templates/mytemplate.pt (renamed from pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl) | 8 | ||||
| -rw-r--r-- | pyramid/scaffolds/starter/+package+/tests.py_tmpl | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/starter/+package+/views.py_tmpl | 4 |
5 files changed, 19 insertions, 17 deletions
diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/pyramid/scaffolds/starter/+package+/__init__.py new file mode 100644 index 000000000..ddcdd7162 --- /dev/null +++ b/pyramid/scaffolds/starter/+package+/__init__.py @@ -0,0 +1,10 @@ +from pyramid.config import Configurator +from .resources import Root + +def main(global_config, **settings): + """ This function returns a Pyramid WSGI application. + """ + config = Configurator(root_factory=Root, settings=settings) + config.add_static_view('static', 'static', cache_max_age=3600) + config.scan() + return config.make_wsgi_app() diff --git a/pyramid/scaffolds/starter/+package+/__init__.py_tmpl b/pyramid/scaffolds/starter/+package+/__init__.py_tmpl deleted file mode 100644 index d763b2435..000000000 --- a/pyramid/scaffolds/starter/+package+/__init__.py_tmpl +++ /dev/null @@ -1,12 +0,0 @@ -from pyramid.config import Configurator -from {{package}}.resources import Root - -def main(global_config, **settings): - """ This function returns a Pyramid WSGI application. - """ - config = Configurator(root_factory=Root, settings=settings) - config.add_view('{{package}}.views.my_view', - context='{{package}}:resources.Root', - renderer='{{package}}:templates/mytemplate.pt') - config.add_static_view('static', '{{package}}:static', cache_max_age=3600) - return config.make_wsgi_app() diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt index 3cd9c66a4..ab698123e 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt @@ -5,19 +5,19 @@ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/> <meta name="keywords" content="python web application" /> <meta name="description" content="pyramid web application" /> - <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" /> - <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" /> + <link rel="shortcut icon" href="/static/favicon.ico" /> + <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" /> <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" /> <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" /> <!--[if lte IE 6]> - <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" /> + <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" /> <![endif]--> </head> <body> <div id="wrap"> <div id="top"> <div class="top align-center"> - <div><img src="${request.static_url('{{package}}:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div> + <div><img src="/static/pyramid.png" width="750" height="169" alt="pyramid"/></div> </div> </div> <div id="middle"> diff --git a/pyramid/scaffolds/starter/+package+/tests.py_tmpl b/pyramid/scaffolds/starter/+package+/tests.py_tmpl index 1627bf015..401260efb 100644 --- a/pyramid/scaffolds/starter/+package+/tests.py_tmpl +++ b/pyramid/scaffolds/starter/+package+/tests.py_tmpl @@ -10,7 +10,7 @@ class ViewTests(unittest.TestCase): testing.tearDown() def test_my_view(self): - from {{package}}.views import my_view + from .views import my_view request = testing.DummyRequest() info = my_view(request) self.assertEqual(info['project'], '{{project}}') diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl index 12ed8832d..b02b2e79e 100644 --- a/pyramid/scaffolds/starter/+package+/views.py_tmpl +++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl @@ -1,2 +1,6 @@ +from pyramid.view import view_config +from .resources import Root + +@view_config(context=Root, renderer='templates/mytemplate.pt') def my_view(request): return {'project':'{{project}}'} |