diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-18 15:53:49 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-18 15:53:49 -0500 |
| commit | 738a2b5f3eb44da7036a31005144e5252827ac38 (patch) | |
| tree | 80e10d2ae215b2e0e1f248354b6c9a5e11406cd5 /docs/tutorials/catalog | |
| parent | aa6c4267b330a5665dcb7c98d75fe21f8eeececb (diff) | |
| parent | 70119302324e5bf5627344f90c62ef31b6e43005 (diff) | |
| download | pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.tar.gz pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.tar.bz2 pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.zip | |
Merge branch 'model2resource'
Conflicts:
docs/narr/views.rst
Diffstat (limited to 'docs/tutorials/catalog')
| -rw-r--r-- | docs/tutorials/catalog/index.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/catalog/index.rst b/docs/tutorials/catalog/index.rst index 43b078edc..e4e5bd720 100644 --- a/docs/tutorials/catalog/index.rst +++ b/docs/tutorials/catalog/index.rst @@ -88,11 +88,11 @@ want the application to be based on :term:`traversal`. Python 2.5.4 (r254:67916, Sep 4 2009, 02:12:16) [GCC 4.2.1 (Apple Inc. build 5646)] on darwin Type "help" for more information. "root" is the Pyramid app root object. - >>> from pyramid.traversal import model_path + >>> from pyramid.traversal import resource_path >>> from myapp.models import Document >>> root['name'] = Document('title') >>> doc = root['name'] - >>> docid = root.catalog.document_map.add(model_path(doc)) + >>> docid = root.catalog.document_map.add(resource_path(doc)) >>> root.catalog.index_doc(docid, doc) >>> import transaction >>> transaction.commit() |