/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/wsgi.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/wsgi.py
27
27
from bzrlib.urlutils import local_path_to_url
28
28
    
29
29
 
30
 
def make_app(root, prefix, path_var='REQUEST_URI', readonly=True):
 
30
def make_app(root, prefix, path_var='REQUEST_URI', readonly=True,
 
31
    load_plugins=True, enable_logging=True):
31
32
    """Convenience function to construct a WSGI bzr smart server.
32
33
    
33
34
    :param root: a local path that requests will be relative to.
39
40
        base_transport = get_transport('readonly+' + local_url)
40
41
    else:
41
42
        base_transport = get_transport(local_url)
 
43
    if load_plugins:
 
44
        from bzrlib.plugin import load_plugins
 
45
        load_plugins()
 
46
    if enable_logging:
 
47
        import bzrlib.trace
 
48
        bzrlib.trace.enable_default_logging()
42
49
    app = SmartWSGIApp(base_transport, prefix)
43
50
    app = RelpathSetter(app, '', path_var)
44
51
    return app