diff options
| author | Larry Hastings <larry@hastings.org> | 2014-03-17 06:01:31 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-03-17 06:01:31 (GMT) |
| commit | 8dc931037b472931f2a96b8525bced6d6d0dc791 (patch) | |
| tree | 61f67707d6b30ae9443b92f3bb0dc41d9aaaefc4 /Doc | |
| parent | 2221f666eba4a6f46f2095a801bc3e4bdbdb97d2 (diff) | |
| parent | 3c5c56f3c068bc13daea2275b951113b43a91e85 (diff) | |
| download | cpython-8dc931037b472931f2a96b8525bced6d6d0dc791.zip cpython-8dc931037b472931f2a96b8525bced6d6d0dc791.tar.gz cpython-8dc931037b472931f2a96b8525bced6d6d0dc791.tar.bz2 | |
Merge from 3.4 into default.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/license.rst | 6 | ||||
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 08e5464..6190fe0 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -84,9 +84,9 @@ Terms and conditions for accessing or otherwise using Python analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights - Reserved" are retained in Python |release| alone or in any derivative version - prepared by Licensee. + copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All + Rights Reserved" are retained in Python |release| alone or in any derivative + version prepared by Licensee. #. In the event Licensee prepares a derivative work that is based on or incorporates Python |release| or any part thereof, and wants to make the diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 9cf51bd..1b751b0 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -61,10 +61,7 @@ while :ref:`~mod.attr` will display as ``attr``. This article explains the new features in Python 3.4, compared to 3.3. - -.. Python 3.4 was released on TBD. - -For full details, see the +Python 3.4 was released on March 16, 2014. For full details, see the `changelog <http://docs.python.org/3.4/whatsnew/changelog.html>`_. @@ -2284,7 +2281,7 @@ Changes in the Python API name, they now set it to an empty list. The previous behavior could cause the import system to do the wrong thing on submodule imports if there was also a directory with the same name as the frozen package. The correct way - to determine if a module is a package or not is to use``hasattr(module, + to determine if a module is a package or not is to use ``hasattr(module, '__path__')`` (:issue:`18065`). * Frozen modules no longer define a ``__file__`` attribute. It's semantically |