From 0fd1b7a9ab9f13ac6f1aa6eb7600af8f42779198 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 3 Aug 2013 19:12:18 -0700
Subject: [PATCH 0001/1016] Use code tags where needed.
---
docs/writing/tests.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/writing/tests.rst b/docs/writing/tests.rst
index a5ac785d0..43504cdaf 100644
--- a/docs/writing/tests.rst
+++ b/docs/writing/tests.rst
@@ -16,7 +16,7 @@ Some general rules of testing:
alone, and also within the test suite, regardless of the order they are called.
The implication of this rule is that each test must be loaded with a fresh
dataset and may have to do some cleanup afterwards. This is usually
- handled by `setUp()` and `tearDown()` methods.
+ handled by ``setUp()`` and ``tearDown()`` methods.
- Try hard to make tests that run fast. If one single test needs more than a
few millisecond to run, development will be slowed down or the tests will not
From 88fccb1b4d79e7dc4a167931bdfd9e7e61c1babd Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 3 Aug 2013 19:18:16 -0700
Subject: [PATCH 0002/1016] Use code tags where needed.
---
docs/writing/structure.rst | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/writing/structure.rst b/docs/writing/structure.rst
index 465097bfb..3ec2cf1b7 100644
--- a/docs/writing/structure.rst
+++ b/docs/writing/structure.rst
@@ -83,7 +83,7 @@ while another would handle low-level manipulation of data. The most natural way
to separate these two layers is to regroup all interfacing functionality
in one file, and all low-level operations in another file. In this case,
the interface file needs to import the low-level file. This is done with the
-`import` and `from ... import` statements.
+``import`` and ``from ... import`` statements.
As soon as you use `import` statements you use modules. These can be either built-in
modules such as `os` and `sys`, third-party modules you have installed in your
@@ -106,7 +106,7 @@ Aside for some naming restrictions, nothing special is required for a Python fil
to be a module, but the import mechanism needs to be understood in order to use
this concept properly and avoid some issues.
-Concretely, the `import modu` statement will look for the proper file, which is
+Concretely, the ``import modu`` statement will look for the proper file, which is
`modu.py` in the same directory as the caller if it exists. If it is not
found, the Python interpreter will search for `modu.py` in the "path"
recursively and raise an ImportError exception if it is not found.
@@ -120,20 +120,20 @@ Then, the module's variables, functions, and classes will be available to the ca
through the module's namespace, a central concept in programming that is
particularly helpful and powerful in Python.
-In many languages, an `include file` directive is used by the preprocessor to
+In many languages, an ``include file`` directive is used by the preprocessor to
take all code found in the file and 'copy' it into the caller's code. It is
different in Python: the included code is isolated in a module namespace, which
means that you generally don't have to worry that the included code could have
unwanted effects, e.g. override an existing function with the same name.
It is possible to simulate the more standard behavior by using a special syntax
-of the import statement: `from modu import *`. This is generally considered bad
-practice. **Using `import *` makes code harder to read and makes dependencies less
+of the import statement: ``from modu import *``. This is generally considered bad
+practice. **Using ``import *`` makes code harder to read and makes dependencies less
compartmentalized**.
-Using `from modu import func` is a way to pinpoint the function you want to
-import and put it in the global namespace. While much less harmful than `import
-*` because it shows explicitly what is imported in the global namespace, its
+Using ``from modu import func`` is a way to pinpoint the function you want to
+import and put it in the global namespace. While much less harmful than ``import
+*`` because it shows explicitly what is imported in the global namespace, its
advantage over a simpler `import modu` is only that it will save some typing.
**Very bad**
@@ -166,7 +166,7 @@ Python. Readability means to avoid useless boilerplate text and clutter,
therefore some efforts are spent trying to achieve a certain level of brevity.
But terseness and obscurity are the limits where brevity should stop. Being
able to tell immediately where a class or function comes from, as in the
-`modu.func` idiom, greatly improves code readability and understandability in
+``modu.func`` idiom, greatly improves code readability and understandability in
all but the simplest single file projects.
From 8e952f0af678322a2cb044e105e21122bd0a7ac9 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 3 Aug 2013 19:26:41 -0700
Subject: [PATCH 0003/1016] Wrap lines to 78 char.
---
docs/scenarios/cli.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/scenarios/cli.rst b/docs/scenarios/cli.rst
index 2416125f7..546eae017 100644
--- a/docs/scenarios/cli.rst
+++ b/docs/scenarios/cli.rst
@@ -11,4 +11,6 @@ Clint
docopt
------
-`docopt `_ is a lightweight, highly Pythonic package that allows creating command line interfaces easily and intuitively, by parsing POSIX-style usage instructions.
+`docopt `_ is a lightweight, highly Pythonic package that
+allows creating command line interfaces easily and intuitively, by parsing
+POSIX-style usage instructions.
\ No newline at end of file
From 13d99d95fe31b76d350ca74ae5163aaf73704c19 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 3 Aug 2013 19:28:48 -0700
Subject: [PATCH 0004/1016] Let Sphinx link to Python documentation.
Instead of directly linking to the relevant passages.
---
docs/writing/gotchas.rst | 8 ++++----
docs/writing/structure.rst | 11 ++++++-----
docs/writing/style.rst | 23 ++++++++++-------------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/docs/writing/gotchas.rst b/docs/writing/gotchas.rst
index d96d3d848..98bfd2c47 100644
--- a/docs/writing/gotchas.rst
+++ b/docs/writing/gotchas.rst
@@ -65,7 +65,7 @@ What You Should Do Instead
~~~~~~~~~~~~~~~~~~~~~~~~~~
Create a new object each time the function is called, by using a default arg to
-signal that no argument was provided (``None`` is often a good choice).
+signal that no argument was provided (:py:data:`None` is often a good choice).
.. code-block:: python
@@ -137,9 +137,9 @@ is looked up in the surrounding scope at call time. By then, the loop has
completed and ``i`` is left with its final value of 4.
What's particularly nasty about this gotcha is the seemingly prevalent
-misinformation that this has something to do with ``lambda``\s in Python.
-Functions created with a ``lambda`` expression are in no way special, and in
-fact the same exact behavior is exhibited by just using an ordinary ``def``:
+misinformation that this has something to do with :ref:`lambdas `
+in Python. Functions created with a ``lambda`` expression are in no way special,
+and in fact the same exact behavior is exhibited by just using an ordinary ``def``:
.. code-block:: python
diff --git a/docs/writing/structure.rst b/docs/writing/structure.rst
index 3ec2cf1b7..9bb685c6b 100644
--- a/docs/writing/structure.rst
+++ b/docs/writing/structure.rst
@@ -383,7 +383,7 @@ Python has two kinds of built-in or user-defined types.
Mutable types are those that allow in-place modification
of the content. Typical mutables are lists and dictionaries:
-All lists have mutating methods, like ``append()`` or ``pop()``, and
+All lists have mutating methods, like :py:meth:`list.append` or :py:meth:`list.pop`, and
can be modified in place. The same goes for dictionaries.
Immutable types provide no method for changing their content.
@@ -464,10 +464,11 @@ should be your preferred method.
foo = ''.join([foo, 'ooo'])
.. note::
- You can also use the ``%`` formatting operator to concatenate the
- pre-determined number of strings besides ``join()`` and ``+``. However,
- according to :pep:`3101`, the ``%`` operator became deprecated in
- Python 3.1 and will be replaced by the ``format()`` method in the later versions.
+ You can also use the :ref:`% ` formatting operator
+ to concatenate a pre-determined number of strings besides :py:meth:`str.join`
+ and ``+``. However, according to :pep:`3101`, the ``%`` operator became
+ deprecated in Python 3.1 and will be replaced by the :py:meth:`str.format`
+ method in the later versions.
.. code-block:: python
diff --git a/docs/writing/style.rst b/docs/writing/style.rst
index 49004592f..57a814eed 100644
--- a/docs/writing/style.rst
+++ b/docs/writing/style.rst
@@ -335,7 +335,7 @@ Instead, use a list comprehension:
four_lists = [[] for __ in xrange(4)]
-A common idiom for creating strings is to use `join `_ on an empty string.::
+A common idiom for creating strings is to use :py:meth:`str.join` on an empty string.::
letters = ['s', 'p', 'a', 'm']
word = ''.join(letters)
@@ -433,7 +433,7 @@ Check if variable equals a constant
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You don't need to explicitly compare a value to True, or None, or 0 - you can
-just add it to the if statement. See `Truth Value Testing
+just add it to the if statement. See :ref:`Truth Value Testing
`_ for a
list of what is considered false.
@@ -466,8 +466,8 @@ list of what is considered false.
Access a Dictionary Element
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Don't use the ``has_key`` function. Instead use ``x in d`` syntax, or pass
-a default argument to ``get``.
+Don't use the :py:meth:`dict.has_key` method. Instead, use ``x in d`` syntax,
+or pass a default argument to :py:meth:`dict.get`.
**Bad**:
@@ -497,10 +497,9 @@ Short Ways to Manipulate Lists
`List comprehensions
`_
-provide a powerful, concise way to work with lists. Also, the `map
-`_ and `filter
-`_ functions can perform
-operations on lists using a different concise syntax.
+provide a powerful, concise way to work with lists. Also, the :py:func:`map`
+:py:func:`filter` functions can perform operations on lists using a different,
+more concise syntax.
**Bad**:
@@ -540,8 +539,7 @@ operations on lists using a different concise syntax.
# Or:
a = map(lambda i: i + 3, a)
-Use `enumerate `_ to
-keep a count of your place in the list.
+Use :py:func:`enumerate` keep a count of your place in the list.
.. code-block:: python
@@ -552,9 +550,8 @@ keep a count of your place in the list.
# 1 4
# 2 5
-The ``enumerate`` function has better readability than handling a counter
-manually. Moreover,
-it is better optimized for iterators.
+The :py:func:`enumerate` function has better readability than handling a
+counter manually. Moreover, it is better optimized for iterators.
Read From a File
~~~~~~~~~~~~~~~~
From 2c2f25dc1c526b50a9da1dfd7ad6551433066dd7 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 3 Aug 2013 19:36:50 -0700
Subject: [PATCH 0005/1016] Don't use direct links if it can be helped.
---
docs/dev/env.rst | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/docs/dev/env.rst b/docs/dev/env.rst
index 7d43991ab..81da462b0 100644
--- a/docs/dev/env.rst
+++ b/docs/dev/env.rst
@@ -286,12 +286,11 @@ Other Tools
IDLE
----
-`IDLE `_ is an integrated
-development environment that is part of Python standard library. It is
-completely written in Python and uses the Tkinter GUI toolkit. Though IDLE
-is not suited for full-blown development using Python, it is quite
-helpful to try out small Python snippets and experiment with different
-features in Python.
+:ref:`IDLE ` is an integrated development environment that is
+part of Python standard library. It is completely written in Python and uses
+the Tkinter GUI toolkit. Though IDLE is not suited for full-blown development
+using Python, it is quite helpful to try out small Python snippets and
+experiment with different features in Python.
It provides the following features:
From 6bba87adf15af6e6f6c0c0cb70db9996084cf480 Mon Sep 17 00:00:00 2001
From: Ben Marshall-Corser
Date: Tue, 6 Aug 2013 01:55:07 +0100
Subject: [PATCH 0006/1016] New installs of Python through Homebrew come with
pip :)
---
docs/starting/install/osx.rst | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst
index 6d2a156f2..0711b1928 100644
--- a/docs/starting/install/osx.rst
+++ b/docs/starting/install/osx.rst
@@ -77,18 +77,11 @@ extends the packaging and installation facilities provided by the distutils
in the standard library. Once you add Distribute to your Python system you can
download and install any compliant Python software product with a single
command. It also enables you to add this network installation capability to
-your own Python software with very little work.
+your own Python software with very little work. Homebrew already installed
+Distribute for you.
-Homebrew already installed Distribute for you. Its ``easy_install`` command is
-considered by many to be deprecated, so we will install its replacement:
-**pip**. Pip allows for uninstallation of packages, and is actively maintained,
-unlike easy_install.
-
-To install pip, simply open a command prompt and run
-
-.. code-block:: console
-
- $ easy_install pip
+Happily, when you ran `brew install python`, Homebrew also installed **pip**.
+Pip allows for uninstallation of packages, and is actively maintained.
Virtualenv
@@ -127,6 +120,9 @@ environment. Put your own code within a subdirectory of the environment,
however you wish. When you no longer need a particular environment, simply
copy your code out of it, and then delete the main directory for the environment.
+An useful set of extensions to virtualenv is available in virtualenvwrapper,
+`RTFD `_ to find out more.
+
--------------------------------
From 51a727d0791de0afc6627da1bda02b6b59498918 Mon Sep 17 00:00:00 2001
From: claudejrogers
Date: Sun, 11 Aug 2013 20:35:30 -0700
Subject: [PATCH 0007/1016] Update "Late Binding Closures" section of
gotchas.rst
The late binding closure example seems like a good use case for the
functools.partial function.
---
docs/writing/gotchas.rst | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/docs/writing/gotchas.rst b/docs/writing/gotchas.rst
index 98bfd2c47..12e18619e 100644
--- a/docs/writing/gotchas.rst
+++ b/docs/writing/gotchas.rst
@@ -166,6 +166,16 @@ its arguments by using a default arg like so:
def create_multipliers():
return [lambda x, i=i : i * x for i in range(5)]
+Alternatively, you can use the functools.partial function:
+
+.. code-block:: python
+
+ from functools import partial
+ from operator import mul
+
+ def create_multipliers():
+ return [partial(mul, i) for i in range(5)]
+
When the Gotcha Isn't a Gotcha
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
From c666597a73b05f2656d1737de7b9f8ef4794cc11 Mon Sep 17 00:00:00 2001
From: Duta
Date: Mon, 12 Aug 2013 12:44:37 +0100
Subject: [PATCH 0008/1016] Update style.rst
---
docs/writing/style.rst | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/writing/style.rst b/docs/writing/style.rst
index 57a814eed..e48956a2e 100644
--- a/docs/writing/style.rst
+++ b/docs/writing/style.rst
@@ -516,6 +516,7 @@ more concise syntax.
.. code-block:: python
+ a = [3, 4, 5]
b = [i for i in a if i > 4]
b = filter(lambda x: x > 4, a)
@@ -525,10 +526,8 @@ more concise syntax.
# Add three to all list members.
a = [3, 4, 5]
- count = 0
- for i in a:
- a[count] = i + 3
- count = count + 1
+ for i in range(len(a)):
+ a[i] += 3
**Good**:
From 18c3e05e26cdd245a95013cbceb3eb613cb8373f Mon Sep 17 00:00:00 2001
From: Duta
Date: Mon, 12 Aug 2013 13:31:18 +0100
Subject: [PATCH 0009/1016] Minor wording correction and changed some
code-block tags to be python
---
docs/writing/tests.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/writing/tests.rst b/docs/writing/tests.rst
index 43504cdaf..4e8749161 100644
--- a/docs/writing/tests.rst
+++ b/docs/writing/tests.rst
@@ -44,7 +44,7 @@ Some general rules of testing:
- The first step when you are debugging your code is to write a new test
pinpointing the bug. While it is not always possible to do, those bug
- catching test are among the most valuable piece of code in your project.
+ catching test are among the most valuable pieces of code in your project.
- Use long and descriptive names for testing functions. The style guide here is
slightly different than that of running code, where short names are often
@@ -150,7 +150,7 @@ Despite being a fully-featured and extensible test tool, it boasts a simple
syntax. Creating a test suite is as easy as writing a module with a couple of
functions
-.. code-block:: console
+.. code-block:: python
# content of test_sample.py
def func(x):
@@ -181,8 +181,8 @@ and then running the `py.test` command
test_sample.py:5: AssertionError
========================= 1 failed in 0.02 seconds =========================
-far less work than would be required for the equivalent functionality with the
-unittest module!
+is far less work than would be required for the equivalent functionality with
+the unittest module!
`py.test `_
@@ -262,7 +262,7 @@ make assertions about how they have been used.
For example, you can monkey patch a method
-.. code-block:: console
+.. code-block:: python
from mock import MagicMock
thing = ProductionClass()
@@ -275,7 +275,7 @@ To mock classes or objects in a module under test, use the ``patch`` decorator.
In the example below, an external search system is replaced with a mock that
always returns the same result (but only for the duration of the test).
-.. code-block:: console
+.. code-block:: python
def mock_search(self):
class MockSearchQuerySet(SearchQuerySet):
From 2996f04c7e9ed20bef7c2e14526808c7f42fd1ce Mon Sep 17 00:00:00 2001
From: ugurthemaster
Date: Thu, 15 Aug 2013 13:53:24 +0300
Subject: [PATCH 0010/1016] Update learning.rst
Python books for Engineers and Scientists have been added.
---
docs/intro/learning.rst | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 4703f4cb3..63d6d04fb 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -123,6 +123,26 @@ guide to the language.
`The Python Tutorial `_
+For Engineers and Scientists
+----------------------------
+
+A Primer on Scientific Programming with Python
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A Primer on Scientific Programming with Python, written by Hans Petter Langtangen,
+mainly covers python's usage in scientific field. In the book, examples are
+choosen from mathematics and the natural sciences.
+
+ `A Primer on Scientific Programming with Python `_
+
+Numerical Methods in Engineering with Python
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
+emphasis on numerical methods and how to implement them in python.
+
+ `Numerical Methods in Engineering with Python `_
+
References
----------
From cace09f5dec298cc59b82b2b56a2e9a491f43e53 Mon Sep 17 00:00:00 2001
From: Nicolas Louveton
Date: Sun, 18 Aug 2013 14:09:30 +0200
Subject: [PATCH 0011/1016] Add some package tools for statistical computing
Add IPython as tool for reproducible science
Add Pandas and Rpy2 as relevant tool for those interested in statistics
with Python
---
docs/scenarios/scientific.rst | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst
index 7f9a66cb3..1471e52a3 100644
--- a/docs/scenarios/scientific.rst
+++ b/docs/scenarios/scientific.rst
@@ -17,6 +17,22 @@ of the Python guide. However, a comprehensive introduction to the scientific
Python ecosystem can be found in the `Python Scientific Lecture Notes
`_
+
+Tools
+:::::
+
+IPython
+-------
+
+`IPytthon `_ is an enhanced version of Python interpreter.
+The features it provides are of great interest for the scientists. The `inline mode`
+allow graphics and plots to be displayed in the terminal (Qt based version).
+Moreover the `notebook` mode supports literate programming and reproducible science
+generating a web-based python notebook. This notebook allowing to store chunk of
+Python code along side to the results and additional comments (HTML, LaTeX, Markdown).
+The notebook could be shared and exported in various file formats.
+
+
Libraries
:::::::::
@@ -63,6 +79,23 @@ users to Python. Many examples, along with the source code to re-create them,
can be browsed at the `matplotlib gallery
`_.
+Pandas
+------
+`Pandas `_ is data manipulation library
+based on Numpy and which provides many useful functions for accessing,
+indexing, merging and grouping data easily. The main data structure (DataFrame)
+is close to what could be found in the R statistical package, that is
+an heterogeneous data tables with name indexing, time series operations
+and auto-alignement of data.
+
+Rpy2
+----
+`Rpy2 `_ is a Python binding for the R
+statistical package allowing to execute R functions from Python and passing
+data back and forth the two environments. Rpy2 is the object oriented
+implementation of the binding based on `Rpy `_.
+
+
Resources
:::::::::
From 214323af52dac0db53c6ca8c758814c008fc6080 Mon Sep 17 00:00:00 2001
From: Nicolas Louveton
Date: Sun, 18 Aug 2013 14:15:29 +0200
Subject: [PATCH 0012/1016] Add scientific/neuroscience tools
PsychoPy a library for cognitive science
---
docs/scenarios/scientific.rst | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst
index 1471e52a3..a95f9867f 100644
--- a/docs/scenarios/scientific.rst
+++ b/docs/scenarios/scientific.rst
@@ -95,6 +95,14 @@ statistical package allowing to execute R functions from Python and passing
data back and forth the two environments. Rpy2 is the object oriented
implementation of the binding based on `Rpy `_.
+PsychoPy
+--------
+
+`PsychoPy `_ is a library for cognitive scientists
+allowing to create cognitive psychology and neuroscience experiments. The library
+handles both presentation of stimuli, scripting of experimental design and
+data collection.
+
Resources
:::::::::
From a6b3fae71e9b5dac24f9fb7e89ae336843d85549 Mon Sep 17 00:00:00 2001
From: ugurthemaster
Date: Tue, 20 Aug 2013 14:21:34 +0300
Subject: [PATCH 0013/1016] Update news.rst
---
docs/intro/news.rst | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docs/intro/news.rst b/docs/intro/news.rst
index 74a5b44ab..ec829f49a 100644
--- a/docs/intro/news.rst
+++ b/docs/intro/news.rst
@@ -31,3 +31,11 @@ Python Weekly is a free weekly newsletter featuring curated news, articles,
new releases, jobs, etc. related to Python.
`Python Weekly `_
+
+Python News
+~~~~~~~~~~~~~
+
+News section in the official Python web site (www.python.org). It briefly
+highlights the news from Python community.
+
+ `Python News `_
From d0b5d5effebe88ab95fe096a452fa0d98fdc263e Mon Sep 17 00:00:00 2001
From: ugurthemaster
Date: Wed, 21 Aug 2013 10:10:29 +0300
Subject: [PATCH 0014/1016] Update gui.rst
The information about PyjamasDesktop (pyjs Desktop) has been added.
---
docs/scenarios/gui.rst | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
index 7194f57bd..7f502b37d 100644
--- a/docs/scenarios/gui.rst
+++ b/docs/scenarios/gui.rst
@@ -76,3 +76,14 @@ Kivy is actively being developed by a community and free to use. It operates
on all major platforms (Linux, OSX, Windows, Android).
The main resource for information is the website: http://kivy.org
+
+PyjamasDesktop (pyjs Desktop)
+-----------------------------
+PyjamasDesktop is a port of PyJamas. PyjamasDesktop is application widget set
+for desktop and a cross-platform framework. (After release v0.6 PyjamasDesktop
+is a part of Pyjamas (Pyjs)). Briefly, it allows the exact same Python web application
+source code to be executed as a standalone desktop application.
+
+`Python Wiki for PyjamasDesktop `_.
+
+The main website; `pyjs Desktop `_.
From 95c7db96970dd0d49f3f0c7d811d6dc2d953858c Mon Sep 17 00:00:00 2001
From: David Boucha
Date: Fri, 23 Aug 2013 12:20:00 -0600
Subject: [PATCH 0015/1016] Correct Salt Docs url. Ensure apache service is
enable and set proper require
---
docs/scenarios/admin.rst | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst
index 081eae440..4bdfe6802 100644
--- a/docs/scenarios/admin.rst
+++ b/docs/scenarios/admin.rst
@@ -115,10 +115,13 @@ and start the Apache server:
- installed
service:
- running
+ - enable: True
+ - require:
+ - pkg: apache
State files can be written using YAML, the Jinja2 template system or pure python.
- `Salt Documentation `_
+ `Salt Documentation `_
Psutil
From 580e32fb6a0fea5c34677899f7cd215a6a54fd95 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:21:46 -0700
Subject: [PATCH 0016/1016] Update Buildbot URL.
---
docs/scenarios/ci.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 3a80c70b3..d9fc431ab 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -26,7 +26,7 @@ engine. Use it.
Buildbot
--------
-`Buildbot `_ is a Python system to
+`Buildbot `_ is a Python system to
automate the compile/test cycle to validate code changes.
@@ -85,4 +85,4 @@ thorough.
In order to activate testing for your project, go to `the travis-ci site `_
and login with your Github account. Then activate your project in your profile settings and that's
-it. From now on, your project's tests will be run on every push to Github.
+it. From now on, your project's tests will be run on every push to Github.
From 5609bc8bbff2189e1659f47039f218ae34cac271 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:22:47 -0700
Subject: [PATCH 0017/1016] Update tox URL.
---
docs/scenarios/ci.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index d9fc431ab..1bb2af534 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -38,7 +38,7 @@ Mule?
Tox
---
-`tox `_ is an automation tool providing
+`tox `_ is an automation tool providing
packaging, testing and deployment of Python software right from the console or
CI server. It is a generic virtualenv management and test command line tool
which provides the following features:
From 5982ec650a64210a831971771497315db286fab5 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:23:15 -0700
Subject: [PATCH 0018/1016] Update Travis CI URL because always https.
---
docs/scenarios/ci.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 1bb2af534..6e2025d91 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -53,7 +53,7 @@ which provides the following features:
Travis-CI
---------
-`Travis-CI `_ is a distributed CI server which builds tests
+`Travis-CI `_ is a distributed CI server which builds tests
for open source projects for free. It provides multiple workers to run Python tests
on and seamlessly integrates with Github. You can even have it comment on your Pull
Requests whether this particular changeset breaks the build or not. So if you are
@@ -83,6 +83,6 @@ notifications, before and after steps and much more. The
`travis-ci docs `_ explain all of those and are very
thorough.
-In order to activate testing for your project, go to `the travis-ci site `_
+In order to activate testing for your project, go to `the travis-ci site `_
and login with your Github account. Then activate your project in your profile settings and that's
it. From now on, your project's tests will be run on every push to Github.
From 920aa3725c88a82101ad29502e8a8b4242bfbf9f Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:26:15 -0700
Subject: [PATCH 0019/1016] Use Wayback Machine to resolve a dead link.
---
docs/scenarios/db.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/db.rst b/docs/scenarios/db.rst
index 5d12c2a51..6d6d6ce7a 100644
--- a/docs/scenarios/db.rst
+++ b/docs/scenarios/db.rst
@@ -11,7 +11,7 @@ Nearly all Python database modules such as `sqlite3`, `psycopg` and
Tutorials that explain how to work with modules that conform to this interface can be found
`here `__ and
-`here `__.
+`here `__.
SQLAlchemy
----------
From c52c9187ae4dc9b7436a15426f8fda8f1eda5a12 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:27:22 -0700
Subject: [PATCH 0020/1016] Add Qt link.
---
docs/scenarios/gui.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
index 7f502b37d..94b190345 100644
--- a/docs/scenarios/gui.rst
+++ b/docs/scenarios/gui.rst
@@ -4,7 +4,7 @@ GUI Applications
Qt
--
-Qt is a cross-platform application framework that is widely used for developing
+`Qt `_ is a cross-platform application framework that is widely used for developing
software with a GUI but can also be used for non-GUI applications.
PySide
From 1e38672e668a6c629d8154ce5dfab95fa7a55131 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:42:32 -0700
Subject: [PATCH 0021/1016] Update Gunicorn help link.
---
docs/scenarios/web.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index 588dbb285..dd6418bc1 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -152,7 +152,7 @@ lightweight, easy to use, and uses many UNIX idioms. Gunicorn is not designed
to face the internet -- it was designed to run behind Nginx which buffers
slow requests and takes care of other important considerations. A sample
setup for Nginx + Gunicorn can be found in the
-`Gunicorn help `_.
+`Gunicorn help `_.
.. _uwsgi-ref:
From 0b897088fcde12b99d5b1727b0b9f664105d8e92 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:44:32 -0700
Subject: [PATCH 0022/1016] Update link to Gondor documentation.
---
docs/scenarios/web.rst | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index dd6418bc1..99b3dfc6b 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -235,9 +235,7 @@ and Pinax applications. Gondor supports Django versions 1.2 and 1.3 on
Python version 2.7, and can automatically configure your Django site if you
use ``local_settings.py`` for site-specific configuration information.
-Gondor publishes guides to deploying `Django projects
-`_ and `Pinax projects
-`_ on their platform.
+Gondor has a guide on deploying `Django projects `_.
Templating
From c5e37675ce06ed310560a254d7f672c8ae0b6eca Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:49:59 -0700
Subject: [PATCH 0023/1016] Update virtualenvwrapper documentation links.
---
docs/dev/virtualenvs.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/dev/virtualenvs.rst b/docs/dev/virtualenvs.rst
index ee6ace244..c08f1118e 100644
--- a/docs/dev/virtualenvs.rst
+++ b/docs/dev/virtualenvs.rst
@@ -60,7 +60,7 @@ where they were placed.
virtualenvwrapper
-----------------
-`virtualenvwrapper `_
+`virtualenvwrapper `_
provides a set of commands which makes working with virtual environments much
more pleasant. It also places all your virtual environments in one place.
@@ -72,7 +72,7 @@ To install (make sure **virtualenv** is already installed):
$ export WORKON_HOME=~/Envs
$ source /usr/local/bin/virtualenvwrapper.sh
-(`Full virtualenvwrapper install instructions `_.)
+(`Full virtualenvwrapper install instructions `_.)
For Windows, you can use the `virtualenvwrapper-powershell `_ clone.
@@ -136,7 +136,7 @@ Other useful commands
``lssitepackages``
Shows contents of ``site-packages`` directory.
-`Full list of virtualenvwrapper commands `_.
+`Full list of virtualenvwrapper commands `_.
autoenv
-------
From 8bd2c129658fd3bfd48e1b60f5bf6f3d1a4a5a46 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:54:40 -0700
Subject: [PATCH 0024/1016] Update link to 'A Byte of Python'.
---
docs/intro/learning.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 63d6d04fb..27e770def 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -85,7 +85,7 @@ A free introductory book that teaches python at the beginner level, it assumes n
previous programming experience.
`A Byte of Python for Python 2.x `_
- `A Byte of Python for Python 3.x `_
+ `A Byte of Python for Python 3.x `_
Advanced
@@ -130,7 +130,7 @@ A Primer on Scientific Programming with Python
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A Primer on Scientific Programming with Python, written by Hans Petter Langtangen,
-mainly covers python's usage in scientific field. In the book, examples are
+mainly covers python's usage in scientific field. In the book, examples are
choosen from mathematics and the natural sciences.
`A Primer on Scientific Programming with Python `_
@@ -138,7 +138,7 @@ choosen from mathematics and the natural sciences.
Numerical Methods in Engineering with Python
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
+Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
emphasis on numerical methods and how to implement them in python.
`Numerical Methods in Engineering with Python `_
From 4cc1d119f14c207b17e2c2a157bda954a854fba9 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:56:16 -0700
Subject: [PATCH 0025/1016] Add link to 'Python in a Nutshell'.
---
docs/intro/learning.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 27e770def..0cb397b2f 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -153,6 +153,8 @@ Python in a Nutshell, written by Alex Martelli, covers most cross-platform
python's usage, from its syntax to built-in libraries to advanced topics such
as writing C extensions.
+ `Python in a Nutshell `_
+
The Python Language Reference
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
From bbbb24d3e50198018e23f9dc549fc98536d68669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Blech?=
Date: Thu, 29 Aug 2013 20:29:42 -0300
Subject: [PATCH 0026/1016] Add xmltodict
---
docs/scenarios/xml.rst | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/docs/scenarios/xml.rst b/docs/scenarios/xml.rst
index df89d580a..1f8db9c4c 100644
--- a/docs/scenarios/xml.rst
+++ b/docs/scenarios/xml.rst
@@ -32,3 +32,42 @@ and then you can get the child elements name like this:
untangle also supports loading XML from a string or an URL.
+xmltodict
+---------
+
+`xmltodict `_ is another simple
+library that aims at making xml feel like working with json.
+
+An xml file like this:
+
+.. code-block:: xml
+
+
+
+ elements
+ more elements
+
+
+ element as well
+
+
+
+can be loaded into a python dict like this:
+
+.. code-block:: python
+
+ import xmltodict
+ obj = xmltodict.parse('path/to/file.xml')
+
+and then you can access elements, attributes and values like this:
+
+.. code-block:: python
+
+ doc['mydocument']['@has'] # == u'an attribute'
+ doc['mydocument']['and']['many'] # == [u'elements', u'more elements']
+ doc['mydocument']['plus']['@a'] # == u'complex'
+ doc['mydocument']['plus']['#text'] # == u'element as well'
+
+xmltodict also lets you roundtrip back to xml with the unparse function,
+has a streaming mode suitable for handling files that don't fit in memory
+and supports namespaces.
From 0d259afbda87f5283bcf10c22b62494f8c32125a Mon Sep 17 00:00:00 2001
From: eluck
Date: Fri, 30 Aug 2013 01:27:54 -0700
Subject: [PATCH 0027/1016] fix broken tornado link in web.rst
---
docs/scenarios/web.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index 588dbb285..3e40f16cb 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -92,7 +92,7 @@ Support can be found on its `mailing list `_ is a scalable, non-blocking web server and web application framework with
+`Tornado `_ is a scalable, non-blocking web server and web application framework with
a relative simple usage. Tornado is known for his high performance.
It was initially developed for `friendfeed `_ , a real time chat and blog system.
From ad9a6568a7b6b395120fb02bd530acaa10f782df Mon Sep 17 00:00:00 2001
From: Kenneth Reitz
Date: Sun, 1 Sep 2013 10:31:33 +0530
Subject: [PATCH 0028/1016] python for you and me
@kushaldas
---
docs/intro/learning.rst | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 63d6d04fb..930b20b06 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -14,6 +14,13 @@ allows you to go through the lessons without having to install Python locally.
`Learn Python `_
+
+If you want a more traditional book, *Python For You and Me* is an
+excellent resource for learning all aspects of the language.
+
+ `Python for You and Me `_
+
+
Learn Python the Hard Way
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -130,7 +137,7 @@ A Primer on Scientific Programming with Python
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A Primer on Scientific Programming with Python, written by Hans Petter Langtangen,
-mainly covers python's usage in scientific field. In the book, examples are
+mainly covers python's usage in scientific field. In the book, examples are
choosen from mathematics and the natural sciences.
`A Primer on Scientific Programming with Python `_
@@ -138,7 +145,7 @@ choosen from mathematics and the natural sciences.
Numerical Methods in Engineering with Python
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
+Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
emphasis on numerical methods and how to implement them in python.
`Numerical Methods in Engineering with Python `_
From c6de99f95be42ea29bd43352c36c2d1c2afcad72 Mon Sep 17 00:00:00 2001
From: Jeroen Dierckx
Date: Wed, 4 Sep 2013 13:49:24 +0200
Subject: [PATCH 0029/1016] Added Camelot information to gui.rst
---
docs/scenarios/gui.rst | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
index 7f502b37d..4dbc650b8 100644
--- a/docs/scenarios/gui.rst
+++ b/docs/scenarios/gui.rst
@@ -87,3 +87,16 @@ source code to be executed as a standalone desktop application.
`Python Wiki for PyjamasDesktop `_.
The main website; `pyjs Desktop `_.
+
+Camelot
+-------
+`Camelot `_ provides components for building
+business applications on top of Python, SQLAlchemy and Qt. It is inspired by
+the Django admin interface.
+
+You can use Camelot to develop both simple and complex business applications
+at warp speed.
+
+The main resource for information is the website:
+http://www.python-camelot.com
+and the mailinglist https://groups.google.com/forum/#!forum/project-camelot
From ddef4fc72db9eea23976285469d58a59e933d263 Mon Sep 17 00:00:00 2001
From: MalcolmEvershed
Date: Sun, 8 Sep 2013 16:13:39 -0700
Subject: [PATCH 0030/1016] New Pip requires Setuptools instead of Distribute
Also remove --distribute option from virtualenv since that is obsolete.
---
docs/starting/install/win.rst | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/docs/starting/install/win.rst b/docs/starting/install/win.rst
index 420957275..bdfa3f08a 100644
--- a/docs/starting/install/win.rst
+++ b/docs/starting/install/win.rst
@@ -36,21 +36,21 @@ packages are installed, so it is a very useful addition.
You do not need to install or configure anything else to use Python. Having
said that, I would strongly recommend that you install the tools and libraries
described in the next section before you start building Python applications for
-real-world use. In particular, you should always install Distribute, as it
+real-world use. In particular, you should always install Setuptools, as it
makes it much easier for you to use other third-party Python libraries.
-Distribute + Pip
+Setuptools + Pip
----------------
-The most crucial third-party Python software of all is Distribute, which
+The most crucial third-party Python software of all is Setuptools, which
extends the packaging and installation facilities provided by the distutils in
-the standard library. Once you add Distribute to your Python system you can
+the standard library. Once you add Setuptools to your Python system you can
download and install any compliant Python software product with a single
command. It also enables you to add this network installation capability to
your own Python software with very little work.
-To obtain the latest version of Distribute for Windows, run the python script
-available here: `python-distribute `_
+To obtain the latest version of Setuptools for Windows, run the python script
+available here: `ez_setup.py `_
You'll now have a new command available to you: **easy_install**. It is
@@ -58,11 +58,8 @@ considered by many to be deprecated, so we will install its replacement:
**pip**. Pip allows for uninstallation of packages, and is actively maintained,
unlike easy_install.
-To install pip, simply open a command prompt and run
-
-.. code-block:: console
-
- > easy_install pip
+To install pip, run the python script available here:
+`get-pip.py `_
Virtualenv
@@ -89,7 +86,7 @@ project's directory
.. code-block:: console
- > virtualenv --distribute venv
+ > virtualenv venv
To use an environment, run the ``activate.bat`` batch file in the ``Scripts``
subdirectory of that environment. Your command prompt will change to show the
From 0852469bcacce3eb911fd8d975b46e5e516fa14d Mon Sep 17 00:00:00 2001
From: Kyle Kelley
Date: Fri, 13 Sep 2013 15:51:25 -0500
Subject: [PATCH 0031/1016] Linked explicitly to 2.x documentation
---
docs/intro/documentation.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/intro/documentation.rst b/docs/intro/documentation.rst
index cdc796dc7..cd22c95fa 100644
--- a/docs/intro/documentation.rst
+++ b/docs/intro/documentation.rst
@@ -6,7 +6,7 @@ Official Documentation
The official Python Language and Library documentation can be found here:
- - `Python 2.x `_
+ - `Python 2.x `_
- `Python 3.x `_
From eafdcd9a61ea96e3b1685ea06f18162308bdc9a3 Mon Sep 17 00:00:00 2001
From: Jeff Paine
Date: Sat, 14 Sep 2013 00:39:31 -0400
Subject: [PATCH 0032/1016] Update brew installation commands
---
docs/starting/install/osx.rst | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst
index 0711b1928..53323cb8a 100644
--- a/docs/starting/install/osx.rst
+++ b/docs/starting/install/osx.rst
@@ -54,19 +54,7 @@ line at the bottom of your ``~/.bashrc`` file
Now, we can install Python 2.7: ::
- $ brew install python --framework
-
-This will take a minute or two. Once that's complete, you'll have to add the
-new Python scripts directory to your ``PATH``
-
-.. code-block:: console
-
- export PATH=/usr/local/share/python:$PATH
-
-The ``--framework`` option tells Homebrew to compile a Framework-style Python
-build, rather than a UNIX-style build. The outdated version of Python that
-Snow Leopard comes packaged with is built as a Framework, so this helps avoid
-some future module installation bugs.
+ $ brew install python
Distribute & Pip
From 4842bbb1a184f0c27b7e6d2bf4af4568929ea402 Mon Sep 17 00:00:00 2001
From: Jeff Paine
Date: Sun, 15 Sep 2013 09:59:04 -0400
Subject: [PATCH 0033/1016] Add back export PATH=/usr/local/share/python:$PATH
section
---
docs/starting/install/osx.rst | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst
index 53323cb8a..dc6676733 100644
--- a/docs/starting/install/osx.rst
+++ b/docs/starting/install/osx.rst
@@ -56,6 +56,13 @@ Now, we can install Python 2.7: ::
$ brew install python
+This will take a minute or two. Once that's complete, you'll have to add the
+new Python scripts directory to your ``PATH``
+
+.. code-block:: console
+
+ export PATH=/usr/local/share/python:$PATH
+
Distribute & Pip
----------------
From 40f41a9e26f7f69ce1400345e5ae5c1c488769de Mon Sep 17 00:00:00 2001
From: Andreas Savvides
Date: Mon, 16 Sep 2013 23:46:00 +0100
Subject: [PATCH 0034/1016] Adding link to Python in a Nutshell
---
docs/intro/learning.rst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 930b20b06..852e786cb 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -160,6 +160,9 @@ Python in a Nutshell, written by Alex Martelli, covers most cross-platform
python's usage, from its syntax to built-in libraries to advanced topics such
as writing C extensions.
+ `Python in a Nutshell `_
+
+
The Python Language Reference
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
From 56924481c2006be27168546eded9748844d737aa Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:21:46 -0700
Subject: [PATCH 0035/1016] Update Buildbot URL.
---
docs/scenarios/ci.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 3a80c70b3..d9fc431ab 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -26,7 +26,7 @@ engine. Use it.
Buildbot
--------
-`Buildbot `_ is a Python system to
+`Buildbot `_ is a Python system to
automate the compile/test cycle to validate code changes.
@@ -85,4 +85,4 @@ thorough.
In order to activate testing for your project, go to `the travis-ci site `_
and login with your Github account. Then activate your project in your profile settings and that's
-it. From now on, your project's tests will be run on every push to Github.
+it. From now on, your project's tests will be run on every push to Github.
From e094175bd6ae59f979845e0e85e14f81422ff015 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:22:47 -0700
Subject: [PATCH 0036/1016] Update tox URL.
---
docs/scenarios/ci.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index d9fc431ab..1bb2af534 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -38,7 +38,7 @@ Mule?
Tox
---
-`tox `_ is an automation tool providing
+`tox `_ is an automation tool providing
packaging, testing and deployment of Python software right from the console or
CI server. It is a generic virtualenv management and test command line tool
which provides the following features:
From 8b9e3bb877411f86e56cb1d31fb0e05ef167053d Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:23:15 -0700
Subject: [PATCH 0037/1016] Update Travis CI URL because always https.
---
docs/scenarios/ci.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 1bb2af534..6e2025d91 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -53,7 +53,7 @@ which provides the following features:
Travis-CI
---------
-`Travis-CI `_ is a distributed CI server which builds tests
+`Travis-CI `_ is a distributed CI server which builds tests
for open source projects for free. It provides multiple workers to run Python tests
on and seamlessly integrates with Github. You can even have it comment on your Pull
Requests whether this particular changeset breaks the build or not. So if you are
@@ -83,6 +83,6 @@ notifications, before and after steps and much more. The
`travis-ci docs `_ explain all of those and are very
thorough.
-In order to activate testing for your project, go to `the travis-ci site `_
+In order to activate testing for your project, go to `the travis-ci site `_
and login with your Github account. Then activate your project in your profile settings and that's
it. From now on, your project's tests will be run on every push to Github.
From edf7f04e491e7b4aa799e655ea0cf92369f501c8 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:26:15 -0700
Subject: [PATCH 0038/1016] Use Wayback Machine to resolve a dead link.
---
docs/scenarios/db.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/db.rst b/docs/scenarios/db.rst
index 5d12c2a51..6d6d6ce7a 100644
--- a/docs/scenarios/db.rst
+++ b/docs/scenarios/db.rst
@@ -11,7 +11,7 @@ Nearly all Python database modules such as `sqlite3`, `psycopg` and
Tutorials that explain how to work with modules that conform to this interface can be found
`here `__ and
-`here `__.
+`here `__.
SQLAlchemy
----------
From 709823707823db459e8c02d9343495eb4ecedd37 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 01:27:22 -0700
Subject: [PATCH 0039/1016] Add Qt link.
---
docs/scenarios/gui.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
index 4dbc650b8..d85a83663 100644
--- a/docs/scenarios/gui.rst
+++ b/docs/scenarios/gui.rst
@@ -4,7 +4,7 @@ GUI Applications
Qt
--
-Qt is a cross-platform application framework that is widely used for developing
+`Qt `_ is a cross-platform application framework that is widely used for developing
software with a GUI but can also be used for non-GUI applications.
PySide
From 55fc9b08e41516eddb856c83ba441883f0a7781d Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:42:32 -0700
Subject: [PATCH 0040/1016] Update Gunicorn help link.
---
docs/scenarios/web.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index 3e40f16cb..d074752bb 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -152,7 +152,7 @@ lightweight, easy to use, and uses many UNIX idioms. Gunicorn is not designed
to face the internet -- it was designed to run behind Nginx which buffers
slow requests and takes care of other important considerations. A sample
setup for Nginx + Gunicorn can be found in the
-`Gunicorn help `_.
+`Gunicorn help `_.
.. _uwsgi-ref:
From 788390e74f1fbd3c4457d8b981134ed9e2a5d501 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:44:32 -0700
Subject: [PATCH 0041/1016] Update link to Gondor documentation.
---
docs/scenarios/web.rst | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index d074752bb..4574096e7 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -235,9 +235,7 @@ and Pinax applications. Gondor supports Django versions 1.2 and 1.3 on
Python version 2.7, and can automatically configure your Django site if you
use ``local_settings.py`` for site-specific configuration information.
-Gondor publishes guides to deploying `Django projects
-`_ and `Pinax projects
-`_ on their platform.
+Gondor has a guide on deploying `Django projects `_.
Templating
From cf93e79274c467d7ea82fa2b31c0561fffe54e4a Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:49:59 -0700
Subject: [PATCH 0042/1016] Update virtualenvwrapper documentation links.
---
docs/dev/virtualenvs.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/dev/virtualenvs.rst b/docs/dev/virtualenvs.rst
index ee6ace244..c08f1118e 100644
--- a/docs/dev/virtualenvs.rst
+++ b/docs/dev/virtualenvs.rst
@@ -60,7 +60,7 @@ where they were placed.
virtualenvwrapper
-----------------
-`virtualenvwrapper `_
+`virtualenvwrapper `_
provides a set of commands which makes working with virtual environments much
more pleasant. It also places all your virtual environments in one place.
@@ -72,7 +72,7 @@ To install (make sure **virtualenv** is already installed):
$ export WORKON_HOME=~/Envs
$ source /usr/local/bin/virtualenvwrapper.sh
-(`Full virtualenvwrapper install instructions `_.)
+(`Full virtualenvwrapper install instructions `_.)
For Windows, you can use the `virtualenvwrapper-powershell `_ clone.
@@ -136,7 +136,7 @@ Other useful commands
``lssitepackages``
Shows contents of ``site-packages`` directory.
-`Full list of virtualenvwrapper commands `_.
+`Full list of virtualenvwrapper commands `_.
autoenv
-------
From f51141c973d2fcd6abd5d45be503917756de96e4 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:54:40 -0700
Subject: [PATCH 0043/1016] Update link to 'A Byte of Python'.
---
docs/intro/learning.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 852e786cb..e5d074259 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -92,7 +92,7 @@ A free introductory book that teaches python at the beginner level, it assumes n
previous programming experience.
`A Byte of Python for Python 2.x `_
- `A Byte of Python for Python 3.x `_
+ `A Byte of Python for Python 3.x `_
Advanced
From 2cd385e61c758661cf43518b5080dcdc7267cf1e Mon Sep 17 00:00:00 2001
From: kuyan
Date: Sat, 24 Aug 2013 11:56:16 -0700
Subject: [PATCH 0044/1016] Add link to 'Python in a Nutshell'.
---
docs/intro/learning.rst | 1 -
1 file changed, 1 deletion(-)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index e5d074259..b8e31c499 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -162,7 +162,6 @@ as writing C extensions.
`Python in a Nutshell `_
-
The Python Language Reference
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
From 239909dc4c2f6fa273f7c0ec27f33b4d6d2391ac Mon Sep 17 00:00:00 2001
From: Alois Mahdal
Date: Tue, 24 Sep 2013 14:01:59 +0200
Subject: [PATCH 0045/1016] Clarify presence of a two-element tuple.
---
docs/writing/style.rst | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docs/writing/style.rst b/docs/writing/style.rst
index e48956a2e..a631e4a0c 100644
--- a/docs/writing/style.rst
+++ b/docs/writing/style.rst
@@ -273,7 +273,8 @@ Unpacking
~~~~~~~~~
If you know the length of a list or tuple, you can assign names to its
-elements with unpacking:
+elements with unpacking. For example, since you know that ``enumerate()``
+will provide a tuple of two elements for each item in list:
.. code-block:: python
From f32ef5f38f4b4db300b334b1ee4b98950826199d Mon Sep 17 00:00:00 2001
From: Alois Mahdal
Date: Tue, 24 Sep 2013 22:25:57 +0200
Subject: [PATCH 0046/1016] Reworded per rgbkrk's suggestion
---
docs/writing/style.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/writing/style.rst b/docs/writing/style.rst
index a631e4a0c..33339ff9f 100644
--- a/docs/writing/style.rst
+++ b/docs/writing/style.rst
@@ -273,8 +273,8 @@ Unpacking
~~~~~~~~~
If you know the length of a list or tuple, you can assign names to its
-elements with unpacking. For example, since you know that ``enumerate()``
-will provide a tuple of two elements for each item in list:
+elements with unpacking. For example, since ``enumerate()`` will provide
+a tuple of two elements for each item in list:
.. code-block:: python
From 4e1b3771e5a12eeb4c250db28357d016121e9204 Mon Sep 17 00:00:00 2001
From: kuyan
Date: Mon, 14 Oct 2013 15:20:29 -0700
Subject: [PATCH 0047/1016] Link to `fpm` (see #328)
---
docs/shipping/packaging.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
index e91bb33d6..466665af9 100644
--- a/docs/shipping/packaging.rst
+++ b/docs/shipping/packaging.rst
@@ -78,5 +78,5 @@ For Linux Distributions
Useful Tools
------------
-- epm
+- `fpm `_
- alien
From 525c834d596d3ff014b4c71d2c73a32743ee2956 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz
Date: Thu, 24 Oct 2013 18:16:48 -0400
Subject: [PATCH 0048/1016] Get Updates
---
docs/_templates/sidebarintro.html | 5 +++++
docs/_templates/sidebarlogo.html | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index b9901b381..58c71b058 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -3,6 +3,11 @@ Python Guide.
This opinionated guide exists to provide both novice and expert Python developers a best-practice handbook to the installation, configuration, and usage of Python on a daily basis.
+Get Updates
+Receive updates on new releases and upcoming projects.
+
+Subscribe to Newsletter
+
Donate
If you enjoy this guide, consider supporting the author on Gittip:
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
index d7f12de20..5a40255d5 100644
--- a/docs/_templates/sidebarlogo.html
+++ b/docs/_templates/sidebarlogo.html
@@ -3,6 +3,11 @@
This opinionated guide exists to provide both novice and expert Python developers a best-practice handbook to the installation, configuration, and usage of Python on a daily basis.
+Get Updates
+Receive updates on new releases and upcoming projects.
+
+Subscribe to Newsletter
+
Donate
If you enjoy this guide, consider supporting the author on Gittip:
From eb950d52c96a4a0a468e5db3b143a0644646e70f Mon Sep 17 00:00:00 2001
From: Jens Rantil
Date: Mon, 28 Oct 2013 23:15:38 +0100
Subject: [PATCH 0049/1016] Link to `alien`
This fully fixes #328.
---
docs/shipping/packaging.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
index 466665af9..ef7df6782 100644
--- a/docs/shipping/packaging.rst
+++ b/docs/shipping/packaging.rst
@@ -79,4 +79,4 @@ Useful Tools
------------
- `fpm `_
-- alien
+- `alien `_
From 00619354b8f742d2e9c0b86f92640a571a260069 Mon Sep 17 00:00:00 2001
From: Pengkui Luo
Date: Sat, 2 Nov 2013 05:56:54 -0500
Subject: [PATCH 0050/1016] PyPy recently released beta support to Python 3.
---
docs/starting/which-python.rst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/starting/which-python.rst b/docs/starting/which-python.rst
index 2fc852541..0413a897f 100644
--- a/docs/starting/which-python.rst
+++ b/docs/starting/which-python.rst
@@ -51,7 +51,7 @@ that rely on C extensions for their functionality (e.g. numpy) then CPython
is your only choice.
Being the reference implementation, all versions of the Python language are
-available as CPython. Python 3 is only available as a CPython implementation.
+available as CPython.
PyPy
----
@@ -67,7 +67,8 @@ If you are looking to squeeze more performance out of your Python code, it's
worth giving PyPy a try. On a suite of benchmarks, it's currently `over 5 times
faster than CPython `_.
-Currently PyPy supports Python 2.7. [#pypy_ver]_
+Currently PyPy supports Python 2.7. PyPy3 which targets Python 3 was recently
+available as a beta release. [#pypy_ver]_
Jython
------
From 12fe8d779bbec515aeb359a4e3e3be329fe433fe Mon Sep 17 00:00:00 2001
From: Pengkui Luo
Date: Sat, 2 Nov 2013 06:19:19 -0500
Subject: [PATCH 0051/1016] python-2.7.5 is available.
---
docs/starting/install/win.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/starting/install/win.rst b/docs/starting/install/win.rst
index bdfa3f08a..a05893b69 100644
--- a/docs/starting/install/win.rst
+++ b/docs/starting/install/win.rst
@@ -3,7 +3,7 @@
Installing Python on Windows
============================
-First, download the `latest version `_
+First, download the `latest version `_
of Python 2.7 from the official Website. If you want to be sure you are installing a fully
up-to-date version then use the "Windows Installer" link from the home page of the
`Python.org web site `_ .
From 83630edf35b468dbf96815f02fd25db70141204f Mon Sep 17 00:00:00 2001
From: Pengkui Luo
Date: Sat, 2 Nov 2013 06:19:56 -0500
Subject: [PATCH 0052/1016] typos
---
docs/starting/install/win.rst | 2 +-
docs/starting/which-python.rst | 4 ++--
docs/writing/structure.rst | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/starting/install/win.rst b/docs/starting/install/win.rst
index a05893b69..f1d9386e5 100644
--- a/docs/starting/install/win.rst
+++ b/docs/starting/install/win.rst
@@ -80,7 +80,7 @@ project. This is particularly important for Web development, where each
framework and application will have many dependencies.
-To set up a new Python environment, change the working directory to where ever
+To set up a new Python environment, change the working directory to wherever
you want to store the environment, and run the virtualenv utility in your
project's directory
diff --git a/docs/starting/which-python.rst b/docs/starting/which-python.rst
index 0413a897f..cc79c362f 100644
--- a/docs/starting/which-python.rst
+++ b/docs/starting/which-python.rst
@@ -47,7 +47,7 @@ level of compatibility with Python packages and C extension modules.
If you are writing open-source Python code and want to reach the widest possible
audience, targeting CPython is your best bet. If you need to use any packages
-that rely on C extensions for their functionality (e.g. numpy) then CPython
+that rely on C extensions for their functionality (e.g., numpy) then CPython
is your only choice.
Being the reference implementation, all versions of the Python language are
@@ -74,7 +74,7 @@ Jython
------
`Jython `_ is a Python implementation that compiles
-Python code to Java byte code that is then executed in a JVM. It has the additional
+Python code to Java bytecode that is then executed in a JVM. It has the additional
advantage of being able to import and use any Java class like a Python
module.
diff --git a/docs/writing/structure.rst b/docs/writing/structure.rst
index 9bb685c6b..0529b21ec 100644
--- a/docs/writing/structure.rst
+++ b/docs/writing/structure.rst
@@ -14,7 +14,7 @@ isolated? By answering questions like these you can begin to plan, in
a broad sense, what your finished product will look like.
In this section we take a closer look at Python's module and import
-systems as they are the central element to enforcing structure in your
+systems as they are the central elements to enforcing structure in your
project. We then discuss various perspectives on how to build code which
can be extended and tested reliably.
From b3c7bd1ae2dd6f2879426e9fbc1a219d5caf34ea Mon Sep 17 00:00:00 2001
From: Paul Hallett
Date: Wed, 6 Nov 2013 12:03:52 +0000
Subject: [PATCH 0053/1016] Added link to the python packaging guide.
---
docs/shipping/packaging.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
index e91bb33d6..7dd275319 100644
--- a/docs/shipping/packaging.rst
+++ b/docs/shipping/packaging.rst
@@ -5,6 +5,8 @@ Packaging your code is important.
You'll need to package your code first before sharing it with other developers.
+The `Python Packaging Guide `_ provides an extensive guide on creating and maintaining Python packages.
+
For Python Developers
:::::::::::::::::::::
From d17acbf5151c923a3588c8dd8697041fc21cf9dd Mon Sep 17 00:00:00 2001
From: Can Ibanoglu
Date: Fri, 8 Nov 2013 21:21:56 +0200
Subject: [PATCH 0054/1016] Added virtual environment enforcing for pip for the
osx installation tutorial
---
docs/starting/install/osx.rst | 43 +++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst
index dc6676733..b84eeb02f 100644
--- a/docs/starting/install/osx.rst
+++ b/docs/starting/install/osx.rst
@@ -119,6 +119,49 @@ An useful set of extensions to virtualenv is available in virtualenvwrapper,
`RTFD `_ to find out more.
+A note about Pip and Virtualenv
+-------------------------------
+
+By now it should be clear that using virtual environments is a great way to keep
+your development environment clean and keeping different projects' requirements
+separate.
+
+When you start working on many different projects, it can be hard to remember to
+activate the related virtual environment when you come back to a specific project.
+As a result of this, it is very easy to install packages globally while thinking
+that you are actually installing the package for the virtual environment of the
+project. Over time this can result in a messy global package list.
+
+In order to make sure that you install packages to your active virtual environment
+when you use ``pip install``, consider adding the following two lines to your
+``~/.bashrc`` file:
+
+.. code-block:: console
+ export PIP_REQUIRE_VIRTUALENV=true
+
+After saving this change and sourcing the ``~/.bashrc`` file with ``source ~/.bashrc``,
+pip will no longer let you install packages if you are not in a virtual environment.
+If you try to use ``pip install`` outside of a virtual environment pip will
+gently remind you that an activated virtual environment is needed to install
+packages.
+
+.. code-block:: console
+ $ pip install requests
+ Could not find an activated virtualenv (required).
+
+You will of course need to install some packages globally and this can be accomplished
+by adding the following to your ``~/.bashrc`` file:
+
+.. code-block:: console
+ gpip() {
+ PIP_REQUIRE_VIRTUALENV="" pip "$@"
+ }
+
+After saving the changes and sourcing your ``~/.bashrc`` file you can now install
+packages globally by running ``gpip install``. You can change the name of the
+function to anything you like, just keep in mind that you will have to use that
+name when trying install packages globally with pip.
+
--------------------------------
This page is a remixed version of `another guide `_,
From 387170572a07af5847c09165f09f1ca281a663c5 Mon Sep 17 00:00:00 2001
From: Mher Movsisyan
Date: Sat, 9 Nov 2013 18:02:41 +0300
Subject: [PATCH 0055/1016] The latest OSX version is Mavericks
---
docs/starting/install/osx.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst
index dc6676733..fa41f8c9f 100644
--- a/docs/starting/install/osx.rst
+++ b/docs/starting/install/osx.rst
@@ -3,7 +3,7 @@
Installing Python on Mac OS X
=============================
-The latest version of Mac OS X, Mountain Lion, **comes with Python 2.7 out of the box**.
+The latest version of Mac OS X, Mavericks, **comes with Python 2.7 out of the box**.
You do not need to install or configure anything else to use Python. Having
said that, I would strongly recommend that you install the tools and libraries
From 3f7fb5e75648b059b1fceb5e379aa12c73285eca Mon Sep 17 00:00:00 2001
From: ugurthemaster
Date: Mon, 18 Nov 2013 11:16:29 +0200
Subject: [PATCH 0056/1016] Update learning.rst
"Python Pocket Reference" has been added.
---
docs/intro/learning.rst | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index b8e31c499..c3c0a2278 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -169,3 +169,12 @@ This is Python's reference manual, it covers the syntax and the core semantics o
language.
`The Python Language Reference `_
+
+Python Pocket Reference
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Python Pocket Reference, written by Mark Lutz, is an easy to use reference to the
+core language, with descriptions of commonly used modules and toolkits. It covers
+Python 3 and 2.6 versions.
+
+ `Python Pocket Reference `_
From 203b92ce617411ed65f9ad4a7c475c14690b83e0 Mon Sep 17 00:00:00 2001
From: ugurthemaster
Date: Mon, 25 Nov 2013 11:05:54 +0200
Subject: [PATCH 0057/1016] Update documentation.rst
---
docs/writing/documentation.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/writing/documentation.rst b/docs/writing/documentation.rst
index d543f53f5..7793af4bb 100644
--- a/docs/writing/documentation.rst
+++ b/docs/writing/documentation.rst
@@ -94,7 +94,9 @@ Reference`_ should help you familiarize yourself with its syntax.
Code Documentation Advice
-------------------------
-Comments clarify code and begin with a hash (``#``).
+Comments clarify the code and they are added with purpose of making the
+code easier to understand. In Python, comments begin with a hash
+(number sign) (``#``).
.. _docstring-ref:
From 83a99468b7ce9c4fd3126984b0df6a2c3db2adbd Mon Sep 17 00:00:00 2001
From: Pengkui Luo
Date: Tue, 26 Nov 2013 01:21:26 -0600
Subject: [PATCH 0058/1016] python-2.7.6
---
docs/starting/install/win.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/starting/install/win.rst b/docs/starting/install/win.rst
index f1d9386e5..b71b882ea 100644
--- a/docs/starting/install/win.rst
+++ b/docs/starting/install/win.rst
@@ -3,7 +3,7 @@
Installing Python on Windows
============================
-First, download the `latest version `_
+First, download the `latest version `_
of Python 2.7 from the official Website. If you want to be sure you are installing a fully
up-to-date version then use the "Windows Installer" link from the home page of the
`Python.org web site `_ .
From bd7147401280c4d079c6b50162d4d5f7f130edf1 Mon Sep 17 00:00:00 2001
From: ugurthemaster
Date: Tue, 26 Nov 2013 09:30:18 +0200
Subject: [PATCH 0059/1016] Update cli.rst
Information about Clint has been added.
---
docs/scenarios/cli.rst | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/scenarios/cli.rst b/docs/scenarios/cli.rst
index 546eae017..933b0f082 100644
--- a/docs/scenarios/cli.rst
+++ b/docs/scenarios/cli.rst
@@ -6,11 +6,14 @@ Command Line Applications
Clint
-----
-.. todo:: Write about Clint
+`clint `_ is a python module which is
+filled with very useful tools for developing commandline applications.
+It supports features such as; CLI Colors and Indents, Simple and Powerful
+Column Printer, Iterator based progress bar and Implicit argument handling.
docopt
------
`docopt `_ is a lightweight, highly Pythonic package that
allows creating command line interfaces easily and intuitively, by parsing
-POSIX-style usage instructions.
\ No newline at end of file
+POSIX-style usage instructions.
From 78016d6cf9b3fdf187719840e2a93392f41be5f4 Mon Sep 17 00:00:00 2001
From: Matt Hughes
Date: Mon, 2 Dec 2013 10:50:53 -0500
Subject: [PATCH 0060/1016] Added instructions for s3-hosted PyPi repo
Adapted from an awesome article by @jsutlovic
---
docs/shipping/packaging.rst | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
index e91bb33d6..7ffc5bac9 100644
--- a/docs/shipping/packaging.rst
+++ b/docs/shipping/packaging.rst
@@ -67,6 +67,36 @@ Chishop
written in django which allows you to register/upload with distutils and
install with easy_install/pip.
+S3-Hosted PyPi
+++++++++++++++
+
+One simple option for a personal PyPi server is to use Amazon S3. A prerequisite for this is that you have an Amazon AWS account with an S3 bucket.
+
+1. **Install all your requirements from PyPi or another source**
+2. **Install pip2pi**
+
+* :code:`pip install git+https://github.com/wolever/pip2pi.git`
+
+3. **Follow pip2pi README for pip2tgz and dir2pi commands**
+
+* :code:`pip2tgz packages/ YourPackage` (or :code:`pip2tgz packages/ -r requirements.txt`)
+* :code:`dir2pi packages/`
+
+4. **Upload the new files**
+
+* Use a client like Cyberduck to sync the entire :code:`packages` folder to your s3 bucket
+* Make sure you upload :code:`packages/simple/index.html` as well as all new files and directories
+
+5. **Fix new file permissions**
+
+* By default, when you upload new files to the S3 bucket, they will have the wrong permissions set.
+* Use the Amazon web console to set the READ permission of the files to EVERYONE.
+* If you get HTTP 403 when trying to install a package, make sure you've set the permissions correctly.
+
+6. **All done**
+
+* You can now your package with :code:`pip install --index-url=http://your-s3-bucket/packages/simple/ YourPackage`
+
For Linux Distributions
::::::::::::::::::::::::
From 6dfc9ae9530ccebdecd361d7d66a40ca2f8bb5c3 Mon Sep 17 00:00:00 2001
From: Natan L
Date: Mon, 2 Dec 2013 22:58:17 -0800
Subject: [PATCH 0061/1016] Fix broken link
---
docs/writing/style.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/writing/style.rst b/docs/writing/style.rst
index 33339ff9f..262d73471 100644
--- a/docs/writing/style.rst
+++ b/docs/writing/style.rst
@@ -434,7 +434,7 @@ Check if variable equals a constant
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You don't need to explicitly compare a value to True, or None, or 0 - you can
-just add it to the if statement. See :ref:`Truth Value Testing
+just add it to the if statement. See `Truth Value Testing
`_ for a
list of what is considered false.
From f0d1b23750a8260e1fc68cacad516b9275e551eb Mon Sep 17 00:00:00 2001
From: Han Su Kim
Date: Thu, 5 Dec 2013 15:16:11 -0500
Subject: [PATCH 0062/1016] Added Ansible to the list
Ansible is a tool written in Python for IT automation and orchestration.
---
docs/scenarios/admin.rst | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst
index 4bdfe6802..7f20dcd39 100644
--- a/docs/scenarios/admin.rst
+++ b/docs/scenarios/admin.rst
@@ -176,6 +176,15 @@ Here is an example to be aware of some server overload. In case of some failed t
A full terminal application like a widely extended top which is based on psutil and with the ability of a client-server
monitoring is `glance `_.
+Ansible
+Chef
+----
+
+.. todo:: Write about Ansible
+
+ `Ansible Documentation
+ `_
+
Chef
----
From 26f94e45db5354a809397963490efaa9be946cc9 Mon Sep 17 00:00:00 2001
From: justinhorner
Date: Thu, 2 Jan 2014 18:00:43 -0700
Subject: [PATCH 0063/1016] Update env.rst
trailing slash in link caused 404, removed to fix link
---
docs/dev/env.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/dev/env.rst b/docs/dev/env.rst
index 81da462b0..7097ee51c 100644
--- a/docs/dev/env.rst
+++ b/docs/dev/env.rst
@@ -130,7 +130,7 @@ PyCharm / IntelliJ IDEA
`PyCharm `_ is developed by JetBrains, also
known for IntelliJ IDEA. Both share the same code base and most of PyCharm's
-features can be brought to IntelliJ with the free `Python Plug-In `_.
+features can be brought to IntelliJ with the free `Python Plug-In `_.
Eclipse
From 919884c45ccf8b9f10f011826a82d1e39a6e8d88 Mon Sep 17 00:00:00 2001
From: Lyndsy Simon
Date: Tue, 14 Jan 2014 14:41:14 -0500
Subject: [PATCH 0064/1016] Adds recommendation to add /usr/local/sbin to
/usr/local/bin:/usr/local/sbin:/usr/local/bin:/Users/lyndsy/.bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/MacGPG2/bin
in OSX
---
docs/starting/install/osx.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst
index fa41f8c9f..8017bfb3b 100644
--- a/docs/starting/install/osx.rst
+++ b/docs/starting/install/osx.rst
@@ -50,7 +50,7 @@ line at the bottom of your ``~/.bashrc`` file
.. code-block:: console
- export PATH=/usr/local/bin:$PATH
+ export PATH=/usr/local/bin:/usr/local/sbin:$PATH
Now, we can install Python 2.7: ::
From 5156f9011ab775bd9e34ae45fb108f7cbe16329d Mon Sep 17 00:00:00 2001
From: Jonathan Steinmann
Date: Thu, 16 Jan 2014 23:04:10 -0500
Subject: [PATCH 0065/1016] update db.rst
expand on Django ORM basics
---
docs/scenarios/db.rst | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docs/scenarios/db.rst b/docs/scenarios/db.rst
index 6d6d6ce7a..787f0efe3 100644
--- a/docs/scenarios/db.rst
+++ b/docs/scenarios/db.rst
@@ -33,3 +33,11 @@ to provide database access.
It's based on the idea of `models `_, an abstraction that makes it easier to
manipulate data in Python.
+The basics:
+
+- Each model is a Python class that subclasses django.db.models.Model.
+- Each attribute of the model represents a database field.
+- Django gives you an automatically-generated database-access API; see `Making queries `__.
+to provide database access.
+
+
From db5bcf53749a9617c6c33c105d88c05bf9c540ab Mon Sep 17 00:00:00 2001
From: Jeff Paine
Date: Sat, 18 Jan 2014 08:33:56 -0500
Subject: [PATCH 0066/1016] Remove python 2.5 from example travis config
Travis does not support python <2.6
---
docs/scenarios/ci.rst | 1 -
1 file changed, 1 deletion(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 6e2025d91..3d67f78e9 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -65,7 +65,6 @@ example content::
language: python
python:
- - "2.5"
- "2.6"
- "2.7"
- "3.1"
From ed74bde2337388f5ba8545bd2f59f43f409e2ce4 Mon Sep 17 00:00:00 2001
From: Jeff Paine
Date: Sat, 18 Jan 2014 15:48:35 -0500
Subject: [PATCH 0067/1016] Remove python 3.1, add python 3.3
---
docs/scenarios/ci.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 3d67f78e9..e5dd565d5 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -67,8 +67,8 @@ example content::
python:
- "2.6"
- "2.7"
- - "3.1"
- "3.2"
+ - "3.3"
# command to install dependencies
script: python tests/test_all_of_the_units.py
branches:
From 494e80504da660eeecb64b8e338f2503e9e3781c Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 21:27:08 -0600
Subject: [PATCH 0068/1016] Updated capitalization in admin.rst
Updated capitalization of fabric and salt to Fabric and Salt
---
docs/scenarios/admin.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst
index 7f20dcd39..84c98da13 100644
--- a/docs/scenarios/admin.rst
+++ b/docs/scenarios/admin.rst
@@ -6,7 +6,7 @@ Fabric
`Fabric `_ is a library for simplifying system
administration tasks. While Chef and Puppet tend to focus on managing servers
-and system libraries, fabric is more focused on application level tasks such
+and system libraries, Fabric is more focused on application level tasks such
as deployment.
Install Fabric:
@@ -77,7 +77,7 @@ It supports remote command execution from a central point (master host) to multi
hosts (minions). It also supports system states which can be used to configure
multiple servers using simple template files.
-Salt supports python versions 2.6 and 2.7 and can be installed via pip:
+Salt supports Python versions 2.6 and 2.7 and can be installed via pip:
.. code-block:: console
@@ -95,7 +95,7 @@ The following command lists all available minion hosts, using the ping module.
The host filtering is accomplished by matching the minion id, or using the grains system.
The `grains `_ system
uses static host information like the operating system version or the CPU architecture to
-provide a host taxonomy for the salt modules.
+provide a host taxonomy for the Salt modules.
The following command lists all available minions running CentOS using the grains system:
@@ -119,7 +119,7 @@ and start the Apache server:
- require:
- pkg: apache
-State files can be written using YAML, the Jinja2 template system or pure python.
+State files can be written using YAML, the Jinja2 template system or pure Python.
`Salt Documentation `_
From afa61148f0215f445a831b6a8ade1dfc84d015dd Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 21:31:10 -0600
Subject: [PATCH 0069/1016] Hyphenation in ci.rst
Replaced frontend with front-end
---
docs/scenarios/ci.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
index 6e2025d91..5a36bfb1d 100644
--- a/docs/scenarios/ci.rst
+++ b/docs/scenarios/ci.rst
@@ -47,7 +47,7 @@ which provides the following features:
interpreters
* Running tests in each of the environments, configuring your test tool of
choice
-* Acting as a frontend to Continuous Integration servers, reducing boilerplate
+* Acting as a front-end to Continuous Integration servers, reducing boilerplate
and merging CI and shell-based testing.
From 3918f6b62aec0c75772246baa419056b8961dcfa Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 21:41:34 -0600
Subject: [PATCH 0070/1016] Spelling and capitalization in scientific.rst
Changed python to Python and corrected some spelling
---
docs/scenarios/scientific.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst
index a95f9867f..0d45807fa 100644
--- a/docs/scenarios/scientific.rst
+++ b/docs/scenarios/scientific.rst
@@ -9,7 +9,7 @@ Python is frequently used for high-performance scientific applications. Python
is widely used in academia and scientific projects because it is easy to write,
and it performs really well.
-Due to its high performance nature, scientific computing in python often refers
+Due to its high performance nature, scientific computing in Python often refers
to external libraries, typically written in faster languages (like C, or
FORTRAN for matrix operations). The main libraries used are `NumPy`_, `SciPy`_
and `Matplotlib`_. Going into detail about these libraries is beyond the scope
@@ -24,11 +24,11 @@ Tools
IPython
-------
-`IPytthon `_ is an enhanced version of Python interpreter.
+`IPython `_ is an enhanced version of Python interpreter.
The features it provides are of great interest for the scientists. The `inline mode`
allow graphics and plots to be displayed in the terminal (Qt based version).
Moreover the `notebook` mode supports literate programming and reproducible science
-generating a web-based python notebook. This notebook allowing to store chunk of
+generating a web-based Python notebook. This notebook allowing to store chunk of
Python code along side to the results and additional comments (HTML, LaTeX, Markdown).
The notebook could be shared and exported in various file formats.
@@ -64,7 +64,7 @@ SciPy
`SciPy `_ is a library that uses Numpy for more mathematical
functions. SciPy uses NumPy arrays as the basic data structure. SciPy comes
-with modules for various commonly used tasks in scientific programing, for
+with modules for various commonly used tasks in scientific programming, for
example: linear algebra, integration (calculus), ordinary differential equation
solvers and signal processing.
@@ -86,7 +86,7 @@ based on Numpy and which provides many useful functions for accessing,
indexing, merging and grouping data easily. The main data structure (DataFrame)
is close to what could be found in the R statistical package, that is
an heterogeneous data tables with name indexing, time series operations
-and auto-alignement of data.
+and auto-alignment of data.
Rpy2
----
@@ -120,7 +120,7 @@ Many people who do scientific computing are on Windows. And yet many of the
scientific computing packages are notoriously difficult to build and install.
`Christoph Gohlke `_ however, has
compiled a list of Windows binaries for many useful Python packages. The list
-of packages has grown from a mainly scientific python resource to a more
+of packages has grown from a mainly scientific Python resource to a more
general list. It might be a good idea to check it out if you're on Windows.
Enthought Python Distribution (EPD)
From 1f61583f10c421720ce14195b5f433fbcd069f3f Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 21:47:45 -0600
Subject: [PATCH 0071/1016] Capitalization in xml.rst
replaced:
* xml to XML
* python to Python
* json to JSON
---
docs/scenarios/xml.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/scenarios/xml.rst b/docs/scenarios/xml.rst
index 1f8db9c4c..ee97e2d02 100644
--- a/docs/scenarios/xml.rst
+++ b/docs/scenarios/xml.rst
@@ -8,7 +8,7 @@ untangle
an XML document and returns a Python object which mirrors the nodes and
attributes in its structure.
-For example, an xml file like this:
+For example, an XML file like this:
.. code-block:: xml
@@ -36,9 +36,9 @@ xmltodict
---------
`xmltodict `_ is another simple
-library that aims at making xml feel like working with json.
+library that aims at making XML feel like working with JSON.
-An xml file like this:
+An XML file like this:
.. code-block:: xml
@@ -52,7 +52,7 @@ An xml file like this:
-can be loaded into a python dict like this:
+can be loaded into a Python dict like this:
.. code-block:: python
@@ -68,6 +68,6 @@ and then you can access elements, attributes and values like this:
doc['mydocument']['plus']['@a'] # == u'complex'
doc['mydocument']['plus']['#text'] # == u'element as well'
-xmltodict also lets you roundtrip back to xml with the unparse function,
+xmltodict also lets you roundtrip back to XML with the unparse function,
has a streaming mode suitable for handling files that don't fit in memory
and supports namespaces.
From 065f69d219d3b34e3d2e6648dc54f27ee99e6bee Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 21:51:42 -0600
Subject: [PATCH 0072/1016] Capitalization in packaging.rst
Replaced python with Python
---
docs/shipping/packaging.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
index 100ae9116..54d72b04a 100644
--- a/docs/shipping/packaging.rst
+++ b/docs/shipping/packaging.rst
@@ -46,7 +46,7 @@ Go to your command prompt and type:
$ python -m SimpleHTTPServer 9000
This runs a simple http server running on port 9000 and will list all packages
-(like **MyPackage**). Now you can install **MyPackage** using any python
+(like **MyPackage**). Now you can install **MyPackage** using any Python
package installer. Using Pip, you would do it like:
.. code-block:: console
From 5444d703d5253688e93f3f54fdfbd72fa7106d0b Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 21:58:43 -0600
Subject: [PATCH 0073/1016] Capitalization in env.rst
Replaced python with Python
---
docs/dev/env.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/dev/env.rst b/docs/dev/env.rst
index 7097ee51c..e2e628cb7 100644
--- a/docs/dev/env.rst
+++ b/docs/dev/env.rst
@@ -64,7 +64,7 @@ to do that which also shows status and warning messages in the statusbar would b
Python-mode
^^^^^^^^^^^
-Python-mode_ is a complex solution in VIM for working with python code.
+Python-mode_ is a complex solution in VIM for working with Python code.
It has:
- Asynchronous Python code checking (pylint, pyflakes, pep8, mccabe) in any combination
@@ -94,7 +94,7 @@ Emacs is a powerful text editor. It's fully programmable (lisp), but
it can be some work to wire up correctly. A good start if you're
already an Emacs user is `Python Programming in Emacs`_ at EmacsWiki.
-1. Emacs itself comes with a python mode.
+1. Emacs itself comes with a Python mode.
2. Python ships with an alternate version:
`python-mode.el `_
3. Fabián Ezequiel Gallina's `python.el `_
From f828b185d9cd4079e9297d3ca193f998a8a8918f Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 22:12:07 -0600
Subject: [PATCH 0074/1016] Update learning.rst
Changed choosen to chosen
Replaced python with Python
---
docs/intro/learning.rst | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index c3c0a2278..b7633f9cf 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -7,9 +7,9 @@ Beginner
Learn Python Interactive Tutorial
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Learnpython.org is an easy non-intimidating way to get introduced to python.
+Learnpython.org is an easy non-intimidating way to get introduced to Python.
The website takes the same approach used on the popular `Try Ruby `_
-website, it has an interactive python interpreter built into the site that
+website, it has an interactive Python interpreter built into the site that
allows you to go through the lessons without having to install Python locally.
`Learn Python `_
@@ -52,11 +52,11 @@ Think Python: How to Think Like a Computer Scientist
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Think Python attempts to give an introduction to basic concepts in computer
-science through the use of the python language. The focus was to create a book
+science through the use of the Python language. The focus was to create a book
with plenty of exercises, minimal jargon and a section in each chapter devoted
to the subject of debugging.
-While exploring the various features available in the python language the
+While exploring the various features available in the Python language the
author weaves in various design patterns and best practices.
The book also includes several case studies which have the reader explore the
@@ -72,11 +72,11 @@ Python Koans
Python Koans is a port of Edgecase's Ruby Koans. It uses a test-driven
approach, q.v. TEST DRIVEN DESIGN SECTION to provide an interactive tutorial
-teaching basic python concepts. By fixing assertion statements that fail in a
-test script, this provides sequential steps to learning python.
+teaching basic Python concepts. By fixing assertion statements that fail in a
+test script, this provides sequential steps to learning Python.
For those used to languages and figuring out puzzles on their own, this can be
-a fun, attractive option. For those new to python and programming, having an
+a fun, attractive option. For those new to Python and programming, having an
additional resource or reference will be helpful.
`Python Koans `_
@@ -88,7 +88,7 @@ More information about test driven development can be found at these resources:
A Byte of Python
~~~~~~~~~~~~~~~~
-A free introductory book that teaches python at the beginner level, it assumes no
+A free introductory book that teaches Python at the beginner level, it assumes no
previous programming experience.
`A Byte of Python for Python 2.x `_
@@ -137,8 +137,8 @@ A Primer on Scientific Programming with Python
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A Primer on Scientific Programming with Python, written by Hans Petter Langtangen,
-mainly covers python's usage in scientific field. In the book, examples are
-choosen from mathematics and the natural sciences.
+mainly covers Python's usage in scientific field. In the book, examples are
+chosen from mathematics and the natural sciences.
`A Primer on Scientific Programming with Python `_
@@ -146,7 +146,7 @@ Numerical Methods in Engineering with Python
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
-emphasis on numerical methods and how to implement them in python.
+emphasis on numerical methods and how to implement them in Python.
`Numerical Methods in Engineering with Python `_
@@ -157,7 +157,7 @@ Python in a Nutshell
~~~~~~~~~~~~~~~~~~~~
Python in a Nutshell, written by Alex Martelli, covers most cross-platform
-python's usage, from its syntax to built-in libraries to advanced topics such
+Python's usage, from its syntax to built-in libraries to advanced topics such
as writing C extensions.
`Python in a Nutshell `_
From 74b6d1d61273748e2c8e49f57b86b0099fd0e97d Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 22:15:30 -0600
Subject: [PATCH 0075/1016] Replaced "python" with "Python"
---
docs/intro/news.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/intro/news.rst b/docs/intro/news.rst
index ec829f49a..433f9078d 100644
--- a/docs/intro/news.rst
+++ b/docs/intro/news.rst
@@ -19,7 +19,7 @@ Python-related news.
Pycoder's Weekly
~~~~~~~~~~~~~~~~
-Pycoder's Weekly is a free weekly python newsletter for Python developers
+Pycoder's Weekly is a free weekly Python newsletter for Python developers
by Python developers (Project, Articles, News, and Jobs).
`Pycoder's Weekly `_
From cdd31908faf4ea8383339ec66cb638c8a370afe2 Mon Sep 17 00:00:00 2001
From: smithandrewl
Date: Sat, 18 Jan 2014 22:27:06 -0600
Subject: [PATCH 0076/1016] Capitalization changes in web.rst
Replaced:
* python with Python
* javascript with JavaScript
---
docs/scenarios/web.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index 4574096e7..d2178f10e 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -271,10 +271,10 @@ and to the templates themselves.
templates. This convenience can lead to uncontrolled
increase in complexity, and often harder to find bugs.
-- It is often necessary to mix javascript templates with
+- It is often necessary to mix JavaScript templates with
HTML templates. A sane approach to this design is to isolate
the parts where the HTML template passes some variable content
- to the javascript code.
+ to the JavaScript code.
@@ -370,7 +370,7 @@ The `base.html` file can be used as base for all site pages which are for exampl