uncommitted changes laying around

karlserve/application.py

@@ -2,8 +2,8 @@
 import os
 import time
 
-from repoze.bfg.configuration import Configurator
-from repoze.bfg.exceptions import NotFound
+from pyramid.configuration import Configurator
+from pyramid.exceptions import NotFound
 from repoze.depinj import lookup
 
 from karlserve.instance import get_current_instance
@@ -76,9 +76,8 @@ def make_app(global_config, **local_config):
     configure_log(**log_config)
 
     # Configure repoze.bfg application
-    config = lookup(Configurator)(settings=settings.copy())
+    config = lookup(Configurator)(settings=settings)
     config.begin()
-    config.registry.settings = settings # emulate pyramid
     config.add_route(name='sites', path='/*subpath', view=site_dispatch)
     config.end()
 

karlserve/instance.py

@@ -13,7 +13,7 @@
 
 from persistent.mapping import PersistentMapping
 
-from repoze.bfg.router import make_app as bfg_make_app
+from pyramid_zcml import make_app as bfg_make_app
 from repoze.depinj import lookup
 from repoze.retry import Retry
 from repoze.tm import TM as make_tm

karlserve/scripts/create_mailin_trace.py

@@ -1,6 +1,6 @@
 import transaction
 
-from repoze.bfg.traversal import model_path
+from pyramid.traversal import model_path
 from karl.content.models.blog import MailinTraceBlog
 from karl.utils import find_communities
 

karlserve/scripts/main.py

@@ -9,7 +9,7 @@
 import sys
 
 from paste.deploy import loadapp
-from repoze.bfg.scripting import get_root
+from pyramid.scripting import get_root
 
 from karl.scripting import run_daemon
 from karlserve.instance import get_instances

karlserve/scripts/reindex_text.py

@@ -2,7 +2,7 @@
 import logging
 import transaction
 
-from repoze.bfg.traversal import find_model
+from pyramid.traversal import find_model
 from repoze.catalog.indexes.text import CatalogTextIndex
 from ZODB.POSException import ConflictError
 

karlserve/tests/configure.zcml

@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
   <include package="karl.includes" file="configure.zcml" />
   <include package="karl.includes" file="workflow.zcml" />
 </configure>

karlserve/tests/test_application.py

@@ -42,6 +42,7 @@ def test_it(self):
         del app_settings['var_instance']
         self.failUnless(app_settings['var_tmp'].endswith('/var/tmp'))
         del app_settings['var_tmp']
+        del app_settings['bfg.setting']
         self.assertEqual(app.registry.settings, settings)
         self.assertEqual(settings['instances_config'], 'instances.ini')
         self.assertEqual(settings['error_monitor_dir'], 'var/error')
@@ -92,12 +93,12 @@ def call_fut(self, request):
         return fut(request)
 
     def test_root(self):
-        from repoze.bfg.exceptions import NotFound
+        from pyramid.exceptions import NotFound
         request = dummy_request('/')
         self.assertRaises(NotFound, self.call_fut, request)
 
     def test_not_found_instance(self):
-        from repoze.bfg.exceptions import NotFound
+        from pyramid.exceptions import NotFound
         request = dummy_request('/instance/some/url')
         self.assertRaises(NotFound, self.call_fut, request)
 
@@ -139,7 +140,7 @@ class DummyConfigurator(object):
 
     def __init__(self, settings):
         self.settings = settings
-        self.registry = DummyRegistry()
+        self.registry = DummyRegistry(settings)
         self._added_routes = []
         settings['bfg.setting'] = 'foo'
 
@@ -157,11 +158,11 @@ def make_wsgi_app(self):
 
 
 class DummyRegistry(dict):
-    pass
-
+    def __init__(self, settings=None):
+        self.settings = settings
 
-from repoze.bfg.testing import DummyRequest as BFGDummyRequest
-class DummyRequest(object, BFGDummyRequest):
+from pyramid.testing import DummyRequest as BFGDummyRequest
+class DummyRequest(BFGDummyRequest):
 
     def __init__(self, environ=None):
         BFGDummyRequest.__init__(self)