From c7b6c1373ff3c971012964ad2dcab069f2548fb2 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 12 Nov 2011 19:53:18 -0500 Subject: make relocatable (as per Ken's changes) --- pyramid/scaffolds/starter/+package+/__init__.py | 10 +++ .../scaffolds/starter/+package+/__init__.py_tmpl | 12 ---- .../starter/+package+/templates/mytemplate.pt | 76 ++++++++++++++++++++++ .../starter/+package+/templates/mytemplate.pt_tmpl | 76 ---------------------- pyramid/scaffolds/starter/+package+/tests.py_tmpl | 2 +- pyramid/scaffolds/starter/+package+/views.py_tmpl | 4 ++ 6 files changed, 91 insertions(+), 89 deletions(-) create mode 100644 pyramid/scaffolds/starter/+package+/__init__.py delete mode 100644 pyramid/scaffolds/starter/+package+/__init__.py_tmpl create mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt delete mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl 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 b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt new file mode 100644 index 000000000..ab698123e --- /dev/null +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt @@ -0,0 +1,76 @@ + + + + The Pyramid Web Application Development Framework + + + + + + + + + + +
+
+
+
pyramid
+
+
+
+
+

+ Welcome to ${project}, an application generated by
+ the Pyramid web application development framework. +

+
+
+
+
+
+

Search documentation

+
+ + +
+
+ +
+
+
+ + + diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl deleted file mode 100644 index 3cd9c66a4..000000000 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ /dev/null @@ -1,76 +0,0 @@ - - - - The Pyramid Web Application Development Framework - - - - - - - - - - -
-
-
-
pyramid
-
-
-
-
-

- Welcome to ${project}, an application generated by
- the Pyramid web application development framework. -

-
-
-
-
-
-

Search documentation

-
- - -
-
- -
-
-
- - - 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}}'} -- cgit v1.2.3