diff options
| author | Martin Vilcans <martin@librador.com> | 2011-10-01 22:05:26 +0200 |
|---|---|---|
| committer | Martin Vilcans <martin@librador.com> | 2011-10-01 22:05:26 +0200 |
| commit | 1a738815056d422fc24cdc3577963d7b319fd5f7 (patch) | |
| tree | 33a362d8ac26a53a39c4eab0c8ba3d5088770249 | |
| parent | 55f57452ad4967247f700608556e96bfaa625425 (diff) | |
Just some cleanup/reformatting
| -rw-r--r-- | screenplain/export/annotated_html.py | 5 | ||||
| -rw-r--r-- | screenplain/export/fdx.py | 2 | ||||
| -rw-r--r-- | tests/fdx_test.py | 1 | ||||
| -rw-r--r-- | tests/spmd_test.py | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/screenplain/export/annotated_html.py b/screenplain/export/annotated_html.py index 0690c2f..0084b8a 100644 --- a/screenplain/export/annotated_html.py +++ b/screenplain/export/annotated_html.py @@ -76,9 +76,8 @@ def to_annotated_html(screenplay, out): ) margin = '<p> </p>' * para.top_margin - data = { + out.write(paragraph_html % { 'type': classname, 'text': html_text, 'margin': margin - } - out.write(paragraph_html % data) + }) diff --git a/screenplain/export/fdx.py b/screenplain/export/fdx.py index 32e18f5..618d91c 100644 --- a/screenplain/export/fdx.py +++ b/screenplain/export/fdx.py @@ -55,12 +55,14 @@ def write_dialog(out, dialog): else: write_paragraph(out, 'Dialogue', [line]) + def write_dual_dialog(out, dual): out.write('<Paragraph><DualDialogue>') write_dialog(out, dual.left) write_dialog(out, dual.right) out.write('</DualDialogue></Paragraph>') + def to_fdx(screenplay, out): out.write( diff --git a/tests/fdx_test.py b/tests/fdx_test.py index 9737493..153a0cf 100644 --- a/tests/fdx_test.py +++ b/tests/fdx_test.py @@ -5,6 +5,7 @@ from screenplain.export.fdx import write_text from screenplain.richstring import RichString, Bold, Italic + class OutputTests(unittest2.TestCase): def setUp(self): diff --git a/tests/spmd_test.py b/tests/spmd_test.py index 1c25f05..1f5c0f5 100644 --- a/tests/spmd_test.py +++ b/tests/spmd_test.py @@ -118,7 +118,6 @@ class ParseTests(unittest2.TestCase): (False, '||') ], dialog.blocks) - def test_standard_transition(self): paras = list(parse([ |