Convert absolute 'tutorial' package references that are from within the

package to relative ones, to reduce brittleness, eg when the user names the
package something other than 'tutorial'.

- make imports relative
- use plain relative URLs for resources (like stylesheets and images) in
  page templates.

This is the last batch of this kind of change that I know about.  I've
exercised the changes (via the browser and the test target) in a package
with an alternate name, 'zodbtutorial', as well as in a package with the
default name, 'tutorial'.

5 files changed, 31 insertions, 32 deletions

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/tests.py b/docs/tutorials/wiki/src/authorization/tutorial/tests.py
index a4a4e2754..77e7cce29 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/tests.py
@@ -5,7 +5,7 @@ from pyramid import testing
 class PageModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Page
+        from .models import Page
         return Page
 
     def _makeOne(self, data=u'some data'):
@@ -14,11 +14,11 @@ class PageModelTests(unittest.TestCase):
     def test_constructor(self):
         instance = self._makeOne()
         self.assertEqual(instance.data, u'some data')
-        
+
 class WikiModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Wiki
+        from .models import Wiki
         return Wiki
 
     def _makeOne(self):
@@ -31,7 +31,7 @@ class WikiModelTests(unittest.TestCase):
 
 class AppmakerTests(unittest.TestCase):
     def _callFUT(self, zodb_root):
-        from tutorial.models import appmaker
+        from .models import appmaker
         return appmaker(zodb_root)
 
     def test_it(self):
@@ -42,7 +42,7 @@ class AppmakerTests(unittest.TestCase):
 
 class ViewWikiTests(unittest.TestCase):
     def test_it(self):
-        from tutorial.views import view_wiki
+        from .views import view_wiki
         context = testing.DummyResource()
         request = testing.DummyRequest()
         response = view_wiki(context, request)
@@ -50,7 +50,7 @@ class ViewWikiTests(unittest.TestCase):
 
 class ViewPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import view_page
+        from .views import view_page
         return view_page(context, request)
 
     def test_it(self):
@@ -72,11 +72,11 @@ class ViewPageTests(unittest.TestCase):
             '</p>\n</div>\n')
         self.assertEqual(info['edit_url'],
                          'http://example.com/thepage/edit_page')
-        
-    
+
+
 class AddPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import add_page
+        from .views import add_page
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -88,7 +88,7 @@ class AddPageTests(unittest.TestCase):
         self.assertEqual(info['save_url'],
                          request.resource_url(
                              context, 'add_page', 'AnotherPage'))
