[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4

[zach.ware]

http://hg.python.org/cpython/rev/a70cf4a35376
changeset:   90441:a70cf4a35376
parent:      90439:1baa02e1de82
parent:      90440:75419257fec3
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Apr 23 10:04:55 2014 -0500
summary:
  Merge from 3.4

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,7 +59,7 @@
   at the same time without losing the Popen.returncode value.
 
 - Issue #21127: Path objects can now be instantiated from str subclass
-  instances (such as numpy.str_).
+  instances (such as ``numpy.str_``).
 
 - Issue #15002: urllib.response object to use _TemporaryFileWrapper (and
   _TemporaryFileCloser) facility. Provides a better way to handle file

-- 
Repository URL: http://hg.python.org/cpython