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

[berker.peksag]

https://hg.python.org/cpython/rev/5e24a791303b
changeset:   102023:5e24a791303b
parent:      102020:d1c0bc1d0625
parent:      102022:e02298f48b49
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Jun 14 12:51:28 2016 +0300
summary:
  Merge from 3.5

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


diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -489,10 +489,6 @@
       :mod:`sqlite3` module will return Unicode objects for ``TEXT``. If you want to
       return bytestrings instead, you can set it to :class:`bytes`.
 
-      For efficiency reasons, there's also a way to return :class:`str` objects
-      only for non-ASCII data, and :class:`bytes` otherwise. To activate it, set
-      this attribute to :const:`sqlite3.OptimizedUnicode`.
-
       You can also set it to any other callable that accepts a single bytestring
       parameter and returns the resulting object.
 

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