Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py
new file mode 100755
index 0000000..0846d2a
--- /dev/null
+++ b/Doc/tools/rstlint.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Check for stylistic and formal issues in .rst and .py
+# files included in the documentation.
+#
+# 01/2009, Georg Brandl
+
+from __future__ import with_statement
+
+import os
+import re
+import sys
+import getopt
+import subprocess
+from os.path import join, splitext, abspath, exists
+from collections import defaultdict
+
+directives = [
+ # standard docutils ones
+ 'admonition', 'attention', 'caution', 'class', 'compound', 'container',
+ 'contents', 'csv-table', 'danger', 'date', 'default-role', 'epigraph',
+ 'error', 'figure', 'footer', 'header', 'highlights', 'hint', 'image',
+ 'important', 'include', 'line-block', 'list-table', 'meta', 'note',
+ 'parsed-literal', 'pull-quote', 'raw', 'replace',
+ 'restructuredtext-test-directive', 'role', 'rubric', 'sectnum', 'sidebar',
+ 'table', 'target-notes', 'tip', 'title', 'topic', 'unicode', 'warning',
+ # Sphinx custom ones
+ 'acks', 'attribute', 'autoattribute', 'autoclass', 'autodata',
+ 'autoexception', 'autofunction', 'automethod', 'automodule', 'centered',
+ 'cfunction', 'class', 'classmethod', 'cmacro', 'cmdoption', 'cmember',
+ 'code-block', 'confval', 'cssclass', 'ctype', 'currentmodule', 'cvar',
+ 'data', 'deprecated', 'describe', 'directive', 'doctest', 'envvar', 'event',
+ 'exception', 'function', 'glossary', 'highlight', 'highlightlang', 'index',
+ 'literalinclude', 'method', 'module', 'moduleauthor', 'productionlist',
+ 'program', 'role', 'sectionauthor', 'seealso', 'sourcecode', 'staticmethod',
+ 'tabularcolumns', 'testcode', 'testoutput', 'testsetup', 'toctree', 'todo',
+ 'todolist', 'versionadded', 'versionchanged'
+]
+
+all_directives = '(' + '|'.join(directives) + ')'
+seems_directive_re = re.compile(r'\.\. %s([^a-z:]|:(?!:))' % all_directives)
+default_role_re = re.compile(r'(^| )`\w([^`]*?\w)?`($| )')
+leaked_markup_re = re.compile(r'[a-z]::[^=]|:[a-z]+:|`|\.\.\s*\w+:')
+
+
+checkers = {}
+
+checker_props = {'severity': 1, 'falsepositives': False}
+
+def checker(*suffixes, **kwds):
+ """Decorator to register a function as a checker."""
+ def deco(func):
+ for suffix in suffixes:
+ checkers.setdefault(suffix, []).append(func)
+ for prop in checker_props:
+ setattr(func, prop, kwds.get(prop, checker_props[prop]))
+ return func
+ return deco
+
+
+@checker('.py', severity=4)
+def check_syntax(fn, lines):
+ """Check Python examples for valid syntax."""
+ try:
+ code = ''.join(lines)
+ if '\r' in code:
+ if os.name != 'nt':
+ yield 0, '\\r in code file'
+ code = code.replace('\r', '')
+ compile(code, fn, 'exec')
+ except SyntaxError, err:
+ yield err.lineno, 'not compilable: %s' % err
+
+
+@checker('.rst', severity=2)
+def check_suspicious_constructs(fn, lines):
+ """Check for suspicious reST constructs."""
+ inprod = False
+ for lno, line in enumerate(lines):
+ if seems_directive_re.match(line):
+ yield lno+1, 'comment seems to be intended as a directive'
+ if '.. productionlist::' in line:
+ inprod = True
+ elif not inprod and default_role_re.search(line):
+ yield lno+1, 'default role used'
+ elif inprod and not line.strip():
+ inprod = False
+
+
+@checker('.py', '.rst')
+def check_whitespace(fn, lines):
+ """Check for whitespace and line length issues."""
+ for lno, line in enumerate(lines):
+ if '\r' in line:
+ yield lno+1, '\\r in line'
+ if '\t' in line:
+ yield lno+1, 'OMG TABS!!!1'
+ if line[:-1].rstrip(' \t') != line[:-1]:
+ yield lno+1, 'trailing whitespace'
+
+
+@checker('.rst', severity=0)
+def check_line_length(fn, lines):
+ """Check for line length; this checker is not run by default."""
+ for lno, line in enumerate(lines):
+ if len(line) > 81:
+ # don't complain about tables, links and function signatures
+ if line.lstrip()[0] not in '+|' and \
+ 'http://' not in line and \
+ not line.lstrip().startswith(('.. function',
+ '.. method',
+ '.. cfunction')):
+ yield lno+1, "line too long"
+
+
+@checker('.html', severity=2, falsepositives=True)
+def check_leaked_markup(fn, lines):
+ """Check HTML files for leaked reST markup; this only works if
+ the HTML files have been built.
+ """
+ for lno, line in enumerate(lines):
+ if leaked_markup_re.search(line):
+ yield lno+1, 'possibly leaked markup: %r' % line
+
+
+def main(argv):
+ usage = '''\
+Usage: %s [-v] [-f] [-s sev] [-i path]* [path]
+
+Options: -v verbose (print all checked file names)
+ -f enable checkers that yield many false positives
+ -s sev only show problems with severity >= sev
+ -i path ignore subdir or file path
+''' % argv[0]
+ try:
+ gopts, args = getopt.getopt(argv[1:], 'vfs:i:')
+ except getopt.GetoptError:
+ print usage
+ return 2
+
+ verbose = False
+ severity = 1
+ ignore = []
+ falsepos = False
+ for opt, val in gopts:
+ if opt == '-v':
+ verbose = True
+ elif opt == '-f':
+ falsepos = True
+ elif opt == '-s':
+ severity = int(val)
+ elif opt == '-i':
+ ignore.append(abspath(val))
+
+ if len(args) == 0:
+ path = '.'
+ elif len(args) == 1:
+ path = args[0]
+ else:
+ print usage
+ return 2
+
+ if not exists(path):
+ print 'Error: path %s does not exist' % path
+ return 2
+
+ count = defaultdict(int)
+ out = sys.stdout
+
+ for root, dirs, files in os.walk(path):
+ # ignore subdirs controlled by svn
+ if '.svn' in dirs:
+ dirs.remove('.svn')
+
+ # ignore subdirs in ignore list
+ if abspath(root) in ignore:
+ del dirs[:]
+ continue
+
+ for fn in files:
+ fn = join(root, fn)
+ if fn[:2] == './':
+ fn = fn[2:]
+
+ # ignore files in ignore list
+ if abspath(fn) in ignore:
+ continue
+
+ ext = splitext(fn)[1]
+ checkerlist = checkers.get(ext, None)
+ if not checkerlist:
+ continue
+
+ if verbose:
+ print 'Checking %s...' % fn
+
+ try:
+ with open(fn, 'r') as f:
+ lines = list(f)
+ except (IOError, OSError), err:
+ print '%s: cannot open: %s' % (fn, err)
+ count[4] += 1
+ continue
+
+ for checker in checkerlist:
+ if checker.falsepositives and not falsepos:
+ continue
+ csev = checker.severity
+ if csev >= severity:
+ for lno, msg in checker(fn, lines):
+ print >>out, '[%d] %s:%d: %s' % (csev, fn, lno, msg)
+ count[csev] += 1
+ if verbose:
+ print
+ if not count:
+ if severity > 1:
+ print 'No problems with severity >= %d found.' % severity
+ else:
+ print 'No problems found.'
+ else:
+ for severity in sorted(count):
+ number = count[severity]
+ print '%d problem%s with severity %d found.' % \
+ (number, number > 1 and 's' or '', severity)
+ return int(bool(count))
+
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))