Merge improvements to the suspicious builder and cleanup from 3.3.

diff --cc Doc/tools/sphinxext/susp-ignored.csv
index 96de6c5b0207898a76c86f13d59be34a2be8fb02,72c5255962dd5bd9dea7799f41cbe634221529fc..d951dadf01b21e3e96108c2a999ad2f8652d274f
--- 1/Doc/tools/sphinxext/susp-ignored.csv
--- 2/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@@ -219,47 -155,35 +155,28 @@@ library/multiprocessing,,:queue,">>> Qu
  library/multiprocessing,,`,# register the Foo class; make `f()` and `g()` accessible via proxy
  library/multiprocessing,,`,# register the Foo class; make `g()` and `_h()` accessible via proxy
  library/multiprocessing,,`,# register the generator function baz; use `GeneratorProxy` to make proxies
- library/multiprocessing,,`,`slots` is used to specify the number of slots for processes on
  library/nntplib,,:bytes,:bytes
- library/nntplib,,:bytes,"['xref', 'from', ':lines', ':bytes', 'references', 'date', 'message-id', 'subject']"
  library/nntplib,,:lines,:lines
- library/nntplib,,:lines,"['xref', 'from', ':lines', ':bytes', 'references', 'date', 'message-id', 'subject']"
  library/optparse,,:len,"del parser.rargs[:len(value)]"
  library/os.path,,:foo,c:foo
- library/parser,,`,"""Make a function that raises an argument to the exponent `exp`."""
  library/pdb,,:lineno,filename:lineno
- library/pdb,,:lineno,[filename:lineno | bpnumber [bpnumber ...]]
  library/pickle,,:memory,"conn = sqlite3.connect("":memory:"")"
  library/posix,,`,"CFLAGS=""`getconf LFS_CFLAGS`"" OPT=""-g -O2 $CFLAGS"""
 -library/pprint,209,::,"'classifiers': ['Development Status :: 4 - Beta',"
 -library/pprint,209,::,"'Intended Audience :: Developers',"
 -library/pprint,209,::,"'License :: OSI Approved :: MIT License',"
 -library/pprint,209,::,"'Natural Language :: English',"
 -library/pprint,209,::,"'Operating System :: OS Independent',"
 -library/pprint,209,::,"'Programming Language :: Python',"
 -library/pprint,209,::,"'Programming Language :: Python :: 2',"
 -library/pprint,209,::,"'Programming Language :: Python :: 2.6',"
 -library/pprint,209,::,"'Programming Language :: Python :: 2.7',"
 -library/pprint,209,::,"'Topic :: Software Development :: Libraries',"
 -library/pprint,209,::,"'Topic :: Software Development :: Libraries :: Python Modules'],"
 +library/pprint,,::,"'Programming Language :: Python :: 2 :: Only'],"
- library/pprint,209,::,"'classifiers': ['Development Status :: 4 - Beta',"
- library/pprint,209,::,"'Intended Audience :: Developers',"
- library/pprint,209,::,"'License :: OSI Approved :: MIT License',"
- library/pprint,209,::,"'Natural Language :: English',"
- library/pprint,209,::,"'Operating System :: OS Independent',"
- library/pprint,209,::,"'Programming Language :: Python',"
- library/pprint,209,::,"'Programming Language :: Python :: 2',"
- library/pprint,209,::,"'Programming Language :: Python :: 2.6',"
- library/pprint,209,::,"'Programming Language :: Python :: 2.7',"
- library/pprint,209,::,"'Topic :: Software Development :: Libraries',"
- library/pprint,209,::,"'Topic :: Software Development :: Libraries :: Python Modules'],"
++library/pprint,,::,"'Programming Language :: Python :: 2.6',"
++library/pprint,,::,"'Programming Language :: Python :: 2.7',"
  library/profile,,:lineno,filename:lineno(function)
- library/profile,,:lineno,ncalls  tottime  percall  cumtime  percall filename:lineno(function)
- library/profile,,:lineno,"(sort by filename:lineno),"
  library/pyexpat,,:elem1,<py:elem1 />
  library/pyexpat,,:py,"xmlns:py = ""http://www.python.org/ns/"">"
- library/repr,,`,"return `obj`"
- library/smtplib,,:port,"as well as a regular host:port server."
  library/smtplib,,:port,method must support that as well as a regular host:port
  library/socket,,::,"(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]"
  library/socket,,::,'5aef:2b::8'
  library/socket,,:can,"return (can_id, can_dlc, data[:can_dlc])"
  library/socket,,:len,fds.fromstring(cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
  library/sqlite3,,:age,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})"
- library/sqlite3,,:age,"select name_last, age from people where name_last=:who and age=:age"
  library/sqlite3,,:memory,
  library/sqlite3,,:who,"cur.execute(""select * from people where name_last=:who and age=:age"", {""who"": who, ""age"": age})"
 +library/sqlite3,,:path,"db = sqlite3.connect('file:path/to/database?mode=ro', uri=True)"
  library/ssl,,:My,"Organizational Unit Name (eg, section) []:My Group"
  library/ssl,,:My,"Organization Name (eg, company) [Internet Widgits Pty Ltd]:My Organization, Inc."
  library/ssl,,:myserver,"Common Name (eg, YOUR name) []:myserver.mygroup.myorganization.com"