Convert the remainder of the relative imports in the tests to be absolute imports.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37

15 files changed, 73 insertions, 22 deletions

diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/regressiontests/urlpatterns_reverse/extra_urls.py
index 4dbfb90c22..c737f8b5c4 100644
--- a/tests/regressiontests/urlpatterns_reverse/extra_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/extra_urls.py
@@ -2,8 +2,12 @@
 Some extra URL patterns that are included at the top level.
 """
 
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('',
     url(r'^e-places/(\d+)/$', empty_view, name='extra-places'),
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
index 32d2b2976b..af03097df1 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
@@ -1,5 +1,9 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('',
     url(r'^$', empty_view, name="named-url3"),
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
index 2a9779d64f..b31bdb1f7e 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
+++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
@@ -1,5 +1,9 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('',
     url(r'^$', empty_view, name="named-url5"),
diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
index c878f97716..2743f67eea 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
@@ -1,6 +1,10 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
-from namespace_urls import URLObject
-from views import view_class_instance
+
+from .namespace_urls import URLObject
+from .views import view_class_instance
+
 
 testobj3 = URLObject('testapp', 'test-ns3')
 
diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/regressiontests/urlpatterns_reverse/included_urls.py
index ae2c626336..c8c9001843 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/included_urls.py
@@ -1,5 +1,9 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('',
     url(r'^$', empty_view, name="inner-nothing"),
diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_urls2.py
index b6fb4c6a6a..98605047f4 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_urls2.py
+++ b/tests/regressiontests/urlpatterns_reverse/included_urls2.py
@@ -5,8 +5,12 @@ each name to resolve and Django must distinguish the possibilities based on the
 argument list.
 """
 
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('',
     url(r'^part/(?P<value>\w+)/$', empty_view, name="part"),
diff --git a/tests/regressiontests/urlpatterns_reverse/middleware.py b/tests/regressiontests/urlpatterns_reverse/middleware.py
index 7bc42f8df4..03749e9570 100644
--- a/tests/regressiontests/urlpatterns_reverse/middleware.py
+++ b/tests/regressiontests/urlpatterns_reverse/middleware.py
@@ -1,4 +1,7 @@
-import urlconf_inner
+from __future__ import absolute_import
+
+from . import urlconf_inner
+
 
 class ChangeURLconfMiddleware(object):
     def process_request(self, request):
diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/regressiontests/urlpatterns_reverse/named_urls.py
index fa71f53c17..8df336cf4b 100644
--- a/tests/regressiontests/urlpatterns_reverse/named_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/named_urls.py
@@ -1,5 +1,9 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('',
     url(r'^$', empty_view, name="named-url1"),
diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
index 5a516f92cc..5f9db2519d 100644
--- a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
@@ -1,5 +1,9 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
-from views import view_class_instance
+
+from .views import view_class_instance
+
 
 class URLObject(object):
     def __init__(self, app_name, namespace):
diff --git a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py
index 5d336268d9..693c6e1b38 100644
--- a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py
@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url
 
-from views import empty_view, LazyRedirectView, login_required_view
+from .views import empty_view, LazyRedirectView, login_required_view
 
 urlpatterns = patterns('',
     url(r'^redirected_to/$', empty_view, name='named-lazy-url-redirected-to'),
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index 4b656e4909..fd2666f9d5 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -1,6 +1,8 @@
 """
 Unit tests for reverse URL lookups.
 """
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
 from django.core.urlresolvers import (reverse, resolve, NoReverseMatch,
@@ -11,10 +13,8 @@ from django.test import TestCase
 from django.utils import unittest
 from django.contrib.auth.models import User
 
-import urlconf_outer
-import urlconf_inner
-import middleware
-import views
+from . import urlconf_outer, urlconf_inner, middleware, views
+
 
 resolve_test_data = (
     # These entries are in the format: (path, url_name, app_name, namespace, view_func, args, kwargs)
@@ -263,7 +263,7 @@ class ReverseShortcutTests(TestCase):
         self.assertEqual(res['Location'], 'http://example.com/')
 
     def test_redirect_view_object(self):
-        from views import absolute_kwargs_view
+        from .views import absolute_kwargs_view
         res = redirect(absolute_kwargs_view)
         self.assertEqual(res['Location'], '/absolute_arg_view/')
         self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None)
@@ -409,13 +409,13 @@ class ErrorHandlerResolutionTests(TestCase):
         self.callable_resolver = RegexURLResolver(r'^$', urlconf_callables)
 
     def test_named_handlers(self):
-        from views import empty_view
+        from .views import empty_view
         handler = (empty_view, {})
         self.assertEqual(self.resolver.resolve404(), handler)
         self.assertEqual(self.resolver.resolve500(), handler)
 
     def test_callable_handers(self):
-        from views import empty_view
+        from .views import empty_view
         handler = (empty_view, {})
         self.assertEqual(self.callable_resolver.resolve404(), handler)
         self.assertEqual(self.callable_resolver.resolve500(), handler)
diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
index 0762fc5db0..0cdebf83ff 100644
--- a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
+++ b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
 
-import urlconf_inner
+from . import urlconf_inner
 
 
 urlpatterns = patterns('',
diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
index 6a324f042d..5bde2b0a7e 100644
--- a/tests/regressiontests/urlpatterns_reverse/urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/urls.py
@@ -1,5 +1,9 @@
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url, include
-from views import empty_view, absolute_kwargs_view
+
+from .views import empty_view, absolute_kwargs_view
+
 
 other_patterns = patterns('',
     url(r'non_path_include/$', empty_view, name='non_path_include'),
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py
index c3d4855086..fe2d3137e9 100644
--- a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py
+++ b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py
@@ -1,7 +1,11 @@
 # Used by the ErrorHandlerResolutionTests test case.
 
+from __future__ import absolute_import
+
 from django.conf.urls import patterns
-from views import empty_view
+
+from .views import empty_view
+
 
 urlpatterns = patterns('')
 
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py
index 0e58a157cf..ca3e424f23 100644
--- a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py
+++ b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py
@@ -1,8 +1,12 @@
 # A URLs file that doesn't use the default
 # from django.conf.urls import *
 # import pattern.
+from __future__ import absolute_import
+
 from django.conf.urls import patterns, url
-from views import empty_view, bad_view
+
+from .views import empty_view, bad_view
+
 
 urlpatterns = patterns('',
     url(r'^test_view/$', empty_view, name="test_view"),