Remove is_valid_path and force_text compat shims.

Author: pelme

pytest_django_test/compat.py

@@ -1,9 +1,3 @@
-try:
-    from django.utils.encoding import force_text  # noqa
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text  # noqa
-
-
 try:
     from urllib2 import urlopen, HTTPError  # noqa
 except ImportError:

pytest_django_test/db_helpers.py

@@ -5,8 +5,7 @@
 import pytest
 
 from django.conf import settings
-
-from .compat import force_text
+from django.utils.encoding import force_text
 
 
 # Construct names for the "inner" database used in runpytest tests

tests/test_fixtures.py

@@ -12,10 +12,11 @@
 from django.conf import settings as real_settings
 from django.test.client import Client, RequestFactory
 from django.test.testcases import connections_support_transactions
+from django.utils.encoding import force_text
 
 from pytest_django.lazy_django import get_django_version
 from pytest_django_test.app.models import Item
-from pytest_django_test.compat import force_text, HTTPError, urlopen
+from pytest_django_test.compat import HTTPError, urlopen
 
 
 def test_client(client):
@@ -156,10 +157,7 @@ def test_serve_static_with_staticfiles_app(self, django_testdir, settings):
         """
         django_testdir.create_test_module("""
             import pytest
-            try:
-                from django.utils.encoding import force_text
-            except ImportError:
-                from django.utils.encoding import force_unicode as force_text
+            from django.utils.encoding import force_text
 
             try:
                 from urllib2 import urlopen, HTTPError
@@ -235,7 +233,7 @@ def admin_required_view(request):
                     Template('Access denied').render(Context()))
         """, 'views.py')
     django_testdir.makepyfile("""
-        from pytest_django_test.compat import force_text
+        from django.utils.encoding import force_text
         from tpkg.app.models import MyCustomUser
 
         def test_custom_user_model(admin_client):

tests/test_urls.py

@@ -1,26 +1,7 @@
 import pytest
 from django.conf import settings
-
-from pytest_django_test.compat import force_text
-
-
-try:
-    from django.core.urlresolvers import is_valid_path
-except ImportError:
-    from django.core.urlresolvers import resolve, Resolver404
-
-    def is_valid_path(path, urlconf=None):
-        """Return True if path resolves against default URL resolver
-
-        This is a convenience method to make working with "is this a
-        match?" cases easier, avoiding unnecessarily indented
-        try...except blocks.
-        """
-        try:
-            resolve(path, urlconf)
-            return True
-        except Resolver404:
-            return False
+from django.core.urlresolvers import is_valid_path
+from django.utils.encoding import force_text
 
 
 @pytest.mark.urls('pytest_django_test.urls_overridden')