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

Mon Jun 8 23:17:05 CEST 2015

https://hg.python.org/cpython/rev/98235f07e5ea
changeset: 96553:98235f07e5ea
branch: 3.5
parent: 96547:e4cde2f928fe
parent: 96552:2b78227974fa
user: Andrew Kuchling <amk at amk.ca>
date: Mon Jun 08 17:14:13 2015 -0400
summary:
 Merge from 3.4
files:
 Doc/tutorial/stdlib.rst | 31 +++++++++++++++++++++------
 Doc/tutorial/whatnow.rst | 16 +++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -140,6 +140,18 @@
 >>> random.randrange(6) # random integer chosen from range(6)
 4
 
+The :mod:`statistics` module calculates basic statistical properties
+(the mean, median, variance, etc.) of numeric data::
+
+ >>> import statistics
+ >>> data = [2.75, 1.75, 1.25, 0.25, 0.5, 1.25, 3.5]
+ >>> statistics.mean(data)
+ 1.6071428571428572
+ >>> statistics.median(data)
+ 1.25
+ >>> statistics.variance(data)
+ 1.3720238095238095
+
 The SciPy project <http://scipy.org> has many other modules for numerical
 computations.
 
@@ -311,13 +323,18 @@
 (including attachments) and for implementing internet encoding and header
 protocols.
 
-* The :mod:`xml.dom` and :mod:`xml.sax` packages provide robust support for
- parsing this popular data interchange format. Likewise, the :mod:`csv` module
- supports direct reads and writes in a common database format. Together, these
- modules and packages greatly simplify data interchange between Python
- applications and other tools.
+* The :mod:`json` package provides robust support for parsing this
+ popular data interchange format. The :mod:`csv` module supports
+ direct reading and writing of files in Comma-Separated Value format,
+ commonly supported by databases and spreadsheets. XML processing is
+ supported by the :mod:`xml.etree.ElementTree`, :mod:`xml.dom` and
+ :mod:`xml.sax` packages. Together, these modules and packages
+ greatly simplify data interchange between Python applications and
+ other tools.
+
+* The :mod:`sqlite3` module is a wrapper for the SQLite database
+ library, providing a persistent database that can be updated and
+ accessed using slightly nonstandard SQL syntax.
 
 * Internationalization is supported by a number of modules including
 :mod:`gettext`, :mod:`locale`, and the :mod:`codecs` package.
-
-
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -48,6 +48,9 @@
 Particularly notable contributions are collected in a book also titled Python
 Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.)
 
+* http://www.pyvideo.org collects links to Python-related videos from
+ conferences and user-group meetings.
+
 * http://scipy.org: The Scientific Python project includes modules for fast
 array computations and manipulations plus a host of packages for such
 things as linear algebra, Fourier transforms, non-linear solvers,
@@ -57,14 +60,11 @@
 :newsgroup:`comp.lang.python`, or send them to the mailing list at
 python-list at python.org. The newsgroup and mailing list are gatewayed, so
 messages posted to one will automatically be forwarded to the other. There are
-around 120 postings a day (with peaks up to several hundred), asking (and
+hundreds of postings a day, asking (and
 answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of :ref:`Frequently Asked Questions
-<faq-index>` (also called the FAQ).
 Mailing list archives are available at https://mail.python.org/pipermail/.
-The FAQ answers many of the questions that come up again and again,
-and may already contain the solution for your problem.
 
-.. Postings figure based on average of last six months activity as
- reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
- days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)
+Before posting, be sure to check the list of
+:ref:`Frequently Asked Questions <faq-index>` (also called the FAQ). The
+FAQ answers many of the questions that come up again and again, and may
+already contain the solution for your problem.
-- 
Repository URL: https://hg.python.org/cpython
