← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Matt Nordhoff
  • Date: 2009-05-05 18:01:25 UTC
  • mfrom: (339 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-20090505180125-09yuufnnpzo0jr0m
Merge trunk, fixing conflicts

I should check that the imports I removed aren't being used in the new code, but I didn't.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
71
71
                import os.path, sys
72
72
                sys.path.append(os.path.dirname(__file__))
73
73
 
74
 
                from loggerhead.apps.filesystem import BranchesFromFileSystemRoot
 
74
                from loggerhead.apps.transport import BranchesFromTransportRoot
75
75
                from paste.httpexceptions import HTTPExceptionHandler
76
76
                from paste.httpserver import serve
77
 
                a = HTTPExceptionHandler(BranchesFromFileSystemRoot('.'))
 
77
                a = HTTPExceptionHandler(BranchesFromTransportRoot('.'))
78
78
                port = kw.get('port', DEFAULT_PORT)
79
79
                # port might be an int already...
80
80
                if isinstance(port, basestring) and ':' in port: