← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Max Kanat-Alexander
  • Date: 2010-12-01 08:21:27 UTC
  • mfrom: (422 1.18)
  • mto: (157.1.21 devel)
  • mto: This revision was merged to the branch mainline in revision 423.
  • Revision ID: mkanat@bugzilla.org-20101201082127-yu0isu70q6d9n32e
Merge in the 1.18 stable branch. (No important fixes, but gets us current
with stable.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
30
30
starts a web server to browse the contents of a branch.
31
31
"""
32
32
 
33
 
version_info = (1, 17, 0)
 
33
from info import (
 
34
    bzr_plugin_version as version_info,
 
35
    bzr_compatible_versions,
 
36
    )
34
37
 
35
38
if __name__ == 'bzrlib.plugins.loggerhead':
36
39
    import bzrlib
37
40
    from bzrlib.api import require_any_api
38
41
 
39
 
    require_any_api(bzrlib, [
40
 
        (1, 13, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0), (1, 18, 0),
41
 
        (2, 0, 0), (2, 1, 0), (2, 2, 0)])
 
42
    require_any_api(bzrlib, bzr_compatible_versions)
42
43
 
43
44
    # NB: Normally plugins should lazily load almost everything, but this
44
45
    # seems reasonable to have in-line here: bzrlib.commands and options are
69
70
        logging.getLogger('simpleTAL').addHandler(handler)
70
71
        logging.getLogger('simpleTALES').addHandler(handler)
71
72
 
72
 
    def serve_http(transport, host=None, port=None, inet=None):
73
 
        from paste.httpexceptions import HTTPExceptionHandler
74
 
        from paste.httpserver import serve
75
73
 
 
74
    def _ensure_loggerhead_path():
 
75
        """Ensure that you can 'import loggerhead' and get the root."""
76
76
        # loggerhead internal code will try to 'import loggerhead', so
77
77
        # let's put it on the path if we can't find it in the existing path
78
78
        try:
81
81
            import os.path, sys
82
82
            sys.path.append(os.path.dirname(__file__))
83
83
 
 
84
    def serve_http(transport, host=None, port=None, inet=None):
 
85
        from paste.httpexceptions import HTTPExceptionHandler
 
86
        from paste.httpserver import serve
 
87
 
 
88
        _ensure_loggerhead_path()
 
89
 
84
90
        from loggerhead.apps.transport import BranchesFromTransportRoot
85
91
        from loggerhead.config import LoggerheadConfig
86
92
 
132
138
                    super(cmd_serve, self).run(*args, **kw)
133
139
 
134
140
        register_command(cmd_serve)
 
141
 
 
142
    def load_tests(standard_tests, module, loader):
 
143
        _ensure_loggerhead_path()
 
144
        standard_tests.addTests(loader.loadTestsFromModuleNames(
 
145
            ['bzrlib.plugins.loggerhead.loggerhead.tests']))
 
146
        return standard_tests