diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim index c1111c4e..354f5ec7 100644 --- a/ftplugin/python/pymode.vim +++ b/ftplugin/python/pymode.vim @@ -25,7 +25,7 @@ if pymode#Option('options') setlocal number endif setlocal nowrap - setlocal textwidth=79 + setlocal textwidth=99 setlocal commentstring=#%s endif diff --git a/pylibs/autopep8.py b/pylibs/autopep8.py index aa211dc4..dfb69aac 100644 --- a/pylibs/autopep8.py +++ b/pylibs/autopep8.py @@ -2000,7 +2000,7 @@ def parse_args(args): '(default: {0})'.format(DEFAULT_IGNORE)) parser.add_option('--select', metavar='errors', default='', help='fix only these errors/warnings (e.g. E4,W)') - parser.add_option('--max-line-length', metavar='n', default=79, type=int, + parser.add_option('--max-line-length', metavar='n', default=99, type=int, help='set maximum allowed line length ' '(default: %default)') options, args = parser.parse_args(args) diff --git a/pylibs/pylama/checkers/pep8.py b/pylibs/pylama/checkers/pep8.py index e0035b3d..91aba00c 100644 --- a/pylibs/pylama/checkers/pep8.py +++ b/pylibs/pylama/checkers/pep8.py @@ -71,7 +71,7 @@ os.path.expanduser('~/.config'), 'pep8') PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8') TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite') -MAX_LINE_LENGTH = 79 +MAX_LINE_LENGTH = 99 REPORT_FORMAT = { 'default': '%(path)s:%(row)d:%(col)d: %(code)s %(text)s', 'pylint': '%(path)s:%(row)d: [%(code)s] %(text)s', @@ -202,14 +202,7 @@ def missing_newline(physical_line): def maximum_line_length(physical_line, max_line_length): """ - Limit all lines to a maximum of 79 characters. - - There are still many devices around that are limited to 80 character - lines; plus, limiting windows to 80 characters makes it possible to have - several windows side-by-side. The default wrapping on such devices looks - ugly. Therefore, please limit all lines to a maximum of 79 characters. - For flowing long blocks of text (docstrings or comments), limiting the - length to 72 characters is recommended. + Limit all lines to a maximum of a certain number of characters. Reports error E501. """ diff --git a/pylibs/pylama/checkers/pylint/logilab/common/configuration.py b/pylibs/pylama/checkers/pylint/logilab/common/configuration.py index 2949f2c0..10022802 100644 --- a/pylibs/pylama/checkers/pylint/logilab/common/configuration.py +++ b/pylibs/pylama/checkers/pylint/logilab/common/configuration.py @@ -368,7 +368,7 @@ def ini_format(stream, options, encoding): value = format_option_value(optdict, value) help = optdict.get('help') if help: - help = normalize_text(help, line_len=79, indent='# ') + help = normalize_text(help, line_len=99, indent='# ') print >> stream print >> stream, _encode(help, encoding) else: @@ -387,14 +387,14 @@ def rest_format_section(stream, section, options, encoding=None, doc=None): if section: print >> stream, '%s\n%s' % (section, "'"*len(section)) if doc: - print >> stream, _encode(normalize_text(doc, line_len=79, indent=''), + print >> stream, _encode(normalize_text(doc, line_len=99, indent=''), encoding) print >> stream for optname, optdict, value in options: help = optdict.get('help') print >> stream, ':%s:' % optname if help: - help = normalize_text(help, line_len=79, indent=' ') + help = normalize_text(help, line_len=99, indent=' ') print >> stream, _encode(help, encoding) if value: value = _encode(format_option_value(optdict, value), encoding) diff --git a/pylibs/pymode/auto.py b/pylibs/pymode/auto.py index f353b832..11a0643e 100644 --- a/pylibs/pymode/auto.py +++ b/pylibs/pymode/auto.py @@ -9,7 +9,7 @@ class Options(): diff = False ignore = '' in_place = True - max_line_length = 79 + max_line_length = 99 pep8_passes = 100 recursive = False select = ''