← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/apps/__init__.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-30 10:27:43 UTC
  • mfrom: (334 trunk)
  • mto: (389.2.2 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20090430102743-76rqdslvx4f8y1up
Merge trunk, fixing conflicts.

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
8
 
 
9
7
static = os.path.join(
10
8
    os.path.dirname(os.path.dirname(__file__)), 'static')
11
9
 
12
10
static_app = urlparser.make_static(None, static)
13
11
 
14
 
favicon_app = convert_file_errors(fileapp.FileApp(
15
 
    os.path.join(static, 'images', 'favicon.ico')))
16
 
 
17
 
robots_app = convert_file_errors(fileapp.FileApp(
18
 
    os.path.join(static, 'robots.txt')))
 
12
favicon_app = fileapp.FileApp(os.path.join(static, 'images', 'favicon.ico'))
 
13
robots_app = fileapp.FileApp(os.path.join(static, 'robots.txt'))