From a35561efc9d19687297d00e19ca8e0fdbcf8d2a6 Mon Sep 17 00:00:00 2001 From: "Rajath Kumar M.P" Date: Thu, 1 Oct 2015 18:39:55 +0530 Subject: [PATCH 1/9] IPython install edit Installs dependencies for notebook. --- 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 391f230..3c33b13 100644 --- a/docs/dev/env.rst +++ b/docs/dev/env.rst @@ -268,7 +268,7 @@ most out of using Python interactively. Its main components are: .. code-block:: console - $ pip install ipython + $ pip install ipython[all] BPython From 4a40fe3a22650924a3a1f3ed39e4d91624a2e0e0 Mon Sep 17 00:00:00 2001 From: "Rajath Kumar M.P" Date: Fri, 2 Oct 2015 12:34:28 +0530 Subject: [PATCH 2/9] updated --- docs/dev/env.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/dev/env.rst b/docs/dev/env.rst index 3c33b13..ee5e6bb 100644 --- a/docs/dev/env.rst +++ b/docs/dev/env.rst @@ -268,8 +268,13 @@ most out of using Python interactively. Its main components are: .. code-block:: console - $ pip install ipython[all] + $ pip install ipython +To download and install IPython with all it's main optional dependencies for the notebook, qtconsole, tests, and other functionalities + +.. code-block:: console + + $pip install ipython[all] BPython ------- From 510b3c61da591fd696c10a3a0ed361236a9423de Mon Sep 17 00:00:00 2001 From: "Rajath Kumar M.P" Date: Fri, 2 Oct 2015 19:20:07 +0530 Subject: [PATCH 3/9] update - 2 --- 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 ee5e6bb..dae86e4 100644 --- a/docs/dev/env.rst +++ b/docs/dev/env.rst @@ -270,11 +270,11 @@ most out of using Python interactively. Its main components are: $ pip install ipython -To download and install IPython with all it's main optional dependencies for the notebook, qtconsole, tests, and other functionalities +To download and install IPython with all it's optional dependencies for the notebook, qtconsole, tests, and other functionalities .. code-block:: console - $pip install ipython[all] + $ pip install ipython[all] BPython ------- From 45c01b0955e5ee27dcd6de3073eecd04d9e262e9 Mon Sep 17 00:00:00 2001 From: Ryan Sandridge Date: Fri, 2 Oct 2015 14:32:57 -0400 Subject: [PATCH 4/9] Fixing typo. Singular object, not plural. --- docs/writing/structure.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/writing/structure.rst b/docs/writing/structure.rst index 98be4bf..f99c53e 100644 --- a/docs/writing/structure.rst +++ b/docs/writing/structure.rst @@ -213,7 +213,7 @@ can be somewhat misleading and needs to be clarified. In Python, everything is an object, and can be handled as such. This is what is meant when we say, for example, that functions are first-class objects. Functions, classes, strings, and even types are objects in Python: like any -objects, they have a type, they can be passed as function arguments, they may +object, they have a type, they can be passed as function arguments, they may have methods and properties. In this understanding, Python is an object-oriented language. From e79bbce25520d4032044fc77755be7906bf1799c Mon Sep 17 00:00:00 2001 From: Ryan Sandridge Date: Fri, 2 Oct 2015 14:37:44 -0400 Subject: [PATCH 5/9] Adding conjunction "and" after the serial comma. --- docs/writing/structure.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/writing/structure.rst b/docs/writing/structure.rst index f99c53e..05a90e8 100644 --- a/docs/writing/structure.rst +++ b/docs/writing/structure.rst @@ -213,8 +213,8 @@ can be somewhat misleading and needs to be clarified. In Python, everything is an object, and can be handled as such. This is what is meant when we say, for example, that functions are first-class objects. Functions, classes, strings, and even types are objects in Python: like any -object, they have a type, they can be passed as function arguments, they may -have methods and properties. In this understanding, Python is an +object, they have a type, they can be passed as function arguments, and they +may have methods and properties. In this understanding, Python is an object-oriented language. However, unlike Java, Python does not impose object-oriented programming as the From c16bc50cb815b35b573411322deea05ff1feed6d Mon Sep 17 00:00:00 2001 From: George Gognadze Date: Fri, 2 Oct 2015 22:47:07 +0400 Subject: [PATCH 6/9] Update README.md --- docs/_templates/sidebarintro.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html index 3c6c7c2..65ca51e 100644 --- a/docs/_templates/sidebarintro.html +++ b/docs/_templates/sidebarintro.html @@ -21,7 +21,7 @@

Contributors

This guide is the result of the collaboration of - 135+ people + hundreds of people around the world, and your contributions are welcome!

