Stop newer version of pytest from traversing .tox directories looking for test files to run.
Incorrect name for descriptor __delete__ method.
Start dropping use of six module from test scripts.