Changeset 266:db40cbcde1a3

Show
Ignore:
Timestamp:
02/13/10 20:50:20 (7 months ago)
Author:
rgrp <http://rufuspollock.org>
Branch:
default
Message:

[format,resource][xs]: change render_resource to use plain format for txt files (also remove obsolete TextFormatterAnnotate? option in format.py).

Location:
shakespeare
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • shakespeare/controllers/our_resource.py

    r234 r266  
    3232    elif res.format == 'txt': 
    3333        tfileobj = res.get_stream() 
    34         ttext = shakespeare.format.format_text(tfileobj, 'lineno') 
     34        ttext = shakespeare.format.format_text(tfileobj, format='plain') 
    3535    elif res.format == 'pdf': 
    3636        # can't render pdfs! 

  • shakespeare/format.py

    r204 r266  
    1313    elif format == 'lineno': 
    1414        formatter = TextFormatterLineno() 
    15     elif format == 'annotate': 
    16         formatter = TextFormatterAnnotate() 
    1715    else: 
    1816        raise ValueError('Unknown format: %s' % format)