-        
+
     def test_it_submitted(self):
         context = testing.DummyResource()
         request = testing.DummyRequest({'form.submitted':True,
@@ -102,7 +102,7 @@ class AddPageTests(unittest.TestCase):
 
 class EditPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import edit_page
+        from .views import edit_page
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -112,7 +112,7 @@ class EditPageTests(unittest.TestCase):
         self.assertEqual(info['page'], context)
         self.assertEqual(info['save_url'],
                          request.resource_url(context, 'edit_page'))
-        
+
     def test_it_submitted(self):
         context = testing.DummyResource()
         request = testing.DummyRequest({'form.submitted':True,
diff --git a/docs/tutorials/wiki/src/models/tutorial/tests.py b/docs/tutorials/wiki/src/models/tutorial/tests.py
index 51c97a95d..9fd13a18d 100644
--- a/docs/tutorials/wiki/src/models/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/models/tutorial/tests.py
@@ -5,7 +5,7 @@ from pyramid import testing
 class PageModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Page
+        from .models import Page
         return Page
 
     def _makeOne(self, data=u'some data'):
@@ -14,11 +14,11 @@ class PageModelTests(unittest.TestCase):
     def test_constructor(self):
         instance = self._makeOne()
         self.assertEqual(instance.data, u'some data')
-        
+
 class WikiModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Wiki
+        from .models import Wiki
         return Wiki
 
     def _makeOne(self):
@@ -32,7 +32,7 @@ class WikiModelTests(unittest.TestCase):
 class AppmakerTests(unittest.TestCase):
 
     def _callFUT(self, zodb_root):
-        from tutorial.models import appmaker
+        from .models import appmaker
         return appmaker(zodb_root)
 
     def test_no_app_root(self):
@@ -55,7 +55,7 @@ class ViewTests(unittest.TestCase):
         testing.tearDown()
 
     def test_my_view(self):
-        from tutorial.views import my_view
+        from .views import my_view
         request = testing.DummyRequest()
         info = my_view(request)
         self.assertEqual(info['project'], 'tutorial')
diff --git a/docs/tutorials/wiki/src/tests/tutorial/__init__.py b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
index bf39949f6..dd2339c51 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
@@ -4,8 +4,8 @@ from pyramid_zodbconn import get_connection
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
 
-from tutorial.models import appmaker
-from tutorial.security import groupfinder
+from .models import appmaker
+from .security import groupfinder
 
 def root_factory(request):
     conn = get_connection(request)
diff --git a/docs/tutorials/wiki/src/tests/tutorial/login.py b/docs/tutorials/wiki/src/tests/tutorial/login.py
index d608a7d0b..11dea050f 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/login.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/login.py
@@ -4,9 +4,9 @@ from pyramid.security import remember
 from pyramid.security import forget
 from pyramid.view import view_config
 
-from tutorial.security import USERS
+from .security import USERS
 
-@view_config(context='tutorial.models.Wiki', name='login',
+@view_config(context='.models.Wiki', name='login',
              renderer='templates/login.pt')
 @view_config(context='pyramid.httpexceptions.HTTPForbidden',
              renderer='templates/login.pt')
@@ -35,10 +35,9 @@ def login(request):
         login = login,
         password = password,
         )
-    
-@view_config(context='tutorial.models.Wiki', name='logout')
+
+@view_config(context='.models.Wiki', name='logout')
 def logout(request):
     headers = forget(request)
     return HTTPFound(location = request.resource_url(request.context),
                      headers = headers)
-    
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index b1d4e68c3..81f7a1882 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -5,7 +5,7 @@ from pyramid import testing
 class PageModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Page
+        from .models import Page
         return Page
 
     def _makeOne(self, data=u'some data'):
@@ -18,7 +18,7 @@ class PageModelTests(unittest.TestCase):
 class WikiModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from tutorial.models import Wiki
+        from .models import Wiki
         return Wiki
 
     def _makeOne(self):
@@ -31,7 +31,7 @@ class WikiModelTests(unittest.TestCase):
 
 class AppmakerTests(unittest.TestCase):
     def _callFUT(self, zodb_root):
-        from tutorial.models import appmaker
+        from .models import appmaker
         return appmaker(zodb_root)
 
     def test_it(self):
@@ -42,7 +42,7 @@ class AppmakerTests(unittest.TestCase):
 
 class ViewWikiTests(unittest.TestCase):
     def test_it(self):
-        from tutorial.views import view_wiki
+        from .views import view_wiki
         context = testing.DummyResource()
         request = testing.DummyRequest()
         response = view_wiki(context, request)
@@ -50,7 +50,7 @@ class ViewWikiTests(unittest.TestCase):
 
 class ViewPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import view_page
+        from .views import view_page
         return view_page(context, request)
 
     def test_it(self):
@@ -76,7 +76,7 @@ class ViewPageTests(unittest.TestCase):
 
 class AddPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import add_page
+        from .views import add_page
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -102,7 +102,7 @@ class AddPageTests(unittest.TestCase):
 
 class EditPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from tutorial.views import edit_page
+        from .views import edit_page
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -133,7 +133,7 @@ class FunctionalTests(unittest.TestCase):
     def setUp(self):
         import tempfile
         import os.path
-        from tutorial import main
+        from . import main
         self.tmpdir = tempfile.mkdtemp()
 
         dbpath = os.path.join( self.tmpdir, 'test.db')