aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Vilcans <martin@librador.com>2012-07-08 22:29:55 +0200
committerMartin Vilcans <martin@librador.com>2012-07-08 22:29:55 +0200
commit891540b623830ee8320b885b7dd6b6dedbe5cfcf (patch)
treea0d2925140aa1450d9aa3774d8d56ade0ec2ce4f
parent6c4e892d32cafa6c8a78cf0ffa268b727f18a684 (diff)
downloadscreenplain-891540b623830ee8320b885b7dd6b6dedbe5cfcf.tar.gz
PEP8 compliance.
Especially get rid of the "E128 continuation line under-indented for visual indent" which is new in later versions of the pep8 program.
-rw-r--r--screenplain/export/fdx.py5
-rw-r--r--screenplain/main.py6
-rw-r--r--tests/fountain_test.py1
-rw-r--r--tests/richstring_test.py14
4 files changed, 16 insertions, 10 deletions
diff --git a/screenplain/export/fdx.py b/screenplain/export/fdx.py
index f476468..0f92cf9 100644
--- a/screenplain/export/fdx.py
+++ b/screenplain/export/fdx.py
@@ -21,8 +21,9 @@ def _write_text_element(out, styles, text):
if style_value == '':
out.write(' <Text>%s</Text>\n' % (escape(text)))
else:
- out.write(' <Text Style="%s">%s</Text>\n' %
- (style_value, escape(text))
+ out.write(
+ ' <Text Style="%s">%s</Text>\n' %
+ (style_value, escape(text))
)
diff --git a/screenplain/main.py b/screenplain/main.py
index 720bf50..6def5af 100644
--- a/screenplain/main.py
+++ b/screenplain/main.py
@@ -36,8 +36,10 @@ def main(args):
parser.add_option(
'-f', '--format', dest='output_format',
metavar='FORMAT',
- help=('Set what kind of file to create. FORMAT can be one of '
- + ', '.join(output_formats))
+ help=(
+ 'Set what kind of file to create. FORMAT can be one of ' +
+ ', '.join(output_formats)
+ )
)
parser.add_option(
'--bare',
diff --git a/tests/fountain_test.py b/tests/fountain_test.py
index 02bb6be..ab3e9e7 100644
--- a/tests/fountain_test.py
+++ b/tests/fountain_test.py
@@ -133,6 +133,7 @@ class SectionTests(unittest2.TestCase):
Section(plain(u'second level'), 2, None),
], paras)
+
class DialogTests(unittest2.TestCase):
# A Character element is any line entirely in caps, with one empty
# line before it and without an empty line after it.
diff --git a/tests/richstring_test.py b/tests/richstring_test.py
index 5e5f7f5..65e1ea7 100644
--- a/tests/richstring_test.py
+++ b/tests/richstring_test.py
@@ -91,7 +91,8 @@ class RichStringTests(unittest2.TestCase):
class ParseEmphasisTests(unittest2.TestCase):
def test_parse_without_emphasis(self):
- self.assertEquals(plain('Hello'), parse_emphasis('Hello'),
+ self.assertEquals(
+ plain('Hello'), parse_emphasis('Hello'),
'Expected parse_emphasis to return a plain string')
def test_parse_bold(self):
@@ -174,11 +175,12 @@ class ParseEmphasisTests(unittest2.TestCase):
parse_emphasis(
'You can _underline_ words, make them **bold** or *italic* '
'or even ***bold italic.***'
- ),
- (plain('You can ') + underline('underline') +
- plain(' words, make them ') + bold('bold') + plain(' or ') +
- italic('italic') + plain(' or even ') +
- (bold + italic)('bold italic.'))
+ ), (
+ plain('You can ') + underline('underline') +
+ plain(' words, make them ') + bold('bold') + plain(' or ') +
+ italic('italic') + plain(' or even ') +
+ (bold + italic)('bold italic.')
+ )
)
def test_simplified_complicated(self):