/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 tools/rst2html.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/rst2html.py
 
1
#! /usr/bin/env python
 
2
 
 
3
# Originally by Dave Goodger, from the docutils, distribution.
 
4
#
 
5
# Modified for Bazaar to accommodate options containing dots
 
6
#
 
7
# This file is in the public domain.
 
8
 
 
9
"""
 
10
A minimal front end to the Docutils Publisher, producing HTML.
 
11
"""
 
12
 
 
13
try:
 
14
    import locale
 
15
    locale.setlocale(locale.LC_ALL, '')
 
16
except:
 
17
    pass
 
18
 
 
19
import docutils
 
20
from docutils.core import publish_cmdline, default_description
 
21
 
 
22
if True: # this is still required in the distutils trunk as-at June 2008.
 
23
    from docutils.parsers.rst.states import Body
 
24
    # we have some option names that contain dot; which is not allowed by
 
25
    # python-docutils 0.4-4 -- so monkeypatch in a better pattern
 
26
    #
 
27
    # This is a bit gross to patch because all this is built up at load time.
 
28
    Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'    
 
29
    Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats
 
30
    Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats
 
31
    Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*(  +| ?$)' % Body.pats
 
32
 
 
33
 
 
34
description = ('Generates (X)HTML documents from standalone reStructuredText '
 
35
               'sources.  ' + default_description)
 
36
 
 
37
 
 
38
# workaround for bug with <xxx id="tags" name="tags"> in IE
 
39
from docutils.writers import html4css1
 
40
 
 
41
class IESafeHtmlTranslator(html4css1.HTMLTranslator):
 
42
 
 
43
    def starttag(self, node, tagname, suffix='\n', empty=0, **attributes):
 
44
        x = html4css1.HTMLTranslator.starttag(self, node, tagname, suffix,
 
45
                                              empty, **attributes)
 
46
        y = x.replace('id="tags"', 'id="tags_"')
 
47
        y = y.replace('name="tags"', 'name="tags_"')
 
48
        y = y.replace('href="#tags"', 'href="#tags_"')
 
49
        return y
 
50
 
 
51
mywriter = html4css1.Writer()
 
52
mywriter.translator_class = IESafeHtmlTranslator
 
53
 
 
54
 
 
55
publish_cmdline(writer=mywriter, description=description)