← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/apps/__init__.py

  • Committer: Martin Pool
  • Date: 2009-01-23 20:34:40 UTC
  • mto: This revision was merged to the branch mainline in revision 298.
  • Revision ID: mbp@sourcefrog.net-20090123203440-3attwqd8tje6np09
Merge in 'serve --http' based on code from mwh

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/__init__.py
4
4
 
5
5
from paste import urlparser, fileapp
6
6
 
7
 
from loggerhead.util import convert_file_errors
 
7
from bzrlib.plugin import load_plugins
8
8
 
9
9
static = os.path.join(
10
10
    os.path.dirname(os.path.dirname(__file__)), 'static')
11
11
 
12
12
static_app = urlparser.make_static(None, static)
13
13
 
14
 
favicon_app = convert_file_errors(fileapp.FileApp(
15
 
    os.path.join(static, 'images', 'favicon.ico')))
 
14
favicon_app = fileapp.FileApp(os.path.join(static, 'images', 'favicon.ico'))
 
15
robots_app = fileapp.FileApp(os.path.join(static, 'robots.txt'))
16
16
 
17
 
robots_app = convert_file_errors(fileapp.FileApp(
18
 
    os.path.join(static, 'robots.txt')))
 
17
# load plugins - such as svn:// support, extra formats and so on.
 
18
load_plugins()