summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-11-02 18:30:31 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-11-02 18:30:31 +0000
commita25718c157938e0bdbba7c9e9ee021ea654b1577 (patch)
tree3b7e98b04110c6eaf30a6f01b5dfa00f1dd2f821
parent72e3bc6e6f6035e3657069790391ce5058d95e20 (diff)
[1.2.X] Fixed #14559 -- corrected some typos and misleading docstrings. Thanks to Gabriel Hurley for the patch. Backport of [14441].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/dispatch/dispatcher.py10
-rw-r--r--django/middleware/common.py2
2 files changed, 6 insertions, 6 deletions
diff --git a/django/dispatch/dispatcher.py b/django/dispatch/dispatcher.py
index de09334637..30245a79c5 100644
--- a/django/dispatch/dispatcher.py
+++ b/django/dispatch/dispatcher.py
@@ -41,7 +41,7 @@ class Signal(object):
A function or an instance method which is to receive signals.
Receivers must be hashable objects.
- if weak is True, then receiver must be weak-referencable (more
+ If weak is True, then receiver must be weak-referencable (more
precisely saferef.safeRef() must be able to create a reference
to the receiver).
@@ -52,11 +52,11 @@ class Signal(object):
dispatch_uid.
sender
- The sender to which the receiver should respond Must either be
+ The sender to which the receiver should respond. Must either be
of type Signal, or None to receive events from any sender.
weak
- Whether to use weak references to the receiver By default, the
+ Whether to use weak references to the receiver. By default, the
module will attempt to use weak references to the receiver
objects. If this parameter is false, then strong references will
be used.
@@ -170,7 +170,7 @@ class Signal(object):
Arguments:
sender
- The sender of the signal Can be any python object (normally one
+ The sender of the signal. Can be any python object (normally one
registered with a connect if you actually want something to
occur).
@@ -182,7 +182,7 @@ class Signal(object):
Return a list of tuple pairs [(receiver, response), ... ]. May raise
DispatcherKeyError.
- if any receiver raises an error (specifically any subclass of
+ If any receiver raises an error (specifically any subclass of
Exception), the error instance is returned as the result for that
receiver.
"""
diff --git a/django/middleware/common.py b/django/middleware/common.py
index 309058870a..0be89d4382 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -80,7 +80,7 @@ class CommonMiddleware(object):
return http.HttpResponsePermanentRedirect(newurl)
def process_response(self, request, response):
- "Check for a flat page (for 404s) and calculate the Etag, if needed."
+ "Send broken link emails and calculate the Etag, if needed."
if response.status_code == 404:
if settings.SEND_BROKEN_LINK_EMAILS:
# If the referrer was from an internal link or a non-search-engine site,