summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-06-29 00:41:04 -0700
committerSteve Piercy <web@stevepiercy.com>2018-06-29 00:41:04 -0700
commit178bf2077247ff8e88f21e112b082fe0a375020b (patch)
tree13357d8ed206f842d369afa711cbc2c400fcdb3e /docs/tutorials/wiki2
parentc71eeae50ed148407c530de783f808cece8537e1 (diff)
downloadpyramid-178bf2077247ff8e88f21e112b082fe0a375020b.tar.gz
pyramid-178bf2077247ff8e88f21e112b082fe0a375020b.tar.bz2
pyramid-178bf2077247ff8e88f21e112b082fe0a375020b.zip
More synching of src to cc files
Diffstat (limited to 'docs/tutorials/wiki2')
-rw-r--r--docs/tutorials/wiki2/src/installation/tutorial/templates/mytemplate.jinja22
-rw-r--r--docs/tutorials/wiki2/src/installation/tutorial/views/default.py6
-rw-r--r--docs/tutorials/wiki2/src/models/.gitignore21
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.jinja22
4 files changed, 26 insertions, 5 deletions
diff --git a/docs/tutorials/wiki2/src/installation/tutorial/templates/mytemplate.jinja2 b/docs/tutorials/wiki2/src/installation/tutorial/templates/mytemplate.jinja2
index 26d72c0a6..d8b0a4232 100644
--- a/docs/tutorials/wiki2/src/installation/tutorial/templates/mytemplate.jinja2
+++ b/docs/tutorials/wiki2/src/installation/tutorial/templates/mytemplate.jinja2
@@ -5,4 +5,4 @@
<h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Alchemy project</span></h1>
<p class="lead">Welcome to <span class="font-normal">{{project}}</span>, a&nbsp;Pyramid application generated&nbsp;by<br><span class="font-normal">Cookiecutter</span>.</p>
</div>
-{% endblock content %}
+{% endblock content %} \ No newline at end of file
diff --git a/docs/tutorials/wiki2/src/installation/tutorial/views/default.py b/docs/tutorials/wiki2/src/installation/tutorial/views/default.py
index f8793ffb5..ef69ff895 100644
--- a/docs/tutorials/wiki2/src/installation/tutorial/views/default.py
+++ b/docs/tutorials/wiki2/src/installation/tutorial/views/default.py
@@ -3,14 +3,14 @@ from pyramid.view import view_config
from sqlalchemy.exc import DBAPIError
-from ..models import MyModel
+from .. import models
@view_config(route_name='home', renderer='../templates/mytemplate.jinja2')
def my_view(request):
try:
- query = request.dbsession.query(MyModel)
- one = query.filter(MyModel.name == 'one').first()
+ query = request.dbsession.query(models.MyModel)
+ one = query.filter(models.MyModel.name == 'one').first()
except DBAPIError:
return Response(db_err_msg, content_type='text/plain', status=500)
return {'one': one, 'project': 'myproj'}
diff --git a/docs/tutorials/wiki2/src/models/.gitignore b/docs/tutorials/wiki2/src/models/.gitignore
new file mode 100644
index 000000000..1853d983c
--- /dev/null
+++ b/docs/tutorials/wiki2/src/models/.gitignore
@@ -0,0 +1,21 @@
+*.egg
+*.egg-info
+*.pyc
+*$py.class
+*~
+.coverage
+coverage.xml
+build/
+dist/
+.tox/
+nosetests.xml
+env*/
+tmp/
+Data.fs*
+*.sublime-project
+*.sublime-workspace
+.*.sw?
+.sw?
+.DS_Store
+coverage
+test
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.jinja2 b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.jinja2
index 26d72c0a6..d8b0a4232 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.jinja2
+++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.jinja2
@@ -5,4 +5,4 @@
<h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Alchemy project</span></h1>
<p class="lead">Welcome to <span class="font-normal">{{project}}</span>, a&nbsp;Pyramid application generated&nbsp;by<br><span class="font-normal">Cookiecutter</span>.</p>
</div>
-{% endblock content %}
+{% endblock content %} \ No newline at end of file