Changeset 4843

Show
Ignore:
Timestamp:
06/28/08 18:40:04 (2 months ago)
Author:
brunojm
Message:

some fixes in extension

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/docs/tgext.py

    r4830 r4843  
    2323 
    2424beginmarker_re = re.compile(r'##\{(?P<section>.+)}') 
    25 endmarker_re = re.compile(r'##$') 
     25endmarker_re = re.compile(r'##') 
    2626 
    2727def format_block(block): 
    …… 
    6363        end = len(source) 
    6464 
    65     return ''.join([source[line] for line in xrange(begin, end) \ 
     65    return '\n'.join([source[line] for line in xrange(begin, end) \ 
    6666                    if not (beginmarker_re.search(source[line]) \ 
    6767                            or endmarker_re.search(source[line])) ]) 
    …… 
    104104            elif environment.config.code_scm == 'hg': 
    105105                scm = HgClient(environment.config.code_path) 
    106             data = scm.get_file(fpath, revision).splitlines(True) 
     106            data = scm.get_file(fpath, revision).splitlines() 
    107107        else: 
    108108            fp = open(fpath) 
    109             data = fp.readlines() 
     109            data = fp.read().splitlines() 
    110110            fp.close() 
    111111        section_name = options.get('section', '')