Merge pull request #324 from buildout/python-3.6

Python 3.6

.travis.yml

@@ -3,6 +3,7 @@ env:
     - PYTHON_VER=2.7
     - PYTHON_VER=3.4
     - PYTHON_VER=3.5
+    - PYTHON_VER=3.6
 
 sudo: false
 cache:

CHANGES.rst

@@ -6,6 +6,8 @@ Change History
 
 - Updated to work with the latest setuptools.
 
+- Added (verified) Python 3.6 support.
+
 2.5.3 (2016-09-05)
 ==================
 

setup.py

@@ -103,6 +103,7 @@ setup(
        'Programming Language :: Python :: 3',
        'Programming Language :: Python :: 3.4',
        'Programming Language :: Python :: 3.5',
+       'Programming Language :: Python :: 3.6',
        'Topic :: Software Development :: Build Tools',
        'Topic :: Software Development :: Libraries :: Python Modules',
        ],

src/zc/buildout/bootstrap.txt

@@ -93,11 +93,11 @@ Let's make sure the generated ``buildout`` script uses it::
 Now trying the ``--setuptools-version`` option, that lets you define a version
 for ``setuptools``.
 
-Now let's try with ``33.1.1``, which happens to exist::
+Now let's try with ``31.0.0``, which happens to exist::
 
     >>> print_('X'); print_(system(
     ...     zc.buildout.easy_install._safe_arg(sys.executable)+' '+
-    ...     'bootstrap.py --setuptools-version 33.1.1')); print_('X')
+    ...     'bootstrap.py --setuptools-version 31.0.0')); print_('X')
     ... # doctest: +ELLIPSIS
     X...Generated script '/sample/bin/buildout'...X
 
@@ -107,7 +107,7 @@ Let's make sure the generated ``buildout`` script uses it::
     #...
     sys.path[0:0] = [
       '/sample/eggs/zc.buildout-...egg',
-      '/sample/eggs/setuptools-33.1.1...egg'...
+      '/sample/eggs/setuptools-31.0.0...egg'...
       ]...
 
 Now let's try specifying both ``zc.buildout`` and ``setuptools`` to versions
@@ -115,7 +115,7 @@ which happens to exist::
 
     >>> print_('X'); print_(system(
     ...     zc.buildout.easy_install._safe_arg(sys.executable)+' '+
-    ...     'bootstrap.py --setuptools-version 33.1.1 --buildout-version 2.0.0')); print_('X')
+    ...     'bootstrap.py --setuptools-version 31.0.0 --buildout-version 2.0.0')); print_('X')
     ... # doctest: +ELLIPSIS
     X...Generated script '/sample/bin/buildout'...X
 
@@ -125,7 +125,7 @@ Let's make sure the generated ``buildout`` script uses it::
     #...
     sys.path[0:0] = [
       '/sample/eggs/zc.buildout-2.0.0...egg',
-      '/sample/eggs/setuptools-33.1.1...egg'...
+      '/sample/eggs/setuptools-31.0.0...egg'...
       ]...
 
 For a completely offline install we want to avoid downloading ``ez_setup.py``,
@@ -140,24 +140,24 @@ specify the setuptools version, and to reuse the setuptools zipfile::
     ... '''print("Using local ez_setup.py")
     ... ''' + ez_setup.decode('ascii'))
 
-    >>> os.path.exists('setuptools-14.3.zip')
+    >>> os.path.exists('setuptools-32.1.0.zip')
     False
 
     >>> print_('X'); print_(system(
     ...   zc.buildout.easy_install._safe_arg(sys.executable)+' '+
-    ...     'bootstrap.py --setuptools-version 14.3 --buildout-version 2.0.0 '+
+    ...   'bootstrap.py --setuptools-version 32.1.0 --buildout-version 2.0.0 '+
     ...   '--setuptools-to-dir .')); print_('X')
     ... # doctest: +ELLIPSIS
     X...Using local ez_setup.py...Generated script '/sample/bin/buildout'...X
 
-    >>> os.path.exists('setuptools-14.3.zip')
+    >>> os.path.exists('setuptools-32.1.0.zip')
     True
 
     >>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS
     #...
     sys.path[0:0] = [
       '/sample/eggs/zc.buildout-2.0.0...egg',
-      '/sample/eggs/setuptools-14.3...egg'...
+      '/sample/eggs/setuptools-32.1.0...egg'...
       ]...
 
 You can ask ``bootstrap.py`` for its version. This is really the day the last

src/zc/buildout/testing_bugfix.txt

@@ -15,7 +15,7 @@ The handers before calling set up are:
     >>> len(logging.getLogger().handlers)
     1
     >>> logging.getLogger().handlers # doctest: +ELLIPSIS
-    [<zope...testrunner.logsupport.NullHandler ... at ...>]
+    [<...NullHandler...>]
 
 After calling it, a ``logging.StreamHandler`` was added:
 
@@ -27,8 +27,7 @@ After calling it, a ``logging.StreamHandler`` was added:
     >>> len(logging.getLogger().handlers)
     2
     >>> logging.getLogger().handlers # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-    [<zope...testrunner.logsupport.NullHandler ... at ...>,
-     <logging.StreamHandler ... at ...>]
+    [<...NullHandler...StreamHandler...>]
 
 But tear down removes the new logging handler:
 
@@ -36,4 +35,4 @@ But tear down removes the new logging handler:
     >>> len(logging.getLogger().handlers)
     1
     >>> logging.getLogger().handlers # doctest: +ELLIPSIS
-    [<zope...testrunner.logsupport.NullHandler ... at ...>]
+    [<...NullHandler...>]

zc.recipe.egg_/src/zc/recipe/egg/README.rst

@@ -224,7 +224,7 @@ the bits if the path added to reflect the eggs:
     ... """).replace('>>> ', '').replace('... ', ''), end='')
     ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
     demo-0.2-py2.4.egg
-    demoneeded-1.1-py2.4.egg
+    demoneeded-1.1-py2.4.egg...
 
 Egg updating
 ------------

zc.recipe.egg_/src/zc/recipe/egg/tests.py

@@ -89,7 +89,7 @@ def test_suite():
                 (re.compile("(d  ((ext)?demo(needed)?|other)"
                             "-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"),
                  '\\1V.V.egg'),
-                (re.compile('extdemo.c\n.+\\extdemo.exp\n'), ''),
+                (re.compile('extdemo.c\n.+\\\\extdemo.exp\n'), ''),
                 (re.compile(
                     r'zip_safe flag not set; analyzing archive contents.*\n'),
                  ''),