modernize

development.ini

@@ -1,13 +1,9 @@
-[app:virginia1]
+[app:main]
 use = egg:virginia
 root = %(here)s/content
-
-[pipeline:main]
-pipeline = 
-      egg:WebError
-      virginia1
+pyramid.includes = pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543

setup.py

@@ -15,19 +15,24 @@
 __version__ = '0.0'
 
 import os
+import sys
+
 from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.txt')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 requires = [
-    'pyramid>=1.0a10',
-    'PasteScript',
-    'WebError',
+    'pyramid>=1.2',
+    'pyramid_debugtoolbar',
     'zope.structuredtext',
+    'waitress',
     ]
 
+if sys.version_info[:3] < (2,5,0):
+    raise RuntimeError('This application requires Python 2.6+')
+
 setup(name='virginia',
       version=__version__,
       description='Serve slightly dynamic filesystem content via Pyramid',

virginia/tests/test_views.py

@@ -1,5 +1,7 @@
 import unittest
 from pyramid import testing
+from pyramid.interfaces import IResponse
+from zope.interface import implementer
 
 class FileViewTests(unittest.TestCase):
     def setUp(self):
@@ -128,6 +130,7 @@ class DummyFile:
     def __init__(self, path):
         self.path = path
 
+@implementer(IResponse) # dont try to convert to response when returned
 class DummyResponse:
     status = '200 OK'
     headerlist = ()

virginia/views.py

@@ -6,8 +6,8 @@
 
 from zope.structuredtext import stx2html
 
-from webob import Response
-from webob.exc import HTTPFound
+from pyramid.response import Response
+from pyramid.httpexceptions import HTTPFound
 
 from pyramid.view import render_view_to_response
 from pyramid.view import view_config