Merge pull request #9 from zopefoundation/deprecations

Drop support for Python 3.3 and fix deprecation warnings.

.travis.yml

@@ -2,11 +2,10 @@ language: python
 sudo: false
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
   - 3.6
-  - pypy-5.4.1
+  - pypy
 script:
   - coverage run -m zope.testrunner --test-path=src  --auto-color --auto-progress
 

CHANGES.rst

@@ -1,30 +1,31 @@
-Changes
-=======
+=========
+ Changes
+=========
 
-2.2.1 (unreleased)
-------------------
+2.3.0 (unreleased)
+==================
 
-- Nothing changed yet.
+- Drop support for Python 3.3.
 
 
 2.2.0 (2017-05-02)
-------------------
+==================
 
 - Add support for Python 3.6.
 
 - Fix a NameError in the idpicker under Python 3.6.
   See `issue 7 <https://github.com/zopefoundation/zope.pluggableauth/issues/7>`_.
 
 2.1.0 (2016-07-04)
-------------------
+==================
 
 - Add support for Python 3.5.
 
 - Drop support for Python 2.6.
 
 
 2.0.0 (2014-12-24)
-------------------
+==================
 
 - Add support for Python 3.4.
 
@@ -36,7 +37,7 @@ Changes
 
 
 2.0.0a1 (2013-02-21)
---------------------
+====================
 
 - Add ``tox.ini`` and ``MANIFEST.in``.
 
@@ -52,14 +53,14 @@ Changes
 
 
 1.3 (2011-02-08)
-----------------
+================
 
 - As the ``camefrom`` information is most probably used for a redirect,
   require it to be an absolute URL (see also
   http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30).
 
 1.2 (2010-12-16)
-----------------
+================
 
 - Add a hook to ``SessionCredentialsPlugin`` (``_makeCredentials``) that can
   be overriden in subclasses to store the credentials in the session
@@ -69,7 +70,7 @@ Changes
   currently logged-in users so they don't appear in plain text in the ZODB.
 
 1.1 (2010-10-18)
-----------------
+================
 
 - Move concrete ``IAuthenticatorPlugin`` implementations from
   ``zope.app.authentication`` to ``zope.pluggableauth.plugins``.
@@ -80,12 +81,12 @@ Changes
   the ZMI views.
 
 1.0.3 (2010-07-09)
-------------------
+==================
 
 - Fix dependency declaration.
 
 1.0.2 (2010-07-90)
-------------------
+==================
 
 - Add ``persistent.Persistent`` and ``zope.container.contained.Contained`` as
   bases for ``zope.pluggableauth.plugins.session.SessionCredentialsPlugin``,
@@ -94,12 +95,12 @@ Changes
   (https://mail.zope.org/pipermail/zope-dev/2010-July/040898.html)
 
 1.0.1 (2010-02-11)
-------------------
+==================
 
 * Declare adapter in a new ZCML file : `principalfactories.zcml`.  Avoids
   duplication errors in ``zope.app.authentication``.
 
 1.0 (2010-02-05)
-----------------
+================
 
 * Splitting off from zope.app.authentication

setup.py

@@ -35,11 +35,11 @@ def read(*rnames):
 
 setup(
     name='zope.pluggableauth',
-    version='2.2.1.dev0',
+    version='2.3.0.dev0',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
     description='Pluggable Authentication Utility',
-    long_description= "\n\n".join((
+    long_description="\n\n".join((
         read('README.rst'),
         read('src', 'zope', 'pluggableauth', 'README.rst'),
         read('src', 'zope', 'pluggableauth', 'plugins', 'principalfolder.rst'),
@@ -58,7 +58,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',

src/zope/pluggableauth/authentication.py

@@ -20,13 +20,12 @@
 from zope.interface import implementer
 from zope.pluggableauth import interfaces
 from zope.schema.interfaces import ISourceQueriables
-from zope.site.next import queryNextUtility
-
+from zope.component import queryNextUtility
 
 @implementer(
-        IAuthentication,
-        interfaces.IPluggableAuthentication,
-        ISourceQueriables)
+    IAuthentication,
+    interfaces.IPluggableAuthentication,
+    ISourceQueriables)
 class PluggableAuthentication(BTreeContainer):
 
     authenticatorPlugins = ()

src/zope/pluggableauth/plugins/session.py

@@ -25,7 +25,7 @@
 from zope.session.interfaces import ISession
 from zope.traversing.browser.absoluteurl import absoluteURL
 
-from zope.site import hooks
+from zope.component import hooks
 from zope.pluggableauth.interfaces import ICredentialsPlugin
 
 try:
@@ -385,4 +385,3 @@ def redirectWithComeFrom(request, location):
     # We assume location doesn't have query parameters
     url = '%s?%s' % (location, urlencode({'camefrom': camefrom}))
     request.response.redirect(url)
-

tox.ini

@@ -1,9 +1,20 @@
 [tox]
 envlist =
-    py27, pypy, py34, py35, py36
+    py27, pypy, py34, py35, py36, coverage
 
 [testenv]
 commands =
     zope-testrunner --test-path=src []
 deps =
     .[test]
+
+[testenv:coverage]
+usedevelop = true
+basepython =
+    python2.7
+commands =
+    coverage run -m zope.testrunner --test-path=src []
+    coverage report --fail-under=93
+deps =
+    {[testenv]deps}
+    coverage