Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83212 | florent.xicluna | 2010-07-28 18:39:41 +0200 (mer., 28 juil. 2010) | 2 lines

  Syntax cleanup.
........
  r83829 | florent.xicluna | 2010-08-08 18:16:07 +0200 (dim., 08 août 2010) | 2 lines

  Use unittest specific methods for some urllib test cases.  And replace urllib2 with urllib.request in comments.
........
  r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines

  Add test case for the HTTPResponse being an iterable.  Follow-up of issue #4608.
........
  r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines

  Typo.
........
  r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines

  Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
........
  r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line

  Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
........
  r84019 | florent.xicluna | 2010-08-14 17:56:42 +0200 (sam., 14 août 2010) | 11 lines

  Merged manually from 2.7 branch to 3.x trunk.

    ------------------------------------------------------------------------
    r79925 | nick.coghlan | 2010-04-10 16:24:36 +0200 (sam. 10 avril 2010)

    Try to turn some buildbots green by allowing test_multiprocessing to
    pass even if it hits the sys.exc_clear code in the threading module, and
    improve the test coverage by making the ctypes dependencies a bit more
    granular (two of the cited ctypes objects don't exist on my system)
    ------------------------------------------------------------------------
........
  r84025 | florent.xicluna | 2010-08-14 18:56:27 +0200 (sam., 14 août 2010) | 1 line

  List Misc/python-config.in in Misc/README.  Fix few typos.
........
  r84028 | florent.xicluna | 2010-08-14 19:02:49 +0200 (sam., 14 août 2010) | 1 line

  Fix order.
........
  r84032 | florent.xicluna | 2010-08-14 19:15:31 +0200 (sam., 14 août 2010) | 1 line

  Convert to spaces.
........
  r84036 | florent.xicluna | 2010-08-14 20:03:19 +0200 (sam., 14 août 2010) | 1 line

  Remove bad merge (from svnmerge r82301)
........

3 files changed, 65 insertions, 49 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index 230160a..478517b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -479,6 +479,8 @@ Build
 Tests
 -----
 
+- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
+
 - Issue #8857: Provide a test case for socket.getaddrinfo.
 
 - Issue #8433: Fix test_curses failure with newer versions of ncurses.
diff --git a/Misc/README b/Misc/README
index 8695b60..e7a59c7 100644
--- a/Misc/README
+++ b/Misc/README
@@ -7,34 +7,35 @@ documents are only of historic importance.
 Files found here
 ----------------
 
-ACKS		Acknowledgements
-AIX-NOTES	Notes for building Python on AIX
-build.sh	Script to build and test latest Python from the repository
-cheatsheet	Quick summary of Python by Ken Manheimer
-developers.txt	A history of who got developer permissions, and why
-gdbinit		Handy stuff to put in your .gdbinit file, if you use gdb
-HISTORY		News from previous releases -- oldest last
-indent.pro	GNU indent profile approximating my C style
-maintainers.txt	A list of maintainers for library modules
-NEWS		News for this release (for some meaning of "this")
-NEWS.help	How to edit NEWS
-Porting		Mini-FAQ on porting to new platforms
-PURIFY.README	Information for Purify users
-pymemcompat.h	Memory interface compatibility file.
-python.man	UNIX man page for the python interpreter
-python-mode.el	Emacs mode for editing Python programs
-python.pc.in	Package configuration info template for pkg-config
-python-wing.wpr Wing IDE project file
-README		The file you're reading now
-README.coverity	Information about running Coverity's Prevent on Python
-README.klocwork	Information about running Klocwork's K7 on Python
-README.OpenBSD	Help for building problems on OpenBSD
-README.valgrind	Information for Valgrind users, see valgrind-python.supp
-RFD		Request For Discussion about a Python newsgroup
-RPM		(Old) tools to build RPMs
-setuid-prog.c	C helper program for set-uid Python scripts
-SpecialBuilds.txt     Describes extra symbols you can set for debug builds
-TextMate	A TextMate bundle for Python development
-valgrind-python.supp  Valgrind suppression file, see README.valgrind
-vgrindefs	Python configuration for vgrind (a generic pretty printer)
-Vim		Python development utilities for the Vim editor
\ No newline at end of file
+ACKS                    Acknowledgements
+AIX-NOTES               Notes for building Python on AIX
+build.sh                Script to build and test latest Python from the repository
+cheatsheet              Quick summary of Python by Ken Manheimer
+developers.txt          A history of who got developer permissions, and why
+gdbinit                 Handy stuff to put in your .gdbinit file, if you use gdb
+HISTORY                 News from previous releases -- oldest last
+indent.pro              GNU indent profile approximating my C style
+maintainers.rst         A list of maintainers for library modules
+NEWS                    News for this release (for some meaning of "this")
+NEWS.help               How to edit NEWS
+Porting                 Mini-FAQ on porting to new platforms
+PURIFY.README           Information for Purify users
+pymemcompat.h           Memory interface compatibility file.
+python-config.in        Python script template for python-config
+python.man              UNIX man page for the python interpreter
+python-mode.el          Emacs mode for editing Python programs
+python.pc.in            Package configuration info template for pkg-config
+python-wing.wpr         Wing IDE project file
+README                  The file you're reading now
+README.coverity         Information about running Coverity's Prevent on Python
+README.klocwork         Information about running Klocwork's K7 on Python
+README.OpenBSD          Help for building problems on OpenBSD
+README.valgrind         Information for Valgrind users, see valgrind-python.supp
+RFD                     Request For Discussion about a Python newsgroup
+RPM                     (Old) tools to build RPMs
+setuid-prog.c           C helper program for set-uid Python scripts
+SpecialBuilds.txt       Describes extra symbols you can set for debug builds
+TextMate                A TextMate bundle for Python development
+valgrind-python.supp    Valgrind suppression file, see README.valgrind
+vgrindefs               Python configuration for vgrind (a generic pretty printer)
+Vim                     Python development utilities for the Vim editor
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index 3170818..e785610 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -11,6 +11,10 @@ final judgement on a feature or bug.  If no active maintainer is listed for
 a given module, then questionable changes should go to python-dev, while
 any other issues can and should be decided by any committer.
 
+Unless a name is followed by a '*', you should never assign an issue to
+that person, only make them nosy.  Names followed by a '*' may be assigned
+issues involving the module or topic for which the name has a '*'.
+
 The Platform and Interest Area tables list broader fields in which various
 people have expertise.  These people can also be contacted for help,
 opinions, and decisions when issues involve their areas.
@@ -21,8 +25,8 @@ in this list by placing the word 'inactive' in parenthesis behind their
 tracker id.  They are of course free to remove that inactive mark at
 any time.
 
-Committers should update this table as their areas of expertise widen.
-New topics may be added to the third table at will.
+Committers should update these tables as their areas of expertise widen.
+New topics may be added to the Interest Area table at will.
 
 The existence of this list is not meant to indicate that these people
 *must* be contacted for decisions; it is, rather, a resource to be used
@@ -85,10 +89,10 @@ dbm
 decimal             facundobatista, rhettinger, mark.dickinson
 difflib             tim_one
 dis
-distutils           tarek
+distutils           tarek*, eric.araujo*
 doctest             tim_one (inactive)
 dummy_threading     brett.cannon
-email               barry, r.david.murray
+email               barry, r.david.murray*
 encodings           lemburg, loewis
 errno
 exceptions
@@ -147,7 +151,7 @@ optparse            aronacher
 os                  loewis
 ossaudiodev
 parser
-pdb                 georg.brandl
+pdb                 georg.brandl*
 pickle              alexandre.vassalotti, pitrou
 pickletools         alexandre.vassalotti
 pipes
@@ -157,7 +161,8 @@ plistlib
 poplib
 posix
 pprint              fdrake
-pstats
+profile             georg.brandl
+pstats              georg.brandl
 pty
 pwd
 py_compile
@@ -167,7 +172,7 @@ pydoc
 queue               rhettinger
 quopri
 random              rhettinger
-re                  effbot (inactive), pitrou
+re                  effbot (inactive), pitrou, ezio.melotti
 readline
 reprlib
 resource
@@ -189,7 +194,7 @@ spwd
 sqlite3             ghaering
 ssl                 janssen, pitrou, giampaolo.rodola
 stat
-string
+string              georg.brandl*
 stringprep
 struct              mark.dickinson
 subprocess          astrand (inactive)
@@ -202,18 +207,18 @@ syslog              jafo
 tabnanny            tim_one
 tarfile             lars.gustaebel
 telnetlib
-tempfile
+tempfile            georg.brandl
 termios
 test
-textwrap
+textwrap            georg.brandl
 threading           pitrou
 time                alexander.belopolsky
-timeit
+timeit              georg.brandl
 tkinter             gpolo
 token               georg.brandl
 tokenize
 trace               alexander.belopolsky
-traceback           georg.brandl
+traceback           georg.brandl*
 tty
 turtle              gregorlingl
 types
@@ -226,14 +231,21 @@ warnings            brett.cannon
 wave
 weakref             fdrake, pitrou
 webbrowser          georg.brandl
-winreg
+winreg              brian.curtin
 winsound            effbot (inactive)
 wsgiref             pje
 xdrlib
-xml                 loewis
+xml.dom
+xml.dom.minidom
+xml.dom.pulldom
 xml.etree           effbot (inactive)
+xml.parsers.expat
+xml.sax
+xml.sax.handler
+xml.sax.saxutils
+xml.sax.xmlreader
 xmlrpc              loewis
-zipfile
+zipfile             alanmcintyre
 zipimport
 zlib
 ==================  ===========
@@ -243,6 +255,7 @@ zlib
 Tool                Maintainers
 ------------------  -----------
 pybench             lemburg
+==================  ===========
 
 
 ==================  ===========
@@ -268,6 +281,7 @@ algorithms
 ast/compiler        ncoghlan, benjamin.peterson, brett.cannon, georg.brandl
 autoconf/makefiles
 bsd
+bug tracker         ezio.melotti
 buildbots
 bytecode            pitrou
 data formats        mark.dickinson, georg.brandl
@@ -286,10 +300,9 @@ py3 transition      benjamin.peterson
 release management  tarek, lemburg, benjamin.peterson, barry, loewis,
                     gvanrossum, anthonybaxter
 str.format          eric.smith
+testing             michael.foord, pitrou, giampaolo.rodola
+threads             pitrou
 time and dates      lemburg
-testing             michael.foord, pitrou
-threads
-tracker
 unicode             lemburg, ezio.melotti, haypo
 version control
 ==================  ===========