From 1edaa09f25ba5d548a3ae1d84a4694e9fe439969 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Sat, 14 Jan 2006 19:32:47 +0000 Subject: [PATCH] magic-removal: Fixed #1223. Thanks nick at efford dot net. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1959 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/parts/auth/formfields.py | 2 +- django/views/registration/passwords.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/parts/auth/formfields.py b/django/parts/auth/formfields.py index 51f36941bb..cb54c680a5 100644 --- a/django/parts/auth/formfields.py +++ b/django/parts/auth/formfields.py @@ -1,4 +1,4 @@ -from django.models.auth import User +from django.contrib.auth.models import User from django.core import validators from django import forms diff --git a/django/views/registration/passwords.py b/django/views/registration/passwords.py index 864efaba00..b5fd2daa64 100644 --- a/django/views/registration/passwords.py +++ b/django/views/registration/passwords.py @@ -2,8 +2,8 @@ from django import forms from django.core import validators from django.core.extensions import render_to_response from django.template import Context, RequestContext, loader -from django.models.auth import User -from django.models.core import Site +from django.contrib.auth.models import User +from django.contrib.sites.models import Site from django.views.decorators.auth import login_required from django.http import HttpResponseRedirect