Merge branch 'model2resource'

Conflicts:
	docs/narr/views.rst

3 files changed, 6 insertions, 10 deletions

diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index 05730a115..813028704 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -1,12 +1,12 @@
 from pyramid.config import Configurator
-from myproject.models import get_root
+from myproject.resources import Root
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
-    config = Configurator(root_factory=get_root, settings=settings)
+    config = Configurator(root_factory=Root, settings=settings)
     config.add_view('myproject.views.my_view',
-                    context='myproject.models.MyModel',
+                    context='myproject.resources.Root',
                     renderer='myproject:templates/mytemplate.pt')
     config.add_static_view('static', 'myproject:static')
     return config.make_wsgi_app()
diff --git a/docs/narr/MyProject/myproject/models.py b/docs/narr/MyProject/myproject/models.py
deleted file mode 100644
index 75dec7505..000000000
--- a/docs/narr/MyProject/myproject/models.py
+++ /dev/null
@@ -1,7 +0,0 @@
-class MyModel(object):
-    pass
-
-root = MyModel()
-
-def get_root(request):
-    return root
diff --git a/docs/narr/MyProject/myproject/resources.py b/docs/narr/MyProject/myproject/resources.py
new file mode 100644
index 000000000..3d811895c
--- /dev/null
+++ b/docs/narr/MyProject/myproject/resources.py
@@ -0,0 +1,3 @@
+class Root(object):
+    def __init__(self, request):
+        self.request = request