Merge branch 'master' into add-pypy3

# Conflicts:
#	CHANGES.rst

.travis.yml

@@ -2,7 +2,6 @@ language: python
 sudo: false
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
   - 3.6

CHANGES.rst

@@ -2,11 +2,17 @@
  Changes
 =========
 
-4.3.3 (unreleased)
-==================
+5.0 (unreleased)
+================
+
+- Backwards incompatible change: Remove ``zope.publisher.tests.httprequest``.
+  It is not used inside this package and was never ported to Python 3.
+  Fixes https://github.com/zopefoundation/zope.publisher/issues/4.
 
 - Add support for PyPy3.
 
+- Drop support for Python 3.3.
+
 
 4.3.2 (2017-05-23)
 ==================

README.rst

@@ -2,7 +2,7 @@
  zope.publisher
 ================
 
-.. image:: https://travis-ci.org/zopefoundation/zope.publisher.png?branch=master
+.. image:: https://travis-ci.org/zopefoundation/zope.publisher.svg?branch=master
         :target: https://travis-ci.org/zopefoundation/zope.publisher
 
 .. image:: https://readthedocs.org/projects/zopepublisher/badge/?version=latest

setup.py

@@ -54,8 +54,8 @@ def read(*rnames):
 
 setup(
     name='zope.publisher',
-    version='4.3.3.dev0',
-    url='http://github.com/zopefoundation/zope.publisher',
+    version='5.0.dev0',
+    url='https://github.com/zopefoundation/zope.publisher',
     license='ZPL 2.1',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
@@ -69,7 +69,6 @@ def read(*rnames):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,py36,pypy,pypy3
+    py27,py34,py35,py36,pypy,pypy3
 
 [testenv]
 commands =