diff -r 33528b9520e6 Lib/idlelib/config-main.def --- a/Lib/idlelib/config-main.def Mon Apr 07 19:34:33 2014 -0400 +++ b/Lib/idlelib/config-main.def Tue Apr 08 21:21:32 2014 +0530 @@ -59,7 +59,7 @@ encoding= none [FormatParagraph] -paragraph=70 +paragraph=72 [Indent] use-spaces= 1 diff -r 33528b9520e6 Lib/idlelib/idle_test/test_formatparagraph.py --- a/Lib/idlelib/idle_test/test_formatparagraph.py Mon Apr 07 19:34:33 2014 -0400 +++ b/Lib/idlelib/idle_test/test_formatparagraph.py Tue Apr 08 21:21:32 2014 +0530 @@ -75,9 +75,8 @@ comment = ( "\n" "# Comment block with whitespace line before and after\n" - "# Comment line\n" - "\n") - self.runcase(comment, 4, ('2.0', '4.0', '#', comment[1:70])) + "# Comment line\n") + self.runcase(comment, 4, ('2.0', '4.0', '#', comment[1:72])) comment = ( "\n" @@ -191,20 +190,20 @@ # reformat_comment formats to a minimum of 20 characters test_string = ( " \"\"\"this is a test of a reformat for a triple quoted string" - " will it reformat to less than 70 characters for me?\"\"\"") - result = fp.reformat_comment(test_string, 70, " ") + " will it reformat to less than 72 characters for me?\"\"\"") + result = fp.reformat_comment(test_string, 72, " ") expected = ( " \"\"\"this is a test of a reformat for a triple quoted string will it\n" - " reformat to less than 70 characters for me?\"\"\"") + " reformat to less than 72 characters for me?\"\"\"") Equal(result, expected) test_comment = ( "# this is a test of a reformat for a triple quoted string will " - "it reformat to less than 70 characters for me?") - result = fp.reformat_comment(test_comment, 70, "#") + "it reformat to less than 72 characters for me?") + result = fp.reformat_comment(test_comment, 72, "#") expected = ( "# this is a test of a reformat for a triple quoted string will it\n" - "# reformat to less than 70 characters for me?") + "# reformat to less than 72 characters for me?") Equal(result, expected) @@ -248,7 +247,7 @@ """ test_string = ( " '''this is a test of a reformat for a triple " - "quoted string will it reformat to less than 70 " + "quoted string will it reformat to less than 72 " "characters for me?'''\n") multiline_test_string = ( " '''The first line is under the max width.\n" @@ -298,7 +297,7 @@ # find function includes \n expected = ( " '''this is a test of a reformat for a triple quoted string will it\n" -" reformat to less than 70 characters for me?'''\n") # yes +" reformat to less than 72 characters for me?'''\n") #yes self.assertEqual(result, expected) text.delete('1.0', 'end') @@ -309,8 +308,8 @@ result = text.get('1.0', 'insert') # selection excludes \n expected = ( -" '''this is a test of a reformat for a triple quoted string will it reformat\n" -" to less than 70 characters for me?'''") # no +" '''this is a test of a reformat for a triple quoted string will it reformat to\n" +" less than 72 characters for me?'''") #no self.assertEqual(result, expected) text.delete('1.0', 'end') @@ -337,11 +336,11 @@ self.formatter('ParameterDoesNothing') result = text.get('1.0', 'insert') expected = ( -"# The first line is under the max width. The second line's length is\n" -"# way over the max width. It goes on and on until it is over 100\n" -"# characters long. Same thing with the third line. It is also way over\n" -"# the max width, but FormatParagraph will fix it. The fourth line is\n" -"# short like the first line.\n") +"# The first line is under the max width. The second line's length is way\n" +"# over the max width. It goes on and on until it is over 100 characters\n" +"# long. Same thing with the third line. It is also way over the max\n" +"# width, but FormatParagraph will fix it. The fourth line is short like\n" +"# the first line.\n") self.assertEqual(result, expected) text.delete('1.0', 'end') @@ -352,8 +351,8 @@ result = text.get('1.0', 'insert') expected = ( "# The first line is under the max width.\n" -"# The second line's length is way over the max width. It goes on and\n" -"# on until it is over 100 characters long.\n") +"# The second line's length is way over the max width. It goes on and on\n" +"# until it is over 100 characters long.\n") self.assertEqual(result, expected) text.delete('1.0', 'end')