From fff69c18c185906fd41389f50b463b3dc57a09b3 Mon Sep 17 00:00:00 2001
From: Justin Bronn <jbronn@gmail.com>
Date: Sun, 20 Jul 2008 01:48:23 +0000
Subject: [PATCH] gis: Removed vestige code containing references to the now
 defunct 'NoField' database creation type and `Field.get_placeholder` (which
 should only exist on the `GeometryField` subclass).

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/backends/mysql/creation.py      | 1 -
 django/db/backends/oracle/creation.py     | 1 -
 django/db/backends/postgresql/creation.py | 1 -
 django/db/backends/sqlite3/creation.py    | 1 -
 django/db/models/fields/__init__.py       | 4 ----
 django/db/models/fields/related.py        | 3 ---
 6 files changed, 11 deletions(-)

diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py
index e00a34723b..698b07548d 100644
--- a/django/db/backends/mysql/creation.py
+++ b/django/db/backends/mysql/creation.py
@@ -25,5 +25,4 @@ DATA_TYPES = {
     'TextField':         'longtext',
     'TimeField':         'time',
     'USStateField':      'varchar(2)',
-    'NoField':            None,
 }
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
index 57de8430f8..2a8badebd5 100644
--- a/django/db/backends/oracle/creation.py
+++ b/django/db/backends/oracle/creation.py
@@ -33,7 +33,6 @@ DATA_TYPES = {
     'TimeField':                    'TIMESTAMP',
     'URLField':                     'VARCHAR2(%(max_length)s)',
     'USStateField':                 'CHAR(2)',
-    'NoField':           None,
 }
 
 TEST_DATABASE_PREFIX = 'test_'
diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py
index 502fe66bab..a8877a7d9b 100644
--- a/django/db/backends/postgresql/creation.py
+++ b/django/db/backends/postgresql/creation.py
@@ -25,5 +25,4 @@ DATA_TYPES = {
     'TextField':         'text',
     'TimeField':         'time',
     'USStateField':      'varchar(2)',
-    'NoField':           '',
 }
diff --git a/django/db/backends/sqlite3/creation.py b/django/db/backends/sqlite3/creation.py
index 0ff502734d..c1c2b3170d 100644
--- a/django/db/backends/sqlite3/creation.py
+++ b/django/db/backends/sqlite3/creation.py
@@ -24,5 +24,4 @@ DATA_TYPES = {
     'TextField':                    'text',
     'TimeField':                    'time',
     'USStateField':                 'varchar(2)',
-    'NoField':                      None,
 }
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 5a144c7874..78f75aea35 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -280,10 +280,6 @@ class Field(object):
         """
         return [name_prefix + self.name]
 
-    def get_placeholder(self, value):
-        "Returns the placeholder substitution string for the field with the given value."
-        return '%s'
-
     def prepare_field_objs_and_params(self, manipulator, name_prefix):
         params = {'validator_list': self.validator_list[:]}
         if self.max_length and not self.choices: # Don't give SelectFields a max_length parameter.
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index ba6846a72d..735dda4969 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -729,9 +729,6 @@ class ManyToManyField(RelatedField, Field):
         msg = ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.')
         self.help_text = string_concat(self.help_text, ' ', msg)
 
-    def get_internal_type(self):
-        return "NoField"
-
     def get_manipulator_field_objs(self):
         choices = self.get_choices_default()
         return [curry(oldforms.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]