From 0622bca5d1b25877167b7beda96edcd3ba58db8d Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 17 Jan 2015 19:00:12 -0500
Subject: [PATCH] Removed the validate management command per deprecation
 timeline.

---
 django/core/management/commands/validate.py | 16 ----------------
 docs/man/django-admin.1                     |  3 ---
 docs/ref/django-admin.txt                   | 11 -----------
 docs/releases/1.7.txt                       |  5 +++--
 tests/logging_tests/tests.py                |  4 ++--
 tests/urlpatterns_reverse/tests.py          |  2 +-
 6 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 django/core/management/commands/validate.py

diff --git a/django/core/management/commands/validate.py b/django/core/management/commands/validate.py
deleted file mode 100644
index 9383746f1f..0000000000
--- a/django/core/management/commands/validate.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import warnings
-
-from django.core.management.commands.check import Command as CheckCommand
-from django.utils.deprecation import RemovedInDjango19Warning
-
-
-class Command(CheckCommand):
-    help = 'Deprecated. Use "check" command instead. ' + CheckCommand.help
-
-    def handle(self, **options):
-        warnings.warn('"validate" has been deprecated in favor of "check".',
-            RemovedInDjango19Warning)
-        super(Command, self).handle(**options)
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 994c95c816..32321b4f3c 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -113,9 +113,6 @@ no apps are specified
 .BI "testserver [" "\-\-addrport=ipaddr|port" "] [" "fixture fixture ..." "]"
 Runs the test suite for the specified applications, or the entire project if
 no apps are specified
-.TP
-.BI validate
-Validates all installed models.
 .SH "OPTIONS"
 .TP
 .I \-\-version
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index a437c0f764..558afe3c2b 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1343,17 +1343,6 @@ To run on 1.2.3.4:7000 with a ``test`` fixture::
 The :djadminopt:`--noinput` option may be provided to suppress all user
 prompts.
 
-validate
---------
-
-.. django-admin:: validate
-
-.. deprecated:: 1.7
-    Replaced by the :djadmin:`check` command.
-
-Validates all installed models (according to the :setting:`INSTALLED_APPS`
-setting) and prints validation errors to standard output.
-
 Commands provided by applications
 =================================
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 040190241c..b8fe9b257f 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -222,7 +222,7 @@ resolving those problems. The framework is extensible so you can add your
 own checks for your own apps and libraries.
 
 To perform system checks, you use the :djadmin:`check` management command.
-This command replaces the older :djadmin:`validate` management command.
+This command replaces the older ``validate`` management command.
 
 New ``Prefetch`` object for advanced ``prefetch_related`` operations.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1681,7 +1681,8 @@ deprecated, use ``SplitDateTimeWidget`` with
 ``validate``
 ~~~~~~~~~~~~
 
-:djadmin:`validate` command is deprecated in favor of :djadmin:`check` command.
+The ``validate`` management command is deprecated in favor of the
+:djadmin:`check` command.
 
 ``django.core.management.BaseCommand``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py
index af03e47d09..65b2be4135 100644
--- a/tests/logging_tests/tests.py
+++ b/tests/logging_tests/tests.py
@@ -385,7 +385,7 @@ class SettingsConfigTest(AdminScriptTestCase):
 
     def test_circular_dependency(self):
         # validate is just an example command to trigger settings configuration
-        out, err = self.run_manage(['validate'])
+        out, err = self.run_manage(['check'])
         self.assertNoOutput(err)
         self.assertOutput(out, "System check identified no issues (0 silenced).")
 
@@ -466,6 +466,6 @@ format=%(message)s
         self.remove_settings('settings.py')
 
     def test_custom_logging(self):
-        out, err = self.run_manage(['validate'])
+        out, err = self.run_manage(['check'])
         self.assertNoOutput(err)
         self.assertOutput(out, "System check identified no issues (0 silenced).")
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index bb732d2fec..a9dffdc162 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -333,7 +333,7 @@ LOGIN_URL = reverse_lazy('login')""")
         self.remove_settings('settings.py')
 
     def test_lazy_in_settings(self):
-        out, err = self.run_manage(['validate'])
+        out, err = self.run_manage(['check'])
         self.assertNoOutput(err)