summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-11-11 18:19:55 -0800
committerSteve Piercy <web@stevepiercy.com>2015-11-11 18:19:55 -0800
commit8a14c0d5b668d74c2ceab2e69d7ea9e77eb4bad0 (patch)
tree436dd32529c31f6421bde9e9b681a84b6bed806f /docs
parent286705cfcceb9ad9fcd536d5b2afc7a5cbc0debc (diff)
parent7d54301859565c789eb12bb8b0b0dd7049704c1c (diff)
downloadpyramid-8a14c0d5b668d74c2ceab2e69d7ea9e77eb4bad0.tar.gz
pyramid-8a14c0d5b668d74c2ceab2e69d7ea9e77eb4bad0.tar.bz2
pyramid-8a14c0d5b668d74c2ceab2e69d7ea9e77eb4bad0.zip
Merge pull request #2106 from stevepiercy/feature/alchemy-scaffold-update
Add Sphinx markers for literalinclude
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py2
-rw-r--r--docs/quick_tour/sqla_demo/sqla_demo/views/default.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py b/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
index 5a2b5890c..eb645bfe6 100644
--- a/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
+++ b/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
@@ -7,11 +7,13 @@ from sqlalchemy import (
)
+# Start Sphinx Include
class MyModel(Base):
__tablename__ = 'models'
id = Column(Integer, primary_key=True)
name = Column(Text)
value = Column(Integer)
+ # End Sphinx Include
Index('my_index', MyModel.name, unique=True, mysql_length=255)
diff --git a/docs/quick_tour/sqla_demo/sqla_demo/views/default.py b/docs/quick_tour/sqla_demo/sqla_demo/views/default.py
index 4c659e5c2..e5e70cf9d 100644
--- a/docs/quick_tour/sqla_demo/sqla_demo/views/default.py
+++ b/docs/quick_tour/sqla_demo/sqla_demo/views/default.py
@@ -10,7 +10,9 @@ from ..models.mymodel import MyModel
def my_view(request):
try:
query = request.dbsession.query(MyModel)
+ # Start Sphinx Include
one = query.filter(MyModel.name == 'one').first()
+ # End Sphinx Include
except DBAPIError:
return Response(db_err_msg, content_type='text/plain', status_int=500)
return {'one': one, 'project': 'sqla_demo'}