summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-11-16 05:34:00 -0800
committerSteve Piercy <web@stevepiercy.com>2018-11-16 05:34:00 -0800
commita6d8b494c3de85eceb33ab57a046fb6955f909fc (patch)
tree49bed2e57e0541f119c16889b062b491abb9e7f4 /docs
parentd4ce9d3f915b18425b4ce5224a51a89342270371 (diff)
downloadpyramid-a6d8b494c3de85eceb33ab57a046fb6955f909fc.tar.gz
pyramid-a6d8b494c3de85eceb33ab57a046fb6955f909fc.tar.bz2
pyramid-a6d8b494c3de85eceb33ab57a046fb6955f909fc.zip
Remove most Python 2 mentions from docs. Exclusions:
- `docs/tutorials/wiki/*` was written for Python 2 and supposedly won't run on Python 3. - `docs/api/compat.rst` because it drops some stuff and moves other bits into `pyramid.util` and should be part of another PR. - Ignored a couple of times where `env27` and `Python 2.` appear in command output, but they are inconsequential.
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
-rw-r--r--docs/narr/install.rst3
-rw-r--r--docs/narr/upgrading.rst1
-rw-r--r--docs/narr/webob.rst3
-rw-r--r--docs/quick_tour.rst15
-rw-r--r--docs/quick_tutorial/index.rst3
-rw-r--r--docs/quick_tutorial/requirements.rst9
-rw-r--r--docs/tutorials/wiki2/background.rst2
-rw-r--r--docs/tutorials/wiki2/installation.rst10
9 files changed, 14 insertions, 34 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index f42b298df..e15d28fa5 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1071,7 +1071,7 @@ Glossary
Green Unicorn
Aka ``gunicorn``, a fast :term:`WSGI` server that runs on Unix under
- Python 2.6+ or Python 3.1+. See https://gunicorn.org/ for detailed
+ Python 2.6+ or Python 3.4+. See https://gunicorn.org/ for detailed
information.
predicate factory
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 248b432d3..268ae5f8d 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -21,8 +21,7 @@ the following sections.
.. sidebar:: Python Versions
- As of this writing, :app:`Pyramid` is tested against Python 2.7,
- Python 3.4, Python 3.5, Python 3.6, Python 3.7, and PyPy.
+ As of this writing, :app:`Pyramid` is tested against Python 3.4, Python 3.5, Python 3.6, Python 3.7, Python 3.8 (with allowed failures), and PyPy3.
:app:`Pyramid` is known to run on all popular Unix-like systems such as Linux,
macOS, and FreeBSD, as well as on Windows platforms. It is also known to
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 12e146cf1..87e4647c3 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -86,7 +86,6 @@ At the time of a Pyramid version release, each supports all versions of Python
through the end of their lifespans. The end-of-life for a given version of
Python is when security updates are no longer released.
-- `Python 2.7 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2020-01-01.
- `Python 3.4 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2019-03-16 .
- `Python 3.5 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2020-09-13 .
- `Python 3.6 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2021-12-23.
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 89dc6e0f1..c9a5a68e1 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -188,8 +188,7 @@ of them. Here are a couple that might be useful:
Text (Unicode)
++++++++++++++
-Many of the properties of the request object will be text values (``unicode``
-under Python 2 or ``str`` under Python 3) if the request encoding/charset is
+Many of the properties of the request object will be text values (``str`` type) if the request encoding/charset is
provided. If it is provided, the values in ``req.POST``, ``req.GET``,
``req.params``, and ``req.cookies`` will contain text. The client *can*
indicate the charset with something like ``Content-Type:
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 1e2c71cf0..fbafead66 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -15,12 +15,9 @@ If you would prefer to cut and paste the example code in this tour you may brows
Installation
============
-Once you have a standard Python environment setup, getting started with Pyramid
-is a breeze. Unfortunately "standard" is not so simple in Python. For this
-Quick Tour, it means `Python <https://www.python.org/downloads/>`_, :mod:`python:venv` (or `virtualenv for
-Python 2.7 <https://virtualenv.pypa.io/en/stable/>`_),
-`pip <https://pypi.org/project/pip/>`_, and `Setuptools
-<https://pypi.org/project/setuptools/>`_.
+Once you have a standard Python environment setup, getting started with Pyramid is a breeze.
+Unfortunately "standard" is not so simple in Python.
+For this Quick Tour, it means `Python <https://www.python.org/downloads/>`_, :mod:`python:venv`, `pip <https://pypi.org/project/pip/>`_, and `Setuptools <https://pypi.org/project/setuptools/>`_.
To save a little bit of typing and to be certain that we use the modules,
scripts, and packages installed in our virtual environment, we'll set an
@@ -52,10 +49,8 @@ For Windows:
# or for a specific released version
c:\\> %VENV%\\Scripts\\pip install "pyramid==\ |release|\ "
-Of course Pyramid runs fine on Python 2.7+, as do the examples in this *Quick
-Tour*. We're showing Python 3 for simplicity. (Pyramid had production support
-for Python 3 in October 2011.) Also for simplicity, the remaining examples will
-show only Unix commands.
+As of version 2.0, Pyramid runs on Python 3 only.
+For simplicity, the remaining examples will show only Unix commands.
.. seealso:: See also:
:ref:`Quick Tutorial section on Requirements <qtut_requirements>`,
diff --git a/docs/quick_tutorial/index.rst b/docs/quick_tutorial/index.rst
index b5b7b3313..44a172067 100644
--- a/docs/quick_tutorial/index.rst
+++ b/docs/quick_tutorial/index.rst
@@ -4,8 +4,7 @@
Quick Tutorial for Pyramid
==========================
-Pyramid is a web framework for Python 2 and 3. This tutorial gives a Python
-3/2-compatible, high-level tour of the major features.
+Pyramid is a web framework for Python 3. This tutorial gives a Python 3-compatible, high-level tour of the major features.
This hands-on tutorial covers "a little about a lot": practical introductions
to the most common facilities. Fun, fast-paced, and most certainly not aimed at
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index a74c07673..f3ffdf153 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -19,12 +19,11 @@ virtual environment.)
This *Quick Tutorial* is based on:
-* **Python 3.7**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
- tutorial uses **Python 3.7** but runs fine under Python 2.7.
+* **Python 3.7**. Pyramid fully supports Python 3.4+.
+ This tutorial uses **Python 3.7**.
-* **venv**. We believe in virtual environments. For this tutorial, we use
- Python 3's built-in solution :term:`venv`. For Python 2.7, you can install
- :term:`virtualenv`.
+* **venv**. We believe in virtual environments.
+ For this tutorial, we use Python 3's built-in solution :term:`venv`.
* **pip**. We use :term:`pip` for package management.
diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst
index c14d3cb7d..09315a77d 100644
--- a/docs/tutorials/wiki2/background.rst
+++ b/docs/tutorials/wiki2/background.rst
@@ -17,6 +17,6 @@ variant, etc.) *or* a Windows system of any kind.
.. note::
- This tutorial runs on both Python 2 and 3 without modification.
+ This tutorial runs on Python 3 without modification.
Have fun!
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 924927cd4..705979065 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -126,16 +126,6 @@ On Unix
On Windows
^^^^^^^^^^
-Each version of Python uses different paths, so you will need to adjust the path to the command for your Python version. Recent versions of the Python 3 installer for Windows now install a Python launcher.
-
-Python 2.7:
-
-.. code-block:: doscon
-
- c:\Python27\Scripts\virtualenv %VENV%
-
-Python 3.7:
-
.. code-block:: doscon
python -m venv %VENV%