details: http://www.bx.psu.edu/hg/galaxy/rev/0fd76a02c2b2 changeset: 2637:0fd76a02c2b2 user: James Taylor <james@jamestaylor.org> date: Fri Aug 28 15:12:55 2009 -0400 description: Purge references to Beaker and flup from buildapp 2 file(s) affected in this change: eggs.ini lib/galaxy/web/buildapp.py diffs (48 lines): diff -r b7a3a82b71ce -r 0fd76a02c2b2 eggs.ini --- a/eggs.ini Fri Aug 28 15:07:48 2009 -0400 +++ b/eggs.ini Fri Aug 28 15:12:55 2009 -0400 @@ -29,7 +29,6 @@ Beaker = 1.4 docutils = 0.4 elementtree = 1.2.6_20050316 -flup = 0.5 lrucache = 0.2 ;lsprof - james Mako = 0.2.4 @@ -79,7 +78,6 @@ Beaker = http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-1.4.tar.gz docutils = http://downloads.sourceforge.net/docutils/docutils-0.4.tar.gz elementtree = http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz -flup = http://www.saddi.com/software/flup/dist/archive/flup-r2311.tar.gz lrucache = http://evan.prodromou.name/lrucache/lrucache-0.2.tar.gz Mako = http://www.makotemplates.org/downloads/Mako-0.2.4.tar.gz MyghtyUtils = http://cheeseshop.python.org/packages/source/M/MyghtyUtils/MyghtyUtils-0.52.... diff -r b7a3a82b71ce -r 0fd76a02c2b2 lib/galaxy/web/buildapp.py --- a/lib/galaxy/web/buildapp.py Fri Aug 28 15:07:48 2009 -0400 +++ b/lib/galaxy/web/buildapp.py Fri Aug 28 15:12:55 2009 -0400 @@ -11,7 +11,6 @@ from paste.util import import_string from paste import httpexceptions from paste.deploy.converters import asbool -import flup.middleware.session as flup_session import pkg_resources log = logging.getLogger( __name__ ) @@ -116,17 +115,6 @@ from paste import recursive app = recursive.RecursiveMiddleware( app, conf ) log.debug( "Enabling 'recursive' middleware" ) - ## # Session middleware puts a session factory into the environment - ## if asbool( conf.get( 'use_session', True ) ): - ## store = flup_session.MemorySessionStore() - ## app = flup_session.SessionMiddleware( store, app ) - ## log.debug( "Enabling 'flup session' middleware" ) - # Beaker session middleware - if asbool( conf.get( 'use_beaker_session', False ) ): - pkg_resources.require( "Beaker" ) - import beaker.session - app = beaker.session.SessionMiddleware( app, conf ) - log.debug( "Enabling 'beaker session' middleware" ) # Various debug middleware that can only be turned on if the debug # flag is set, either because they are insecure or greatly hurt # performance