From bd0dcc6c89e262780df3c17f18b2462f50b48137 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 18 Jul 2013 11:10:49 -0400 Subject: [PATCH] Fixed #20766 -- Deprecated FastCGI support. --- django/core/management/commands/runfcgi.py | 8 +++++++- docs/howto/deployment/fastcgi.txt | 3 +++ docs/howto/deployment/index.txt | 8 +++++++- docs/index.txt | 2 +- docs/internals/deprecation.txt | 3 +++ docs/ref/django-admin.txt | 3 +++ docs/topics/install.txt | 9 ++++----- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/django/core/management/commands/runfcgi.py b/django/core/management/commands/runfcgi.py index a60d4ebc59..4e9331fc80 100644 --- a/django/core/management/commands/runfcgi.py +++ b/django/core/management/commands/runfcgi.py @@ -1,3 +1,5 @@ +import warnings + from django.core.management.base import BaseCommand class Command(BaseCommand): @@ -5,6 +7,10 @@ class Command(BaseCommand): args = '[various KEY=val options, use `runfcgi help` for help]' def handle(self, *args, **options): + warnings.warn( + "FastCGI support has been deprecated and will be removed in Django 1.9.", + PendingDeprecationWarning) + from django.conf import settings from django.utils import translation # Activate the current language, because it won't get activated later. @@ -14,7 +20,7 @@ class Command(BaseCommand): pass from django.core.servers.fastcgi import runfastcgi runfastcgi(args) - + def usage(self, subcommand): from django.core.servers.fastcgi import FASTCGI_HELP return FASTCGI_HELP diff --git a/docs/howto/deployment/fastcgi.txt b/docs/howto/deployment/fastcgi.txt index 507e50d1a2..cc8d00966c 100644 --- a/docs/howto/deployment/fastcgi.txt +++ b/docs/howto/deployment/fastcgi.txt @@ -2,6 +2,9 @@ How to use Django with FastCGI, SCGI, or AJP ============================================ +.. deprecated:: 1.7 + FastCGI support is deprecated and will be removed in Django 1.9. + .. highlight:: bash Although :doc:`WSGI` is the preferred deployment diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt index ed4bcf3d4a..8b0368ac67 100644 --- a/docs/howto/deployment/index.txt +++ b/docs/howto/deployment/index.txt @@ -10,9 +10,15 @@ ways to easily deploy Django: :maxdepth: 1 wsgi/index - fastcgi checklist +FastCGI support is deprecated and will be removed in Django 1.9. + +.. toctree:: + :maxdepth: 1 + + fastcgi + If you're new to deploying Django and/or Python, we'd recommend you try :doc:`mod_wsgi ` first. In most cases it'll be the easiest, fastest, and most stable deployment choice. diff --git a/docs/index.txt b/docs/index.txt index 7f9d1bd032..8f46db8eb9 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -190,7 +190,7 @@ testing of Django applications: * **Deployment:** :doc:`Overview ` | :doc:`WSGI servers ` | - :doc:`FastCGI/SCGI/AJP ` | + :doc:`FastCGI/SCGI/AJP ` (deprecated) | :doc:`Deploying static files ` | :doc:`Tracking code errors by email ` diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 7f93e1dc58..f7036d13bd 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -418,6 +418,9 @@ these changes. :ref:`initial SQL data` in ``myapp/models/sql/``. Move your custom SQL files to ``myapp/sql/``. +* FastCGI support via the ``runfcgi`` management command will be + removed. Please deploy your project using WSGI. + 2.0 --- diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index d16766618a..31c6a0f660 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -577,6 +577,9 @@ runfcgi [options] .. django-admin:: runfcgi +.. deprecated:: 1.7 + FastCGI support is deprecated and will be removed in Django 1.9. + Starts a set of FastCGI processes suitable for use with any Web server that supports the FastCGI protocol. See the :doc:`FastCGI deployment documentation ` for details. Requires the Python FastCGI module from diff --git a/docs/topics/install.txt b/docs/topics/install.txt index 9cf02d96de..5bcc3f64ec 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -59,11 +59,10 @@ installed. If you can't use mod_wsgi for some reason, fear not: Django supports many other deployment options. One is :doc:`uWSGI `; it works -very well with `nginx`_. Another is :doc:`FastCGI `, -perfect for using Django with servers other than Apache. Additionally, Django -follows the WSGI spec (:pep:`3333`), which allows it to run on a variety of -server platforms. See the `server-arrangements wiki page`_ for specific -installation instructions for each platform. +very well with `nginx`_. Additionally, Django follows the WSGI spec +(:pep:`3333`), which allows it to run on a variety of server platforms. See the +`server-arrangements wiki page`_ for specific installation instructions for +each platform. .. _Apache: http://httpd.apache.org/ .. _nginx: http://nginx.org/