Use six to detect python2/3 in test modules.
5 files changed