summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/FormatParagraph.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-12-16 08:21:54 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-12-16 08:21:54 (GMT)
commit7bc279c49fba2b9d59f47982658e46c5cd0e0f31 (patch)
treeb6a6c9b09dbfe3550e1b1c242b10d6125349fd67 /Lib/idlelib/FormatParagraph.py
parent03a144bb6ac3d7631a3bdb895e2a1f2d021fb08b (diff)
parentdf9386940a0104ba4dce1beee38848bc44a17036 (diff)
downloadcpython-7bc279c49fba2b9d59f47982658e46c5cd0e0f31.zip
cpython-7bc279c49fba2b9d59f47982658e46c5cd0e0f31.tar.gz
cpython-7bc279c49fba2b9d59f47982658e46c5cd0e0f31.tar.bz2
Merge with 3.4
Diffstat (limited to 'Lib/idlelib/FormatParagraph.py')
-rw-r--r--Lib/idlelib/FormatParagraph.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/idlelib/FormatParagraph.py b/Lib/idlelib/FormatParagraph.py
index 9b10c0a..7a9d185 100644
--- a/Lib/idlelib/FormatParagraph.py
+++ b/Lib/idlelib/FormatParagraph.py
@@ -44,9 +44,11 @@ class FormatParagraph:
The length limit parameter is for testing with a known value.
"""
- if limit == None:
+ if limit is None:
+ # The default length limit is that defined by pep8
limit = idleConf.GetOption(
- 'main', 'FormatParagraph', 'paragraph', type='int')
+ 'extensions', 'FormatParagraph', 'max-width',
+ type='int', default=72)
text = self.editwin.text
first, last = self.editwin.get_selection_indices()
if first and last: