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

[zach.ware]

https://hg.python.org/cpython/rev/344d57c521b9
changeset:   94770:344d57c521b9
parent:      94768:430cab0c5cbf
parent:      94769:d0e15d9cdd4b
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Feb 27 01:40:41 2015 -0600
summary:
  Merge with 3.4

files:
  Doc/library/stdtypes.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2880,8 +2880,8 @@
 .. method:: bytes.isupper()
             bytearray.isupper()
 
-   Return true if there is at least one lowercase alphabetic ASCII character
-   in the sequence and no uppercase ASCII characters, false otherwise.
+   Return true if there is at least one uppercase alphabetic ASCII character
+   in the sequence and no lowercase ASCII characters, false otherwise.
 
    For example::
 

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