Merge pull request #47 from zopefoundation/skip-ipv6

Remove Python 2.6 support and skip ipv6 test on Travis

.travis.yml

 language: python
 python:
-    - "2.6"
     - "2.7"
 
 notifications:

CHANGES.rst

@@ -11,6 +11,8 @@ http://docs.zope.org/zope2/
 Bugs Fixed
 ++++++++++
 
+- Skipped ipv6 test on Travis, because Travis no longer supports this.
+
 - LP #789863:  Ensure that Request objects cannot be published / traversed
   directly via a URL.
 
@@ -78,6 +80,8 @@ Features Added
 Restructuring
 +++++++++++++
 
+- Python 2.6 is no longer supported.  Use Python 2.7.
+
 - Products.SiteErrorLog: Is now a separated package.
 
 - OFS: Removed duplicate code in ZopeFind and ZopeFindAndApply

setup.py

@@ -45,7 +45,6 @@ setup(name='Zope2',
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2 :: Only",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: Implementation :: CPython",
     ],

src/ZServer/tests/test_config.py

@@ -134,6 +134,8 @@ class ZServerConfigurationTestCase(BaseTest, WarningInterceptor):
         self.assertEqual(server.port, 9381)
         server.close()
 
+    @unittest.skipIf(os.environ.get('TRAVIS'),
+                     'ipv6 is not available on Travis anymore')
     def test_http_over_ipv6(self):
         factory = self.load_factory("""\
             <http-server>