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
This commit is contained in:
Alex Gaynor 2011-10-13 21:34:56 +00:00
parent f830166167
commit 8c0eefd066
144 changed files with 580 additions and 265 deletions

View file

@ -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'),

View file

@ -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"),

View file

@ -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"),

View file

@ -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')

View file

@ -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"),

View file

@ -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"),

View file

@ -1,4 +1,7 @@
import urlconf_inner
from __future__ import absolute_import
from . import urlconf_inner
class ChangeURLconfMiddleware(object):
def process_request(self, request):

View file

@ -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"),

View file

@ -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):

View file

@ -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'),

View file

@ -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)

View file

@ -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('',

View file

@ -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'),

View file

@ -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('')

View file

@ -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"),