[Python-checkins] cpython (merge 3.4 -> default): Mostly-null-merge from 3.4 branch following 3.4.2 release.

[larry.hastings]

https://hg.python.org/cpython/rev/ab2ea07db612
changeset:   92875:ab2ea07db612
parent:      92868:1e1c6e306eb4
parent:      92874:e5e882f0d08f
user:        Larry Hastings <larry at hastings.org>
date:        Wed Oct 08 02:56:18 2014 -0700
summary:
  Mostly-null-merge from 3.4 branch following 3.4.2 release.

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


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -137,3 +137,4 @@
 c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1
 c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
 8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1
+ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1864,7 +1864,7 @@
    For example::
 
       >>> 'ab c\n\nde fg\rkl\r\n'.splitlines()
-      ['ab c', '', 'de fg', 'kl']``
+      ['ab c', '', 'de fg', 'kl']
       >>> 'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
       ['ab c\n', '\n', 'de fg\r', 'kl\r\n']
 
@@ -2932,7 +2932,7 @@
    For example::
 
       >>> b'ab c\n\nde fg\rkl\r\n'.splitlines()
-      [b'ab c', b'', b'de fg', b'kl']``
+      [b'ab c', b'', b'de fg', b'kl']
       >>> b'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
       [b'ab c\n', b'\n', b'de fg\r', b'kl\r\n']
 

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