diff -r 174c30103b57 Lib/idlelib/FormatParagraph.py --- a/Lib/idlelib/FormatParagraph.py Sat Jun 14 09:27:10 2014 +0100 +++ b/Lib/idlelib/FormatParagraph.py Sat Jun 14 20:25:51 2014 +0300 @@ -44,9 +44,11 @@ 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: diff -r 174c30103b57 Lib/idlelib/config-extensions.def --- a/Lib/idlelib/config-extensions.def Sat Jun 14 09:27:10 2014 +0100 +++ b/Lib/idlelib/config-extensions.def Sat Jun 14 20:25:51 2014 +0300 @@ -31,6 +31,7 @@ [FormatParagraph] enable=1 +max-width=72 [FormatParagraph_cfgBindings] format-paragraph= diff -r 174c30103b57 Lib/idlelib/config-main.def --- a/Lib/idlelib/config-main.def Sat Jun 14 09:27:10 2014 +0100 +++ b/Lib/idlelib/config-main.def Sat Jun 14 20:25:51 2014 +0300 @@ -58,9 +58,6 @@ font-bold= 0 encoding= none -[FormatParagraph] -paragraph=72 - [Indent] use-spaces= 1 num-spaces= 4 diff -r 174c30103b57 Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py Sat Jun 14 09:27:10 2014 +0100 +++ b/Lib/idlelib/configDialog.py Sat Jun 14 20:25:51 2014 +0300 @@ -337,7 +337,6 @@ #tkVars self.winWidth=StringVar(self) self.winHeight=StringVar(self) - self.paraWidth=StringVar(self) self.startupEdit=IntVar(self) self.autoSave=IntVar(self) self.encoding=StringVar(self) @@ -352,7 +351,6 @@ frameSave=LabelFrame(frame,borderwidth=2,relief=GROOVE, text=' Autosave Preferences ') frameWinSize=Frame(frame,borderwidth=2,relief=GROOVE) - frameParaSize=Frame(frame,borderwidth=2,relief=GROOVE) frameHelp=LabelFrame(frame,borderwidth=2,relief=GROOVE, text=' Additional Help Sources ') #frameRun @@ -376,11 +374,6 @@ labelWinHeightTitle=Label(frameWinSize,text='Height') entryWinHeight=Entry(frameWinSize,textvariable=self.winHeight, width=3) - #paragraphFormatWidth - labelParaWidthTitle=Label(frameParaSize,text='Paragraph reformat'+ - ' width (in characters)') - entryParaWidth=Entry(frameParaSize,textvariable=self.paraWidth, - width=3) #frameHelp frameHelpList=Frame(frameHelp) frameHelpListButtons=Frame(frameHelpList) @@ -401,7 +394,6 @@ frameRun.pack(side=TOP,padx=5,pady=5,fill=X) frameSave.pack(side=TOP,padx=5,pady=5,fill=X) frameWinSize.pack(side=TOP,padx=5,pady=5,fill=X) - frameParaSize.pack(side=TOP,padx=5,pady=5,fill=X) frameHelp.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) #frameRun labelRunChoiceTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) @@ -417,9 +409,6 @@ labelWinHeightTitle.pack(side=RIGHT,anchor=E,pady=5) entryWinWidth.pack(side=RIGHT,anchor=E,padx=10,pady=5) labelWinWidthTitle.pack(side=RIGHT,anchor=E,pady=5) - #paragraphFormatWidth - labelParaWidthTitle.pack(side=LEFT,anchor=W,padx=5,pady=5) - entryParaWidth.pack(side=RIGHT,anchor=E,padx=10,pady=5) #frameHelp frameHelpListButtons.pack(side=RIGHT,padx=5,pady=5,fill=Y) frameHelpList.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH) @@ -446,7 +435,6 @@ self.keysAreBuiltin.trace_variable('w',self.VarChanged_keysAreBuiltin) self.winWidth.trace_variable('w',self.VarChanged_winWidth) self.winHeight.trace_variable('w',self.VarChanged_winHeight) - self.paraWidth.trace_variable('w',self.VarChanged_paraWidth) self.startupEdit.trace_variable('w',self.VarChanged_startupEdit) self.autoSave.trace_variable('w',self.VarChanged_autoSave) self.encoding.trace_variable('w',self.VarChanged_encoding) @@ -531,10 +519,6 @@ value=self.winHeight.get() self.AddChangedItem('main','EditorWindow','height',value) - def VarChanged_paraWidth(self,*params): - value=self.paraWidth.get() - self.AddChangedItem('main','FormatParagraph','paragraph',value) - def VarChanged_startupEdit(self,*params): value=self.startupEdit.get() self.AddChangedItem('main','General','editor-on-startup',value) @@ -1032,9 +1016,6 @@ type='int')) self.winHeight.set(idleConf.GetOption('main','EditorWindow','height', type='int')) - #initial paragraph reformat size - self.paraWidth.set(idleConf.GetOption('main','FormatParagraph','paragraph', - type='int')) # default source encoding self.encoding.set(idleConf.GetOption('main', 'EditorWindow', 'encoding', default='none'))