Bring the package to 2018.

.coveragerc

@@ -0,0 +1,3 @@
+[run]
+source = z3c.password
+omit = */test*

.gitignore

@@ -4,6 +4,7 @@
 __pycache__
 src/*.egg-info
 
+.coverage
 .installed.cfg
 .tox
 bin

.travis.yml

@@ -1,12 +1,28 @@
 language: python
-sudo: false
-env:
-    - TOXENV=py26
-    - TOXENV=py27
-    - TOXENV=py33
+matrix:
+    include:
+        - os: linux
+          python: 2.7
+        - os: linux
+          python: 3.6
+        - os: linux
+          python: 3.7
+          dist: xenial
+          sudo: true
+        - os: linux
+          python: pypy
+        - os: linux
+          python: pypy3
+
 install:
-    - travis_retry pip install tox
+    - travis_retry pip install .[test]
+    - travis_retry pip install coverage coveralls tox zope.testing
+
 script:
-    - tox
+    - coverage run setup.py test -q
+
 notifications:
     email: false
+
+after_success:
+  - coveralls

CHANGES.txt

@@ -2,11 +2,14 @@
 CHANGES
 =======
 
-1.0.0a2 (unreleased)
---------------------
+1.0.0 (unreleased)
+------------------
 
-- Nothing changed yet.
+- Add support for Python 3.6 and 3.7. Drop support for Python 3.5 and
+  below. Drop Python 2.6 support.
 
+- Drop support for ``None`` passwords, since they are not supported in the
+  underlying APIs anymore.
 
 1.0.0a1 (2013-02-28)
 --------------------

README.txt

@@ -1,3 +1,16 @@
+
+.. image:: https://travis-ci.org/zopefoundation/z3c.password.png?branch=master
+   :target: https://travis-ci.org/zopefoundation/z3c.password
+
+.. image:: https://coveralls.io/repos/github/zopefoundation/z3c.password/badge.svg?branch=master
+   :target: https://coveralls.io/github/zopefoundation/z3c.password?branch=master
+
+.. image:: https://img.shields.io/pypi/v/z3c.password.svg
+    :target: https://pypi.python.org/pypi/z3c.password
+
+.. image:: https://img.shields.io/pypi/pyversions/z3c.password.svg
+    :target: https://pypi.python.org/pypi/z3c.password/
+
 This package provides an API and implementation of a password generation and
 verification utility. A high-security implementation is provided that is
 suitable for banks and other high-security institutions. The package also

setup.py

@@ -39,11 +39,12 @@ def read(*rnames):
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
+        "Programming Language :: Python :: Implementation :: PyPy",
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',

src/z3c/password/principal.txt

@@ -906,26 +906,6 @@ Something else works:
 
   >>> user.setPassword('789789')
 
-Corner case. The password ``None`` is a special case, it signals that the
-user is disabled.
-
-But ``None`` works only with the ``Plain Text`` password manager.
-
-  >>> user.setPassword('790789', passwordManagerName="Plain Text")
-
-That means, it should be possible to set the password to ``None`` anytime,
-regardless of disallowPasswordReuse.
-
-  >>> user.setPassword(None)
-
-  >>> user.setPassword('890789')
-
-  >>> user.setPassword(None)
-
-  >>> user.setPassword('891789')
-
-  >>> user.setPassword(None)
-
 
 ``passwordOptionsUtilityName``
 ------------------------------