Diff of /Allura/allura/lib/custom_middleware.py [e16326] .. [1f90c6]  Maximize  Restore

Switch to side-by-side view

--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -19,47 +19,6 @@
 from allura.lib import helpers as h
 
 log = logging.getLogger(__name__)
-
-environ = _environ = None
-
-def on_import():
-    global environ, _environ
-    environ = _environ = Environ()
-
-class ForgeMiddleware(object):
-    '''Middleware responsible for pushing the MagicalC object and setting the
-    threadlocal _environ.  This is inner middleware, and must be called from
-    within the TGController.__call__ method because it depends on pylons.c and pylons.g'''
-
-    def __init__(self, app):
-        self.app = app
-        self.g = pylons.g._current_obj()
-
-    def __call__(self, environ, start_response):
-        _environ.set_environment(environ)
-        magical_c = MagicalC(pylons.c._current_obj(), environ)
-        pylons.c._push_object(magical_c)
-        try:
-            result = self.app(environ, start_response)
-            if isinstance(result, list):
-                self._cleanup_request(environ)
-                return result
-            else:
-                return self._cleanup_iterator(result, environ)
-        finally:
-            pylons.c._pop_object()
-
-    def _cleanup_request(self, environ):
-        for msg in environ.get('allura.queued_messages', []):
-            self.g._publish(**msg)
-        carrot = environ.pop('allura.carrot.connection', None)
-        if carrot: carrot.close()
-        _environ.set_environment({})
-
-    def _cleanup_iterator(self, result, environ):
-        for x in result:
-            yield x
-        self._cleanup_request(environ)
 
 class StaticFilesMiddleware(object):
     '''Custom static file middleware
@@ -160,7 +119,6 @@
             return start_response(status, headers, exc_info)
         return self._app(environ, session_start_response)
 
-
 class SSLMiddleware(object):
     'Verify the https/http schema is correct'
 
@@ -247,86 +205,3 @@
             M.Stats.make(s.asdict()).m.insert()
         return result
 
-class Environ(object):
-    _local = local()
-
-    def set_environment(self, environ):
-        self._local.environ = environ
-
-    def __getitem__(self, name):
-        if not hasattr(self._local, 'environ'):
-            self.set_environment({})
-        try:
-            return self._local.environ[name]
-        except AttributeError:
-            self._local.environ = {}
-            raise KeyError, name
-
-    def __setitem__(self, name, value):
-        if not hasattr(self._local, 'environ'):
-            self.set_environment({})
-        try:
-            self._local.environ[name] = value
-        except AttributeError:
-            self._local.environ = {name:value}
-
-    def __delitem__(self, name):
-        if not hasattr(self._local, 'environ'):
-            self.set_environment({})
-        try:
-            del self._local.environ[name]
-        except AttributeError:
-            self._local.environ = {}
-            raise KeyError, name
-
-    def __getattr__(self, name):
-        if not hasattr(self._local, 'environ'):
-            self.set_environment({})
-        return getattr(self._local.environ, name)
-
-    def __repr__(self):
-        if not hasattr(self._local, 'environ'):
-            self.set_environment({})
-        return repr(self._local.environ)
-
-    def __contains__(self, key):
-        return self._local.environ and key in self._local.environ
-
-class MagicalC(object):
-    '''Magically saves various attributes to the environ'''
-    _saved_attrs = set(['project', 'app', 'queued_messages'])
-
-    def __init__(self, old_c, environ):
-        self._old_c = old_c
-        self._environ = environ
-
-    def __getattr__(self, name):
-        return getattr(self._old_c, name)
-
-    def __setattr__(self, name, value):
-        if name in MagicalC._saved_attrs:
-            self._environ['allura.' + name] = value
-        if name not in ('_old_c', '_environ'):
-            setattr(self._old_c, name, value)
-        object.__setattr__(self, name, value)
-
-    def __delattr__(self, name):
-        if name not in ('_old_c', '_environ'):
-            delattr(self._old_c, name)
-        object.__delattr__(self, name)
-
-@contextmanager
-def fake_pylons_context(request):
-    from allura.lib.app_globals import Globals
-    class EmptyClass(object): pass
-    pylons.c._push_object(MagicalC(EmptyClass(), environ))
-    pylons.g._push_object(Globals())
-    pylons.request._push_object(request)
-    try:
-        yield
-    finally:
-        pylons.c._pop_object()
-        pylons.g._pop_object()
-        pylons.request._pop_object()
-
-on_import()

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks