Commit 66210cbc authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Remove a great many of the remaining relative imports. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 544a8372

django/contrib/comments/views/comments.py

+8 −4
Original line number Diff line number Diff line 
from __future__ import absolute_import



from django import http

from django.conf import settings

from utils import next_redirect, confirmation_view

from django.contrib import comments

from django.contrib.comments import signals

from django.contrib.comments.views.utils import next_redirect, confirmation_view

from django.core.exceptions import ObjectDoesNotExist, ValidationError

from django.db import models

from django.shortcuts import render_to_response

from django.template import RequestContext

from django.template.loader import render_to_string

from django.utils.html import escape

from django.views.decorators.http import require_POST

from django.contrib import comments

from django.contrib.comments import signals

from django.views.decorators.csrf import csrf_protect

from django.views.decorators.http import require_POST







class CommentPostBadRequest(http.HttpResponseBadRequest):

    """

django/contrib/comments/views/moderation.py

+7 −3
Original line number Diff line number Diff line 
from __future__ import absolute_import



from django import template

from django.conf import settings

from django.shortcuts import get_object_or_404, render_to_response

from django.contrib.auth.decorators import login_required, permission_required

from utils import next_redirect, confirmation_view

from django.contrib import comments

from django.contrib.auth.decorators import login_required, permission_required

from django.contrib.comments import signals

from django.contrib.comments.views.utils import next_redirect, confirmation_view

from django.shortcuts import get_object_or_404, render_to_response

from django.views.decorators.csrf import csrf_protect







@csrf_protect

@login_required

def flag(request, comment_id, next=None):

django/contrib/formtools/tests/urls.py

+5 −2
Original line number Diff line number Diff line
@@ -2,11 +2,14 @@ 
This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only.

"""



from __future__ import absolute_import



from django.conf.urls import patterns, url

from django.contrib.formtools.tests import TestFormPreview, TestWizardClass



from forms import (ContactWizard, Page1, Page2, Page3, TestForm,

    WizardPageOneForm, WizardPageTwoForm, WizardPageThreeForm)

from django.contrib.formtools.tests.forms import (ContactWizard, Page1, Page2,

    Page3, TestForm, WizardPageOneForm, WizardPageTwoForm, WizardPageThreeForm)





urlpatterns = patterns('',

    url(r'^preview/', TestFormPreview(TestForm)),

django/contrib/gis/tests/distapp/tests.py

+4 −1
Original line number Diff line number Diff line 
from __future__ import absolute_import



from django.db import connection

from django.db.models import Q

from django.contrib.gis.geos import GEOSGeometry, LineString
@@ -5,9 +7,10 @@ from django.contrib.gis.measure import D # alias for Distance 
from django.contrib.gis.tests.utils import oracle, postgis, spatialite, no_oracle, no_spatialite

from django.test import TestCase



from models import (AustraliaCity, Interstate, SouthTexasInterstate,

from .models import (AustraliaCity, Interstate, SouthTexasInterstate,

    SouthTexasCity, SouthTexasCityFt, CensusZipcode, SouthTexasZipcode)





class DistanceTest(TestCase):



    # A point we are testing distances with -- using a WGS84

django/contrib/gis/tests/geo3d/tests.py

+14 −12
Original line number Diff line number Diff line 
from __future__ import absolute_import



import os

import re



from django.utils.unittest import TestCase

from django.contrib.gis.db.models import Union, Extent3D

from django.contrib.gis.geos import GEOSGeometry, Point, Polygon

from django.contrib.gis.utils import LayerMapping, LayerMapError



from models import (City3D, Interstate2D, Interstate3D,

    InterstateProj2D, InterstateProj3D,

    Point2D, Point3D, MultiPoint3D, Polygon2D, Polygon3D)

from .models import (City3D, Interstate2D, Interstate3D, InterstateProj2D,

    InterstateProj3D, Point2D, Point3D, MultiPoint3D, Polygon2D, Polygon3D)



data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))

city_file = os.path.join(data_path, 'cities', 'cities.shp')
@@ -106,7 +108,7 @@ class Geo3DTest(TestCase): 


    def test01a_3d_layermapping(self):

        "Testing LayerMapping on 3D models."

        from models import Point2D, Point3D

        from .models import Point2D, Point3D



        point_mapping = {'point' : 'POINT'}

        mpoint_mapping = {'mpoint' : 'MULTIPOINT'}