merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 10:27:06 +01:00
commit 794e9bf1fe
41 changed files with 145 additions and 164 deletions

View file

@ -38,12 +38,12 @@ More Python resources:
* https://docs.python.org: Fast access to Python's documentation.
* https://pypi.python.org: The Python Package Index, previously also nicknamed
* https://pypi.python.org/pypi: The Python Package Index, previously also nicknamed
the Cheese Shop, is an index of user-created Python modules that are available
for download. Once you begin releasing code, you can register it here so that
others can find it.
* http://aspn.activestate.com/ASPN/Python/Cookbook/: The Python Cookbook is a
* http://code.activestate.com/recipes/langs/python/: The Python Cookbook is a
sizable collection of code examples, larger modules, and useful scripts.
Particularly notable contributions are collected in a book also titled Python
Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.)