From b0896e8468082ededfbfba4109080336e9141b6a Mon Sep 17 00:00:00 2001 From: Cadel Watson Date: Sat, 3 Oct 2015 08:27:13 +1000 Subject: [PATCH 7/9] Added usage instructions for autopep8 --- docs/writing/style.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/writing/style.rst b/docs/writing/style.rst index ae37cf6..bb970a9 100644 --- a/docs/writing/style.rst +++ b/docs/writing/style.rst @@ -452,6 +452,23 @@ Then run it on a file or series of files to get a report of any violations. optparse.py:472:29: E221 multiple spaces before operator optparse.py:544:21: W601 .has_key() is deprecated, use 'in' +The program `autopep8 `_ can be used to +automatically reformat code in the PEP 8 style. Install the program with: + +.. code-block:: console + + $ pip install autopep8 + +Use it to format a file in-place with: + +.. code-block:: console + + $ autopep8 --in-place optparse.py + +Excluding the ``--in-place`` flag will cause the program to output the modified +code directly to the console for review. The ``--aggressive`` flag will perform +more substantial changes and can be applied multiple times for greater effect. + Conventions ---------------- From 139a9671db9219a8ea989b3efb0e02e1208cd35a Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Sat, 3 Oct 2015 00:50:20 +0200 Subject: [PATCH 8/9] fixed a few typos --- docs/intro/documentation.rst | 2 +- docs/scenarios/admin.rst | 4 ++-- docs/scenarios/gui.rst | 2 +- docs/shipping/freezing.rst | 2 +- docs/shipping/packaging.rst | 2 +- docs/starting/pip-virtualenv.rst | 6 +++--- docs/writing/documentation.rst | 2 +- docs/writing/style.rst | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/intro/documentation.rst b/docs/intro/documentation.rst index dd5053f..1db5bce 100644 --- a/docs/intro/documentation.rst +++ b/docs/intro/documentation.rst @@ -23,7 +23,7 @@ both popular and exotic. pydoc ----- -:program:`pydoc` is a utlity that is installed when you install Python. +:program:`pydoc` is a utility that is installed when you install Python. It allows you to quickly retrieve and search for documentation from your shell. For example, if you needed a quick refresher on the :mod:`time` module, pulling up documentation would be as simple as diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst index 172e128..954e1f6 100644 --- a/docs/scenarios/admin.rst +++ b/docs/scenarios/admin.rst @@ -255,8 +255,8 @@ system. `Puppet Forge `_ is a repository for modules written by the community for Open Source and Enterprise Puppet. Puppet Agents are installed on nodes whose state needs to be monitored or -changed. A desginated server known as the Puppet Master is responsible for -orchastrating the agent nodes. +changed. A designated server known as the Puppet Master is responsible for +orchestrating the agent nodes. Agent nodes send basic facts about the system such as to the operating system, kernel, architecture, ip address, hostname etc. to the Puppet Master. diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst index 19e888d..466dec0 100644 --- a/docs/scenarios/gui.rst +++ b/docs/scenarios/gui.rst @@ -15,7 +15,7 @@ and the mailing list https://groups.google.com/forum/#!forum/project-camelot Cocoa ----- -.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application! +.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application! GTk --- diff --git a/docs/shipping/freezing.rst b/docs/shipping/freezing.rst index e333f69..64c0780 100644 --- a/docs/shipping/freezing.rst +++ b/docs/shipping/freezing.rst @@ -107,7 +107,7 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc - `Manual `_ -OS X +OS X ---- diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst index 2fa1ca7..1c65961 100644 --- a/docs/shipping/packaging.rst +++ b/docs/shipping/packaging.rst @@ -23,7 +23,7 @@ The downside of distributing code like this is that it relies on the recipient understanding how to install the required version of Python, and being able and willing to use tools such as pip to install your code's other dependencies. This is fine when distributing to other developers, but -makes this method unsuitable for distributing applications to end-uers. +makes this method unsuitable for distributing applications to end-users. The `Python Packaging Guide `_ provides an extensive guide on creating and maintaining Python packages. diff --git a/docs/starting/pip-virtualenv.rst b/docs/starting/pip-virtualenv.rst index fedcbe1..51927e6 100644 --- a/docs/starting/pip-virtualenv.rst +++ b/docs/starting/pip-virtualenv.rst @@ -6,7 +6,7 @@ Further Configuration of Pip and Virtualenv Requiring an active virtual environment for ``pip`` --------------------------------------------------- -By now it should be clear that using virtual envirtonments is a great way to +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. @@ -71,7 +71,7 @@ add the following lines to this new file: You will of course need to install some packages globally (usually ones that -you use across different projects consistenly) and this can be accomplished by +you use across different projects consistently) and this can be accomplished by adding the following to your :file:`~/.bashrc` file: .. code-block:: console @@ -94,7 +94,7 @@ that you use. For example, you may be using the ``requests`` library in a lot of different projects. It is surely unnecessary to re-download the same packages/libraries each time -you start working on a new project (and in a new virtual environmen as a result). +you start working on a new project (and in a new virtual environment as a result). Fortunately, you can configure pip in such a way that it tries to reuse already installed packages. diff --git a/docs/writing/documentation.rst b/docs/writing/documentation.rst index 85f48de..58a3107 100644 --- a/docs/writing/documentation.rst +++ b/docs/writing/documentation.rst @@ -141,7 +141,7 @@ comment block is a programmer's note. The docstring describes the """Returns the square root of self times self.""" ... -.. seealso:: Further reading on docstrings: :pep:`257` +.. see also:: Further reading on docstrings: :pep:`257` Other Tools diff --git a/docs/writing/style.rst b/docs/writing/style.rst index ae37cf6..5e66151 100644 --- a/docs/writing/style.rst +++ b/docs/writing/style.rst @@ -6,7 +6,7 @@ Code Style If you ask Python programmers what they like most in Python, they will often say its high readability. Indeed, a high level of readability is at the heart of the design of the Python language, following the -recognised fact that code is read much more often than it is written. +recognized fact that code is read much more often than it is written. One reason for Python code to be easily read and understood is its relatively complete set of Code Style guidelines and "Pythonic" idioms. From 13078ff627024529dfc0a048172947e9a6d80b89 Mon Sep 17 00:00:00 2001 From: Ann Paul Date: Fri, 2 Oct 2015 21:50:48 -0700 Subject: [PATCH 9/9] Fix link to pip vs easy_install comparison --- 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 28b1800..fdf76dd 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -73,7 +73,7 @@ software over a network (usually the Internet) with a single command capability to your own Python software with very little work. ``pip`` is a tool for easily installing and managing Python packages, -that is recommended over ``easy_install``. It is superior to ``easy_install`` in `several ways `_, +that is recommended over ``easy_install``. It is superior to ``easy_install`` in `several ways `_, and is actively maintained.