From adcad20b48476c89fc57c993ac10b84a1f7805ab Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Wed, 21 Oct 2015 22:40:55 -0300
Subject: [PATCH] Update all tests (and runtests.py)

---
 polymorphic/query_translate.py |  2 +-
 polymorphic/tests.py           | 10 ++++++++--
 runtests.py                    |  6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/polymorphic/query_translate.py b/polymorphic/query_translate.py
index 4008e61..0fc479c 100644
--- a/polymorphic/query_translate.py
+++ b/polymorphic/query_translate.py
@@ -234,7 +234,7 @@ def _create_model_filter_Q(modellist, not_instance_of=False):
     if not modellist:
         return None
 
-    from .polymorphic_model import PolymorphicModel
+    from .models import PolymorphicModel
 
     if type(modellist) != list and type(modellist) != tuple:
         if issubclass(modellist, PolymorphicModel):
diff --git a/polymorphic/tests.py b/polymorphic/tests.py
index 14def4d..4deac67 100644
--- a/polymorphic/tests.py
+++ b/polymorphic/tests.py
@@ -6,7 +6,11 @@ from __future__ import print_function
 import uuid
 import re
 import django
-from django.utils.unittest import skipIf
+try:
+    from unittest import skipIf
+except:
+    # python<2.7
+    from django.utils.unittest import skipIf
 from django.db.models.query import QuerySet
 
 from django.test import TestCase
@@ -15,7 +19,9 @@ from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.utils import six
 
-from polymorphic import PolymorphicModel, PolymorphicManager, PolymorphicQuerySet
+from polymorphic.models import PolymorphicModel
+from polymorphic.manager import PolymorphicManager
+from polymorphic.query import PolymorphicQuerySet
 from polymorphic import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent
 from polymorphic.tools_for_tests import UUIDField
 
diff --git a/runtests.py b/runtests.py
index 6120a17..57d92a1 100755
--- a/runtests.py
+++ b/runtests.py
@@ -30,8 +30,10 @@ if not settings.configured:
         TEMPLATE_LOADERS = (
             'django.template.loaders.app_directories.Loader',
         ),
-        TEMPLATE_CONTEXT_PROCESSORS = default_settings.TEMPLATE_CONTEXT_PROCESSORS + (
-            'django.core.context_processors.request',
+        TEMPLATE_CONTEXT_PROCESSORS=(
+            default_settings.TEMPLATE_CONTEXT_PROCESSORS + [
+                'django.core.context_processors.request',
+            ]
         ),
         TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1,7) else 'django.test.simple.DjangoTestSuiteRunner',
         INSTALLED_APPS = (