- See #2835

CHANGES.txt

@@ -42,6 +42,9 @@ Backward Incompatibilities
Features
--------

- Python 3.6 compatibility.
  https://github.com/Pylons/pyramid/issues/2835

- pcreate learned about --package-name to allow you to create a new project in
  an existing folder with a different package name than the project name. See
  https://github.com/Pylons/pyramid/pull/2783

HACKING.txt

@@ -118,8 +118,8 @@ In order to add a feature to Pyramid:
- The feature must be documented in both the API and narrative documentation
  (in ``docs/``).

- The feature must work fully on the following CPython versions: 2.7, 3.4,
  and 3.5 on both UNIX and Windows.
- The feature must work fully on the following CPython versions: 2.7, 3.4, 3.5,
  and 3.6 on both UNIX and Windows.

- The feature must work on the latest version of PyPy.

RELEASING.txt

@@ -33,8 +33,8 @@ Prepare new release branch

- Run tests on Windows if feasible.

- Make sure all scaffold tests pass (CPython 2.7, 3.4, and 3.5, and PyPy on
  UNIX; this doesn't work on Windows):
- Make sure all scaffold tests pass (CPython 2.7, 3.4, 3.5, and 3.6, and PyPy
  on UNIX; this doesn't work on Windows):

  $ ./scaffoldtests.sh

docs/narr/install.rst

@@ -22,7 +22,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, PyPy.
    Python 3.4, Python 3.5, Python 3.6, and PyPy.

:app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux,
Mac OS X, and FreeBSD, as well as on Windows platforms.  It is also known to

docs/narr/introduction.rst

@@ -860,7 +860,7 @@ Every release of Pyramid has 100% statement coverage via unit and integration
tests, as measured by the ``coverage`` tool available on PyPI.  It also has
greater than 95% decision/condition coverage as measured by the
``instrumental`` tool available on PyPI. It is automatically tested by Travis,
and Jenkins on Python 2.7, Python 3.4, Python 3.5, and PyPy
and Jenkins on Python 2.7, Python 3.4, Python 3.5, Python 3.6, and PyPy
after each commit to its GitHub repository. Official Pyramid add-ons are held
to a similar testing standard.  We still find bugs in Pyramid and its official
add-ons, but we've noticed we find a lot more of them while working on other

docs/quick_tour.rst

@@ -26,7 +26,7 @@ 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
environment variable, too.

As an example, for Python 3.5+ on Linux:
As an example, for Python 3.6+ on Linux:

.. parsed-literal::

@@ -729,7 +729,7 @@ This yields the following output.
    collected 1 items

    hello_world/tests.py .
    ------------- coverage: platform darwin, python 3.5.0-final-0 -------------
    ------------- coverage: platform darwin, python 3.6.0-final-0 -------------
    Name                       Stmts   Miss  Cover   Missing
    --------------------------------------------------------
    hello_world/__init__.py       11      8    27%   11-23

docs/quick_tutorial/requirements.rst

@@ -19,11 +19,11 @@ virtual environment.)

This *Quick Tutorial* is based on:

* **Python 3.5**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
  tutorial uses **Python 3.5** but runs fine under Python 2.7.
* **Python 3.6**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
  tutorial uses **Python 3.6** but runs fine under Python 2.7.

* **venv**. We believe in virtual environments. For this tutorial, we use
  Python 3.5's built-in solution :term:`venv`. For Python 2.7, you can install
  Python 3.6's built-in solution :term:`venv`. For Python 2.7, you can install
  :term:`virtualenv`.

* **pip**. We use :term:`pip` for package management.

docs/tutorials/wiki/installation.rst

@@ -66,7 +66,7 @@ Python 2.7:

   c:\> c:\Python27\Scripts\virtualenv %VENV%

Python 3.5:
Python 3.6:

.. code-block:: doscon

@@ -310,13 +310,13 @@ If successful, you will see output something like this:
.. code-block:: bash

   ======================== test session starts ========================
   platform Python 3.5.1, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
   platform Python 3.6.0, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
   rootdir: /Users/stevepiercy/projects/pyramidtut/tutorial, inifile:
   plugins: cov-2.2.1
   collected 1 items

   tutorial/tests.py .
   ------------------ coverage: platform Python 3.5.1 ------------------
   ------------------ coverage: platform Python 3.6.0 ------------------
   Name                   Stmts   Miss  Cover   Missing
   ----------------------------------------------------
   tutorial/__init__.py      12      7    42%   7-8, 14-18

docs/tutorials/wiki2/installation.rst

@@ -66,7 +66,7 @@ Python 2.7:

   c:\> c:\Python27\Scripts\virtualenv %VENV%

Python 3.5:
Python 3.6:

.. code-block:: doscon

@@ -327,13 +327,13 @@ If successful, you will see output something like this:
.. code-block:: bash

   ======================== test session starts ========================
   platform Python 3.5.1, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
   platform Python 3.6.0, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
   rootdir: /Users/stevepiercy/projects/pyramidtut/tutorial, inifile:
   plugins: cov-2.2.1
   collected 2 items

   tutorial/tests.py ..
   ------------------ coverage: platform Python 3.5.1 ------------------
   ------------------ coverage: platform Python 3.6.0 ------------------
   Name                               Stmts   Miss  Cover   Missing
   ----------------------------------------------------------------
   tutorial/__init__.py                   8      6    25%   7-12

pyramid/tests/test_config/test_views.py

@@ -2309,9 +2309,9 @@ def __call__(self):
    # Since Python 3 has to be all cool and fancy and different...
    def _assertBody(self, response, value):
        from pyramid.compat import text_type
        if isinstance(value, text_type): # pragma: nocover
        if isinstance(value, text_type):  # pragma: no cover
            self.assertEqual(response.text, value)
        else: # pragma: nocover
        else:  # pragma: no cover
            self.assertEqual(response.body, value)

    def test_add_notfound_view_with_renderer(self):

pyramid/tests/test_httpexceptions.py

@@ -348,7 +348,7 @@ def test_custom_body_template_with_custom_variable_doesnt_choke(self):
        exc = cls(body_template='${REQUEST_METHOD}')
        environ = _makeEnviron()
        class Choke(object):
            def __str__(self): # pragma nocover
            def __str__(self):  # pragma no cover
                raise ValueError
        environ['gardentheory.user'] = Choke()
        start_response = DummyStartResponse()

pyramid/util.py

@@ -3,7 +3,7 @@
try:
    # py2.7.7+ and py3.3+ have native comparison support
    from hmac import compare_digest
except ImportError: # pragma: nocover
except ImportError:  # pragma: no cover
    compare_digest = None
import inspect
import traceback

setup.py

@@ -85,6 +85,7 @@
          "Programming Language :: Python :: 3",
          "Programming Language :: Python :: 3.4",
          "Programming Language :: Python :: 3.5",
          "Programming Language :: Python :: 3.6",
          "Programming Language :: Python :: Implementation :: CPython",
          "Programming Language :: Python :: Implementation :: PyPy",
          "Framework :: Pyramid",