From 75c4013a21978bea08cf947b8f96aac0553d69d0 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Mon, 23 Jan 2006 02:41:01 +0000
Subject: [PATCH] magic-removal: Moved FieldDoesNotExist exception to
 django.db.models.fields and removed django.db.models.exceptions

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/models/__init__.py        | 1 -
 django/db/models/exceptions.py      | 2 --
 django/db/models/fields/__init__.py | 3 +++
 django/db/models/options.py         | 3 +--
 django/db/models/query.py           | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 django/db/models/exceptions.py

diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 3af53b4b74..e371b1e37c 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -8,7 +8,6 @@ from django.db.models.manager import Manager
 from django.db.models.base import Model, AdminOptions
 from django.db.models.fields import *
 from django.db.models.fields.related import *
-from django.db.models.exceptions import FieldDoesNotExist
 from django.db.models import signals
 from django.utils.functional import curry
 from django.utils.text import capfirst
diff --git a/django/db/models/exceptions.py b/django/db/models/exceptions.py
deleted file mode 100644
index 4154ad426e..0000000000
--- a/django/db/models/exceptions.py
+++ /dev/null
@@ -1,2 +0,0 @@
-class FieldDoesNotExist(Exception):
-    pass
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 8a4de9fe04..b0883f1e73 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -25,6 +25,9 @@ prep_for_like_query = lambda x: str(x).replace("%", "\%").replace("_", "\_")
 # returns the <ul> class for a given radio_admin value
 get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '')
 
+class FieldDoesNotExist(Exception):
+    pass
+
 def manipulator_validator_unique(f, opts, self, field_data, all_data):
     "Validates that the value is unique for this field."
     lookup_type = f.get_validator_unique_lookup_type()
diff --git a/django/db/models/options.py b/django/db/models/options.py
index 3d9abf9397..b0e3385fe5 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -1,9 +1,8 @@
 from django.db.models.related import RelatedObject
 from django.db.models.fields.related import ManyToMany
-from django.db.models.fields import AutoField
+from django.db.models.fields import AutoField, FieldDoesNotExist
 from django.db.models.loading import get_models
 from django.db.models.query import orderlist2sql
-from django.db.models.exceptions import FieldDoesNotExist
 from bisect import bisect
 import re
 
diff --git a/django/db/models/query.py b/django/db/models/query.py
index a5f2f7aec4..1a65286998 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1,5 +1,5 @@
 from django.db import backend, connection
-from django.db.models.exceptions import *
+from django.db.models.fields import FieldDoesNotExist
 from django.utils.datastructures import SortedDict
 
 LOOKUP_SEPARATOR = '__'