Merge branch 'master' into feature/line-before-module-docstring
diff --git a/CHANGELOG b/CHANGELOG
index 0129ac7..e3cc518 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,10 +12,10 @@
- Introduce a new option of formatting multiline literals. Add
`SPLIT_BEFORE_CLOSING_BRACKET` knob to control whether closing bracket should
get their own line.
-- Add 'BLANK_LINES_AROUND_TOP_LEVEL_DEFINITION' knob to control the number
- of blank lines between top-level function and class definitions.
- Added `CONTINUATION_ALIGN_STYLE` knob to choose continuation alignment style
when `USE_TABS` is enabled.
+- Add 'BLANK_LINES_AROUND_TOP_LEVEL_DEFINITION' knob to control the number
+ of blank lines between top-level function and class definitions.
### Fixed
- Don't split ellipses.
diff --git a/yapftests/style_test.py b/yapftests/style_test.py
index 833efaf..7f4a465 100644
--- a/yapftests/style_test.py
+++ b/yapftests/style_test.py
@@ -37,8 +37,8 @@
'VALIGN-RIGHT')
with self.assertRaises(ValueError) as ctx:
style._ContinuationAlignStyleStringConverter('blahblah')
- self.assertIn(
- "unknown continuation align style: 'blahblah'", str(ctx.exception))
+ self.assertIn("unknown continuation align style: 'blahblah'",
+ str(ctx.exception))
def testStringListConverter(self):
self.assertEqual(style._StringListConverter('foo, bar'), ['foo', 'bar'])
