From c8973d1fba33293f2454d9be0996a5c083f814bf Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Thu, 1 Oct 2015 14:35:34 +0200 Subject: [PATCH] Fixed Python 2.6 tests, and fixed tox.ini from PR #162 for python 3 --- polymorphic/tests.py | 2 +- tox.ini | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 13cb3ba..14def4d 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -6,7 +6,7 @@ from __future__ import print_function import uuid import re import django -from unittest import skipIf +from django.utils.unittest import skipIf from django.db.models.query import QuerySet from django.test import TestCase diff --git a/tox.ini b/tox.ini index a40ff2f..5a551f2 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,10 @@ envlist= py26-django{14,15,16}, py27-django{14,15,16,17,18}, - py32-django{14,15,16,17,18}, - py33-django{14,15,16,17,18}, - py34-django{14,15,16,17,18}, + py32-django{15,16,17,18}, + py33-django{15,16,17,18}, + py34-django{15,16,17,18}, + # py33-django-dev, docs, [testenv]