innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Part 3 of pedant day: replaced all tabs in Django with spaces. Python the way Guido intended it, baby! 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2006-07-21 20:48:17 +00:00
parent a926046ba6
commit 1687b025dc
18 changed files with 775 additions and 777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/media/css/changelists.css
View File

@ -42,9 +42,9 @@
/* PAGINATOR */ /* PAGINATOR */
.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } .paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; }
.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } .paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; }
.paginator a.showall { padding:0 !important; border:none !important; } .paginator a.showall { padding:0 !important; border:none !important; }
.paginator a.showall:hover { color:#036 !important; background:transparent !important; } .paginator a.showall:hover { color:#036 !important; background:transparent !important; }
.paginator .end { border-width:2px !important; margin-right:6px; } .paginator .end { border-width:2px !important; margin-right:6px; }
.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } .paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; }
.paginator a:hover { color:white; background:#5b80b2; border-color:#036; } .paginator a:hover { color:white; background:#5b80b2; border-color:#036; }

4
django/contrib/admin/media/css/forms.css
View File

@ -7,10 +7,10 @@
form .form-row p { padding-left:0; font-size:11px; } form .form-row p { padding-left:0; font-size:11px; }
/* FORM LABELS */ /* FORM LABELS */
form h4 { margin:0 !important; padding:0 !important; border:none !important; } form h4 { margin:0 !important; padding:0 !important; border:none !important; }
label { font-weight:normal !important; color:#666; font-size:12px; } label { font-weight:normal !important; color:#666; font-size:12px; }
label.inline { margin-left:20px; } label.inline { margin-left:20px; }
.required label, label.required { font-weight:bold !important; color:#333 !important; } .required label, label.required { font-weight:bold !important; color:#333 !important; }
/* RADIO BUTTONS */ /* RADIO BUTTONS */
form ul.radiolist li { list-style-type:none; } form ul.radiolist li { list-style-type:none; }

6
django/contrib/admin/media/css/global.css
View File

@ -31,7 +31,7 @@ fieldset { margin:0; padding:0; }
blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; } blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; }
code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; } code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; }
pre.literal-block { margin:10px; background:#eee; padding:6px 8px; } pre.literal-block { margin:10px; background:#eee; padding:6px 8px; }
code strong { color:#930; } code strong { color:#930; }
hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; } hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; }
/* TEXT STYLES & MODIFIERS */ /* TEXT STYLES & MODIFIERS */
@ -81,7 +81,7 @@ table.orderable tbody tr td:first-child { padding-left:14px; background-image:ur
table.orderable-initalized .order-cell, body>tr>td.order-cell { display:none; } table.orderable-initalized .order-cell, body>tr>td.order-cell { display:none; }
/* FORM DEFAULTS */ /* FORM DEFAULTS */
input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; } input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; }
textarea { vertical-align:top !important; } textarea { vertical-align:top !important; }
input[type=text], input[type=password], textarea, select, .vTextField { border:1px solid #ccc; } input[type=text], input[type=password], textarea, select, .vTextField { border:1px solid #ccc; }
@ -92,7 +92,7 @@ input[type=submit].default, .submit-row input.default { border:2px solid #5b80b2
input[type=submit].default:active { background-image:url(../img/admin/default-bg-reverse.gif); background-position:top; } input[type=submit].default:active { background-image:url(../img/admin/default-bg-reverse.gif); background-position:top; }
/* MODULES */ /* MODULES */
.module { border:1px solid #ccc; margin-bottom:5px; background:white; } .module { border:1px solid #ccc; margin-bottom:5px; background:white; }
.module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; } .module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; }
.module blockquote { margin-left:12px; } .module blockquote { margin-left:12px; }
.module ul, .module ol { margin-left:1.5em; } .module ul, .module ol { margin-left:1.5em; }

8
django/contrib/admin/media/css/layout.css
View File

@ -4,7 +4,7 @@
#header { width:100%; } #header { width:100%; }
#content-main { float:left; width:100%; } #content-main { float:left; width:100%; }
#content-related { float:right; width:18em; position:relative; margin-right:-19em; } #content-related { float:right; width:18em; position:relative; margin-right:-19em; }
#footer { clear:both; padding:10px; } #footer { clear:both; padding:10px; }
/* COLUMN TYPES */ /* COLUMN TYPES */
.colMS { margin-right:20em !important; } .colMS { margin-right:20em !important; }
@ -16,14 +16,14 @@
.dashboard #content { width:500px; } .dashboard #content { width:500px; }
/* HEADER */ /* HEADER */
#header { background:#417690; color:#ffc; overflow:hidden; } #header { background:#417690; color:#ffc; overflow:hidden; }
#header a:link, #header a:visited { color:white; } #header a:link, #header a:visited { color:white; }
#header a:hover { text-decoration:underline; } #header a:hover { text-decoration:underline; }
#branding h1 { padding:0 10px; font-size:18px; margin:8px 0; font-weight:normal; color:#f4f379; } #branding h1 { padding:0 10px; font-size:18px; margin:8px 0; font-weight:normal; color:#f4f379; }
#branding h2 { padding:0 10px; font-size:14px; margin:-8px 0 8px 0; font-weight:normal; color:#ffc; } #branding h2 { padding:0 10px; font-size:14px; margin:-8px 0 8px 0; font-weight:normal; color:#ffc; }
#user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; } #user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; }
/* SIDEBAR */ /* SIDEBAR */
#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; } #content-related h3 { font-size:12px; color:#666; margin-bottom:3px; }
#content-related h4 { font-size:11px; } #content-related h4 { font-size:11px; }
#content-related .module h2 { background:#eee url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } #content-related .module h2 { background:#eee url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; }

2
django/contrib/admin/media/css/rtl.css
View File

@ -16,7 +16,7 @@ th { text-align: right; }
/* layout styles */ /* layout styles */
#user-tools { right:auto; left:0; text-align:left; } #user-tools { right:auto; left:0; text-align:left; }
div.breadcrumbs { text-align:right; } div.breadcrumbs { text-align:right; }
#content-main { float:right;} #content-main { float:right;}
#content-related { float:left; margin-left:-19em; margin-right:auto;} #content-related { float:left; margin-left:-19em; margin-right:auto;}

144
django/contrib/admin/media/js/admin/CollapsedFieldsets.js
View File

@ -3,83 +3,83 @@
// link when the fieldset is visible. // link when the fieldset is visible.
function findForm(node) { function findForm(node) {
// returns the node of the form containing the given node // returns the node of the form containing the given node
if (node.tagName.toLowerCase() != 'form') { if (node.tagName.toLowerCase() != 'form') {
return findForm(node.parentNode); return findForm(node.parentNode);
} }
return node; return node;
} }
var CollapsedFieldsets = { var CollapsedFieldsets = {
collapse_re: /\bcollapse\b/, // Class of fieldsets that should be dealt with. collapse_re: /\bcollapse\b/, // Class of fieldsets that should be dealt with.
collapsed_re: /\bcollapsed\b/, // Class that fieldsets get when they're hidden. collapsed_re: /\bcollapsed\b/, // Class that fieldsets get when they're hidden.
collapsed_class: 'collapsed', collapsed_class: 'collapsed',
init: function() { init: function() {
var fieldsets = document.getElementsByTagName('fieldset'); var fieldsets = document.getElementsByTagName('fieldset');
var collapsed_seen = false; var collapsed_seen = false;
for (var i = 0, fs; fs = fieldsets[i]; i++) { for (var i = 0, fs; fs = fieldsets[i]; i++) {
// Collapse this fieldset if it has the correct class, and if it // Collapse this fieldset if it has the correct class, and if it
// doesn't have any errors. (Collapsing shouldn't apply in the case // doesn't have any errors. (Collapsing shouldn't apply in the case
// of error messages.) // of error messages.)
if (fs.className.match(CollapsedFieldsets.collapse_re) && !CollapsedFieldsets.fieldset_has_errors(fs)) { if (fs.className.match(CollapsedFieldsets.collapse_re) && !CollapsedFieldsets.fieldset_has_errors(fs)) {
collapsed_seen = true; collapsed_seen = true;
// Give it an additional class, used by CSS to hide it. // Give it an additional class, used by CSS to hide it.
fs.className += ' ' + CollapsedFieldsets.collapsed_class; fs.className += ' ' + CollapsedFieldsets.collapsed_class;
// (<a id="fieldsetcollapser3" class="collapse-toggle" href="#">Show</a>) // (<a id="fieldsetcollapser3" class="collapse-toggle" href="#">Show</a>)
var collapse_link = document.createElement('a'); var collapse_link = document.createElement('a');
collapse_link.className = 'collapse-toggle'; collapse_link.className = 'collapse-toggle';
collapse_link.id = 'fieldsetcollapser' + i; collapse_link.id = 'fieldsetcollapser' + i;
collapse_link.onclick = new Function('CollapsedFieldsets.show('+i+'); return false;'); collapse_link.onclick = new Function('CollapsedFieldsets.show('+i+'); return false;');
collapse_link.href = '#'; collapse_link.href = '#';
collapse_link.innerHTML = gettext('Show'); collapse_link.innerHTML = gettext('Show');
var h2 = fs.getElementsByTagName('h2')[0]; var h2 = fs.getElementsByTagName('h2')[0];
h2.appendChild(document.createTextNode(' (')); h2.appendChild(document.createTextNode(' ('));
h2.appendChild(collapse_link); h2.appendChild(collapse_link);
h2.appendChild(document.createTextNode(')')); h2.appendChild(document.createTextNode(')'));
} }
} }
if (collapsed_seen) { if (collapsed_seen) {
// Expand all collapsed fieldsets when form is submitted. // Expand all collapsed fieldsets when form is submitted.
addEvent(findForm(document.getElementsByTagName('fieldset')[0]), 'submit', function() { CollapsedFieldsets.uncollapse_all(); }); addEvent(findForm(document.getElementsByTagName('fieldset')[0]), 'submit', function() { CollapsedFieldsets.uncollapse_all(); });
} }
}, },
fieldset_has_errors: function(fs) { fieldset_has_errors: function(fs) {
// Returns true if any fields in the fieldset have validation errors. // Returns true if any fields in the fieldset have validation errors.
var divs = fs.getElementsByTagName('div'); var divs = fs.getElementsByTagName('div');
for (var i=0; i<divs.length; i++) { for (var i=0; i<divs.length; i++) {
if (divs[i].className.match(/\berror\b/)) { if (divs[i].className.match(/\berror\b/)) {
return true; return true;
} }
} }
return false; return false;
}, },
show: function(fieldset_index) { show: function(fieldset_index) {
var fs = document.getElementsByTagName('fieldset')[fieldset_index]; var fs = document.getElementsByTagName('fieldset')[fieldset_index];
// Remove the class name that causes the "display: none". // Remove the class name that causes the "display: none".
fs.className = fs.className.replace(CollapsedFieldsets.collapsed_re, ''); fs.className = fs.className.replace(CollapsedFieldsets.collapsed_re, '');
// Toggle the "Show" link to a "Hide" link // Toggle the "Show" link to a "Hide" link
var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index); var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index);
collapse_link.onclick = new Function('CollapsedFieldsets.hide('+fieldset_index+'); return false;'); collapse_link.onclick = new Function('CollapsedFieldsets.hide('+fieldset_index+'); return false;');
collapse_link.innerHTML = gettext('Hide'); collapse_link.innerHTML = gettext('Hide');
}, },
hide: function(fieldset_index) { hide: function(fieldset_index) {
var fs = document.getElementsByTagName('fieldset')[fieldset_index]; var fs = document.getElementsByTagName('fieldset')[fieldset_index];
// Add the class name that causes the "display: none". // Add the class name that causes the "display: none".
fs.className += ' ' + CollapsedFieldsets.collapsed_class; fs.className += ' ' + CollapsedFieldsets.collapsed_class;
// Toggle the "Hide" link to a "Show" link // Toggle the "Hide" link to a "Show" link
var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index); var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index);
collapse_link.onclick = new Function('CollapsedFieldsets.show('+fieldset_index+'); return false;'); collapse_link.onclick = new Function('CollapsedFieldsets.show('+fieldset_index+'); return false;');
collapse_link.innerHTML = gettext('Show'); collapse_link.innerHTML = gettext('Show');
}, },
uncollapse_all: function() { uncollapse_all: function() {
var fieldsets = document.getElementsByTagName('fieldset'); var fieldsets = document.getElementsByTagName('fieldset');
for (var i=0; i<fieldsets.length; i++) { for (var i=0; i<fieldsets.length; i++) {
if (fieldsets[i].className.match(CollapsedFieldsets.collapsed_re)) { if (fieldsets[i].className.match(CollapsedFieldsets.collapsed_re)) {
CollapsedFieldsets.show(i); CollapsedFieldsets.show(i);
} }
} }
} }
} }
addEvent(window, 'load', CollapsedFieldsets.init); addEvent(window, 'load', CollapsedFieldsets.init);

22
django/contrib/admin/templates/admin/login.html
View File

@ -13,17 +13,17 @@
{% endif %} {% endif %}
<div id="content-main"> <div id="content-main">
<form action="{{ app_path }}" method="post" id="login-form"> <form action="{{ app_path }}" method="post" id="login-form">
<div class="form-row"> <div class="form-row">
<label for="id_username">{% trans 'Username:' %}</label> <input type="text" name="username" id="id_username" /> <label for="id_username">{% trans 'Username:' %}</label> <input type="text" name="username" id="id_username" />
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="id_password">{% trans 'Password:' %}</label> <input type="password" name="password" id="id_password" /> <label for="id_password">{% trans 'Password:' %}</label> <input type="password" name="password" id="id_password" />
<input type="hidden" name="this_is_the_login_form" value="1" /> <input type="hidden" name="this_is_the_login_form" value="1" />
<input type="hidden" name="post_data" value="{{ post_data }}" /> {% comment %}<span class="help">{% trans 'Have you <a href="/password_reset/">forgotten your password</a>?' %}</span>{% endcomment %} <input type="hidden" name="post_data" value="{{ post_data }}" /> {% comment %}<span class="help">{% trans 'Have you <a href="/password_reset/">forgotten your password</a>?' %}</span>{% endcomment %}
</div> </div>
<div class="submit-row"> <div class="submit-row">
<label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" /> <label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" />
</div> </div>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">

16
django/contrib/admin/templates/admin_doc/index.html
View File

@ -9,17 +9,17 @@
<h1>Documentation</h1> <h1>Documentation</h1>
<div id="content-main"> <div id="content-main">
<h3><a href="tags/">Tags</a></h3> <h3><a href="tags/">Tags</a></h3>
<p>List of all the template tags and their functions.</p> <p>List of all the template tags and their functions.</p>
<h3><a href="filters/">Filters</a></h3> <h3><a href="filters/">Filters</a></h3>
<p>Filters are actions which can be applied to variables in a template to alter the output.</p> <p>Filters are actions which can be applied to variables in a template to alter the output.</p>
<h3><a href="models/">Models</a></h3> <h3><a href="models/">Models</a></h3>
<p>Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables.</p> <p>Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables.</p>
<h3><a href="views/">Views</a></h3> <h3><a href="views/">Views</a></h3>
<p>Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.</p> <p>Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.</p>
<h3><a href="bookmarklets/">Bookmarklets</a></h3> <h3><a href="bookmarklets/">Bookmarklets</a></h3>
<p>Tools for your browser to quickly access admin functionality.</p> <p>Tools for your browser to quickly access admin functionality.</p>

4
django/contrib/admin/templates/admin_doc/missing_docutils.html
View File

@ -9,9 +9,9 @@
<h1>Documentation</h1> <h1>Documentation</h1>
<div id="content-main"> <div id="content-main">
<h3>The admin documentation system requires Python's <a href="http://docutils.sf.net/">docutils</a> library.</h3> <h3>The admin documentation system requires Python's <a href="http://docutils.sf.net/">docutils</a> library.</h3>
<p>Please ask your administrators to install <a href="http://docutils.sf.net/">docutils</a>.</p> <p>Please ask your administrators to install <a href="http://docutils.sf.net/">docutils</a>.</p>
</div> </div>
{% endblock %} {% endblock %}

2
django/contrib/comments/models.py
View File

@ -51,7 +51,7 @@ class CommentManager(models.Manager):
extra_kwargs.setdefault('select', {}) extra_kwargs.setdefault('select', {})
extra_kwargs['select']['_karma_total_good'] = 'SELECT COUNT(*) FROM comments_karmascore, comments_comment WHERE comments_karmascore.comment_id=comments_comment.id AND score=1' extra_kwargs['select']['_karma_total_good'] = 'SELECT COUNT(*) FROM comments_karmascore, comments_comment WHERE comments_karmascore.comment_id=comments_comment.id AND score=1'
extra_kwargs['select']['_karma_total_bad'] = 'SELECT COUNT(*) FROM comments_karmascore, comments_comment WHERE comments_karmascore.comment_id=comments_comment.id AND score=-1' extra_kwargs['select']['_karma_total_bad'] = 'SELECT COUNT(*) FROM comments_karmascore, comments_comment WHERE comments_karmascore.comment_id=comments_comment.id AND score=-1'
return self.filter(**kwargs).extra(**extra_kwargs) return self.filter(**kwargs).extra(**extra_kwargs)
def user_is_moderator(self, user): def user_is_moderator(self, user):
if user.is_superuser: if user.is_superuser:

780
django/dispatch/dispatcher.py
View File

@ -6,24 +6,24 @@ system.
Module attributes of note: Module attributes of note:
Any -- Singleton used to signal either "Any Sender" or Any -- Singleton used to signal either "Any Sender" or
"Any Signal". See documentation of the _Any class. "Any Signal". See documentation of the _Any class.
Anonymous -- Singleton used to signal "Anonymous Sender" Anonymous -- Singleton used to signal "Anonymous Sender"
See documentation of the _Anonymous class. See documentation of the _Anonymous class.
Internal attributes: Internal attributes:
WEAKREF_TYPES -- tuple of types/classes which represent WEAKREF_TYPES -- tuple of types/classes which represent
weak references to receivers, and thus must be de- weak references to receivers, and thus must be de-
referenced on retrieval to retrieve the callable referenced on retrieval to retrieve the callable
object object
connections -- { senderkey (id) : { signal : [receivers...]}} connections -- { senderkey (id) : { signal : [receivers...]}}
senders -- { senderkey (id) : weakref(sender) } senders -- { senderkey (id) : weakref(sender) }
used for cleaning up sender references on sender used for cleaning up sender references on sender
deletion deletion
sendersBack -- { receiverkey (id) : [senderkey (id)...] } sendersBack -- { receiverkey (id) : [senderkey (id)...] }
used for cleaning up receiver references on receiver used for cleaning up receiver references on receiver
deletion, (considerably speeds up the cleanup process deletion, (considerably speeds up the cleanup process
vs. the original code.) vs. the original code.)
""" """
from __future__ import generators from __future__ import generators
import types, weakref import types, weakref
@ -34,44 +34,44 @@ __cvsid__ = "$Id: dispatcher.py,v 1.9 2005/09/17 04:55:57 mcfletch Exp $"
__version__ = "$Revision: 1.9 $"[11:-2] __version__ = "$Revision: 1.9 $"[11:-2]
try: try:
True True
except NameError: except NameError:
True = 1==1 True = 1==1
False = 1==0 False = 1==0
class _Parameter: class _Parameter:
"""Used to represent default parameter values.""" """Used to represent default parameter values."""
def __repr__(self): def __repr__(self):
return self.__class__.__name__ return self.__class__.__name__
class _Any(_Parameter): class _Any(_Parameter):
"""Singleton used to signal either "Any Sender" or "Any Signal" """Singleton used to signal either "Any Sender" or "Any Signal"
The Any object can be used with connect, disconnect, The Any object can be used with connect, disconnect,
send, or sendExact to signal that the parameter given send, or sendExact to signal that the parameter given
Any should react to all senders/signals, not just Any should react to all senders/signals, not just
a particular sender/signal. a particular sender/signal.
""" """
Any = _Any() Any = _Any()
class _Anonymous(_Parameter): class _Anonymous(_Parameter):
"""Singleton used to signal "Anonymous Sender" """Singleton used to signal "Anonymous Sender"
The Anonymous object is used to signal that the sender The Anonymous object is used to signal that the sender
of a message is not specified (as distinct from being of a message is not specified (as distinct from being
"any sender"). Registering callbacks for Anonymous "any sender"). Registering callbacks for Anonymous
will only receive messages sent without senders. Sending will only receive messages sent without senders. Sending
with anonymous will only send messages to those receivers with anonymous will only send messages to those receivers
registered for Any or Anonymous. registered for Any or Anonymous.
Note: Note:
The default sender for connect is Any, while the The default sender for connect is Any, while the
default sender for send is Anonymous. This has default sender for send is Anonymous. This has
the effect that if you do not specify any senders the effect that if you do not specify any senders
in either function then all messages are routed in either function then all messages are routed
as though there was a single sender (Anonymous) as though there was a single sender (Anonymous)
being used everywhere. being used everywhere.
""" """
Anonymous = _Anonymous() Anonymous = _Anonymous()
WEAKREF_TYPES = (weakref.ReferenceType, saferef.BoundMethodWeakref) WEAKREF_TYPES = (weakref.ReferenceType, saferef.BoundMethodWeakref)
@ -82,416 +82,416 @@ sendersBack = {}
def connect(receiver, signal=Any, sender=Any, weak=True): def connect(receiver, signal=Any, sender=Any, weak=True):
"""Connect receiver to sender for signal """Connect receiver to sender for signal
receiver -- a callable Python object which is to receive receiver -- a callable Python object which is to receive
messages/signals/events. Receivers must be hashable messages/signals/events. Receivers must be hashable
objects. objects.
if weak is True, then receiver must be weak-referencable if weak is True, then receiver must be weak-referencable
(more precisely saferef.safeRef() must be able to create (more precisely saferef.safeRef() must be able to create
a reference to the receiver). a reference to the receiver).
Receivers are fairly flexible in their specification, Receivers are fairly flexible in their specification,
as the machinery in the robustApply module takes care as the machinery in the robustApply module takes care
of most of the details regarding figuring out appropriate of most of the details regarding figuring out appropriate
subsets of the sent arguments to apply to a given subsets of the sent arguments to apply to a given
receiver. receiver.
Note: Note:
if receiver is itself a weak reference (a callable), if receiver is itself a weak reference (a callable),
it will be de-referenced by the system's machinery, it will be de-referenced by the system's machinery,
so *generally* weak references are not suitable as so *generally* weak references are not suitable as
receivers, though some use might be found for the receivers, though some use might be found for the
facility whereby a higher-level library passes in facility whereby a higher-level library passes in
pre-weakrefed receiver references. pre-weakrefed receiver references.
signal -- the signal to which the receiver should respond signal -- the signal to which the receiver should respond
if Any, receiver will receive any signal from the if Any, receiver will receive any signal from the
indicated sender (which might also be Any, but is not indicated sender (which might also be Any, but is not
necessarily Any). necessarily Any).
Otherwise must be a hashable Python object other than Otherwise must be a hashable Python object other than
None (DispatcherError raised on None). None (DispatcherError raised on None).
sender -- the sender to which the receiver should respond sender -- the sender to which the receiver should respond
if Any, receiver will receive the indicated signals if Any, receiver will receive the indicated signals
from any sender. from any sender.
if Anonymous, receiver will only receive indicated if Anonymous, receiver will only receive indicated
signals from send/sendExact which do not specify a signals from send/sendExact which do not specify a
sender, or specify Anonymous explicitly as the sender. sender, or specify Anonymous explicitly as the sender.
Otherwise can be any python object. Otherwise can be any python object.
weak -- whether to use weak references to the receiver weak -- whether to use weak references to the receiver
By default, the module will attempt to use weak By default, the module will attempt to use weak
references to the receiver objects. If this parameter references to the receiver objects. If this parameter
is false, then strong references will be used. is false, then strong references will be used.
returns None, may raise DispatcherTypeError returns None, may raise DispatcherTypeError
""" """
if signal is None: if signal is None:
raise errors.DispatcherTypeError( raise errors.DispatcherTypeError(
'Signal cannot be None (receiver=%r sender=%r)'%( receiver,sender) 'Signal cannot be None (receiver=%r sender=%r)'%( receiver,sender)
) )
if weak: if weak:
receiver = saferef.safeRef(receiver, onDelete=_removeReceiver) receiver = saferef.safeRef(receiver, onDelete=_removeReceiver)
senderkey = id(sender) senderkey = id(sender)
if connections.has_key(senderkey): if connections.has_key(senderkey):
signals = connections[senderkey] signals = connections[senderkey]
else: else:
connections[senderkey] = signals = {} connections[senderkey] = signals = {}
# Keep track of senders for cleanup. # Keep track of senders for cleanup.
# Is Anonymous something we want to clean up? # Is Anonymous something we want to clean up?
if sender not in (None, Anonymous, Any): if sender not in (None, Anonymous, Any):
def remove(object, senderkey=senderkey): def remove(object, senderkey=senderkey):
_removeSender(senderkey=senderkey) _removeSender(senderkey=senderkey)
# Skip objects that can not be weakly referenced, which means # Skip objects that can not be weakly referenced, which means
# they won't be automatically cleaned up, but that's too bad. # they won't be automatically cleaned up, but that's too bad.
try: try:
weakSender = weakref.ref(sender, remove) weakSender = weakref.ref(sender, remove)
senders[senderkey] = weakSender senders[senderkey] = weakSender
except: except:
pass pass
receiverID = id(receiver) receiverID = id(receiver)
# get current set, remove any current references to # get current set, remove any current references to
# this receiver in the set, including back-references # this receiver in the set, including back-references
if signals.has_key(signal): if signals.has_key(signal):
receivers = signals[signal] receivers = signals[signal]
_removeOldBackRefs(senderkey, signal, receiver, receivers) _removeOldBackRefs(senderkey, signal, receiver, receivers)
else: else:
receivers = signals[signal] = [] receivers = signals[signal] = []
try: try:
current = sendersBack.get( receiverID ) current = sendersBack.get( receiverID )
if current is None: if current is None:
sendersBack[ receiverID ] = current = [] sendersBack[ receiverID ] = current = []
if senderkey not in current: if senderkey not in current:
current.append(senderkey) current.append(senderkey)
except: except:
pass pass
receivers.append(receiver) receivers.append(receiver)
def disconnect(receiver, signal=Any, sender=Any, weak=True): def disconnect(receiver, signal=Any, sender=Any, weak=True):
"""Disconnect receiver from sender for signal """Disconnect receiver from sender for signal
receiver -- the registered receiver to disconnect receiver -- the registered receiver to disconnect
signal -- the registered signal to disconnect signal -- the registered signal to disconnect
sender -- the registered sender to disconnect sender -- the registered sender to disconnect
weak -- the weakref state to disconnect weak -- the weakref state to disconnect
disconnect reverses the process of connect, disconnect reverses the process of connect,
the semantics for the individual elements are the semantics for the individual elements are
logically equivalent to a tuple of logically equivalent to a tuple of
(receiver, signal, sender, weak) used as a key (receiver, signal, sender, weak) used as a key
to be deleted from the internal routing tables. to be deleted from the internal routing tables.
(The actual process is slightly more complex (The actual process is slightly more complex
but the semantics are basically the same). but the semantics are basically the same).
Note: Note:
Using disconnect is not required to cleanup Using disconnect is not required to cleanup
routing when an object is deleted, the framework routing when an object is deleted, the framework
will remove routes for deleted objects will remove routes for deleted objects
automatically. It's only necessary to disconnect automatically. It's only necessary to disconnect
if you want to stop routing to a live object. if you want to stop routing to a live object.
returns None, may raise DispatcherTypeError or returns None, may raise DispatcherTypeError or
DispatcherKeyError DispatcherKeyError
""" """
if signal is None: if signal is None:
raise errors.DispatcherTypeError( raise errors.DispatcherTypeError(
'Signal cannot be None (receiver=%r sender=%r)'%( receiver,sender) 'Signal cannot be None (receiver=%r sender=%r)'%( receiver,sender)
) )
if weak: receiver = saferef.safeRef(receiver) if weak: receiver = saferef.safeRef(receiver)
senderkey = id(sender) senderkey = id(sender)
try: try:
signals = connections[senderkey] signals = connections[senderkey]
receivers = signals[signal] receivers = signals[signal]
except KeyError: except KeyError:
raise errors.DispatcherKeyError( raise errors.DispatcherKeyError(
"""No receivers found for signal %r from sender %r""" %( """No receivers found for signal %r from sender %r""" %(
signal, signal,
sender sender
) )
) )
try: try:
# also removes from receivers # also removes from receivers
_removeOldBackRefs(senderkey, signal, receiver, receivers) _removeOldBackRefs(senderkey, signal, receiver, receivers)
except ValueError: except ValueError:
raise errors.DispatcherKeyError( raise errors.DispatcherKeyError(
"""No connection to receiver %s for signal %s from sender %s""" %( """No connection to receiver %s for signal %s from sender %s""" %(
receiver, receiver,
signal, signal,
sender sender
) )
) )
_cleanupConnections(senderkey, signal) _cleanupConnections(senderkey, signal)
def getReceivers( sender = Any, signal = Any ): def getReceivers( sender = Any, signal = Any ):
"""Get list of receivers from global tables """Get list of receivers from global tables
This utility function allows you to retrieve the This utility function allows you to retrieve the
raw list of receivers from the connections table raw list of receivers from the connections table
for the given sender and signal pair. for the given sender and signal pair.
Note: Note:
there is no guarantee that this is the actual list there is no guarantee that this is the actual list
stored in the connections table, so the value stored in the connections table, so the value
should be treated as a simple iterable/truth value should be treated as a simple iterable/truth value
rather than, for instance a list to which you rather than, for instance a list to which you
might append new records. might append new records.
Normally you would use liveReceivers( getReceivers( ...)) Normally you would use liveReceivers( getReceivers( ...))
to retrieve the actual receiver objects as an iterable to retrieve the actual receiver objects as an iterable
object. object.
""" """
try: try:
return connections[id(sender)][signal] return connections[id(sender)][signal]
except KeyError: except KeyError:
return [] return []
def liveReceivers(receivers): def liveReceivers(receivers):
"""Filter sequence of receivers to get resolved, live receivers """Filter sequence of receivers to get resolved, live receivers
This is a generator which will iterate over This is a generator which will iterate over
the passed sequence, checking for weak references the passed sequence, checking for weak references
and resolving them, then returning all live and resolving them, then returning all live
receivers. receivers.
""" """
for receiver in receivers: for receiver in receivers:
if isinstance( receiver, WEAKREF_TYPES): if isinstance( receiver, WEAKREF_TYPES):
# Dereference the weak reference. # Dereference the weak reference.
receiver = receiver() receiver = receiver()
if receiver is not None: if receiver is not None:
yield receiver yield receiver
else: else:
yield receiver yield receiver
def getAllReceivers( sender = Any, signal = Any ): def getAllReceivers( sender = Any, signal = Any ):
"""Get list of all receivers from global tables """Get list of all receivers from global tables
This gets all receivers which should receive This gets all receivers which should receive
the given signal from sender, each receiver should the given signal from sender, each receiver should
be produced only once by the resulting generator be produced only once by the resulting generator
""" """
receivers = {} receivers = {}
for set in ( for set in (
# Get receivers that receive *this* signal from *this* sender. # Get receivers that receive *this* signal from *this* sender.
getReceivers( sender, signal ), getReceivers( sender, signal ),
# Add receivers that receive *any* signal from *this* sender. # Add receivers that receive *any* signal from *this* sender.
getReceivers( sender, Any ), getReceivers( sender, Any ),
# Add receivers that receive *this* signal from *any* sender. # Add receivers that receive *this* signal from *any* sender.
getReceivers( Any, signal ), getReceivers( Any, signal ),
# Add receivers that receive *any* signal from *any* sender. # Add receivers that receive *any* signal from *any* sender.
getReceivers( Any, Any ), getReceivers( Any, Any ),
): ):
for receiver in set: for receiver in set:
if receiver: # filter out dead instance-method weakrefs if receiver: # filter out dead instance-method weakrefs
try: try:
if not receivers.has_key( receiver ): if not receivers.has_key( receiver ):
receivers[receiver] = 1 receivers[receiver] = 1
yield receiver yield receiver
except TypeError: except TypeError:
# dead weakrefs raise TypeError on hash... # dead weakrefs raise TypeError on hash...
pass pass
def send(signal=Any, sender=Anonymous, *arguments, **named): def send(signal=Any, sender=Anonymous, *arguments, **named):
"""Send signal from sender to all connected receivers. """Send signal from sender to all connected receivers.
signal -- (hashable) signal value, see connect for details signal -- (hashable) signal value, see connect for details
sender -- the sender of the signal sender -- the sender of the signal
if Any, only receivers registered for Any will receive if Any, only receivers registered for Any will receive
the message. the message.
if Anonymous, only receivers registered to receive if Anonymous, only receivers registered to receive
messages from Anonymous or Any will receive the message messages from Anonymous or Any will receive the message
Otherwise can be any python object (normally one Otherwise can be any python object (normally one
registered with a connect if you actually want registered with a connect if you actually want
something to occur). something to occur).
arguments -- positional arguments which will be passed to arguments -- positional arguments which will be passed to
*all* receivers. Note that this may raise TypeErrors *all* receivers. Note that this may raise TypeErrors
if the receivers do not allow the particular arguments. if the receivers do not allow the particular arguments.
Note also that arguments are applied before named Note also that arguments are applied before named
arguments, so they should be used with care. arguments, so they should be used with care.
named -- named arguments which will be filtered according named -- named arguments which will be filtered according
to the parameters of the receivers to only provide those to the parameters of the receivers to only provide those
acceptable to the receiver. acceptable to the receiver.
Return a list of tuple pairs [(receiver, response), ... ] Return a list of tuple pairs [(receiver, response), ... ]
if any receiver raises an error, the error propagates back if any receiver raises an error, the error propagates back
through send, terminating the dispatch loop, so it is quite through send, terminating the dispatch loop, so it is quite
possible to not have all receivers called if a raises an possible to not have all receivers called if a raises an
error. error.
""" """
# Call each receiver with whatever arguments it can accept. # Call each receiver with whatever arguments it can accept.
# Return a list of tuple pairs [(receiver, response), ... ]. # Return a list of tuple pairs [(receiver, response), ... ].
responses = [] responses = []
for receiver in liveReceivers(getAllReceivers(sender, signal)): for receiver in liveReceivers(getAllReceivers(sender, signal)):
response = robustapply.robustApply( response = robustapply.robustApply(
receiver, receiver,
signal=signal, signal=signal,
sender=sender, sender=sender,
*arguments, *arguments,
**named **named
) )
responses.append((receiver, response)) responses.append((receiver, response))
return responses return responses
def sendExact( signal=Any, sender=Anonymous, *arguments, **named ): def sendExact( signal=Any, sender=Anonymous, *arguments, **named ):
"""Send signal only to those receivers registered for exact message """Send signal only to those receivers registered for exact message
sendExact allows for avoiding Any/Anonymous registered sendExact allows for avoiding Any/Anonymous registered
handlers, sending only to those receivers explicitly handlers, sending only to those receivers explicitly
registered for a particular signal on a particular registered for a particular signal on a particular
sender. sender.
""" """
responses = [] responses = []
for receiver in liveReceivers(getReceivers(sender, signal)): for receiver in liveReceivers(getReceivers(sender, signal)):
response = robustapply.robustApply( response = robustapply.robustApply(
receiver, receiver,
signal=signal, signal=signal,
sender=sender, sender=sender,
*arguments, *arguments,
**named **named
) )
responses.append((receiver, response)) responses.append((receiver, response))
return responses return responses
def _removeReceiver(receiver): def _removeReceiver(receiver):
"""Remove receiver from connections.""" """Remove receiver from connections."""
if not sendersBack: if not sendersBack:
# During module cleanup the mapping will be replaced with None # During module cleanup the mapping will be replaced with None
return False return False
backKey = id(receiver) backKey = id(receiver)
for senderkey in sendersBack.get(backKey,()): for senderkey in sendersBack.get(backKey,()):
try: try:
signals = connections[senderkey].keys() signals = connections[senderkey].keys()
except KeyError,err: except KeyError,err:
pass pass
else: else:
for signal in signals: for signal in signals:
try: try:
receivers = connections[senderkey][signal] receivers = connections[senderkey][signal]
except KeyError: except KeyError:
pass pass
else: else:
try: try:
receivers.remove( receiver ) receivers.remove( receiver )
except Exception, err: except Exception, err:
pass pass
_cleanupConnections(senderkey, signal) _cleanupConnections(senderkey, signal)
try: try:
del sendersBack[ backKey ] del sendersBack[ backKey ]
except KeyError: except KeyError:
pass pass
def _cleanupConnections(senderkey, signal): def _cleanupConnections(senderkey, signal):
"""Delete any empty signals for senderkey. Delete senderkey if empty.""" """Delete any empty signals for senderkey. Delete senderkey if empty."""
try: try:
receivers = connections[senderkey][signal] receivers = connections[senderkey][signal]
except: except:
pass pass
else: else:
if not receivers: if not receivers:
# No more connected receivers. Therefore, remove the signal. # No more connected receivers. Therefore, remove the signal.
try: try:
signals = connections[senderkey] signals = connections[senderkey]
except KeyError: except KeyError:
pass pass
else: else:
del signals[signal] del signals[signal]
if not signals: if not signals:
# No more signal connections. Therefore, remove the sender. # No more signal connections. Therefore, remove the sender.
_removeSender(senderkey) _removeSender(senderkey)
def _removeSender(senderkey): def _removeSender(senderkey):
"""Remove senderkey from connections.""" """Remove senderkey from connections."""
_removeBackrefs(senderkey) _removeBackrefs(senderkey)
try: try:
del connections[senderkey] del connections[senderkey]
except KeyError: except KeyError:
pass pass
# Senderkey will only be in senders dictionary if sender # Senderkey will only be in senders dictionary if sender
# could be weakly referenced. # could be weakly referenced.
try: try:
del senders[senderkey] del senders[senderkey]
except: except:
pass pass
def _removeBackrefs( senderkey): def _removeBackrefs( senderkey):
"""Remove all back-references to this senderkey""" """Remove all back-references to this senderkey"""
try: try:
signals = connections[senderkey] signals = connections[senderkey]
except KeyError: except KeyError:
signals = None signals = None
else: else:
items = signals.items() items = signals.items()
def allReceivers( ): def allReceivers( ):
for signal,set in items: for signal,set in items:
for item in set: for item in set:
yield item yield item
for receiver in allReceivers(): for receiver in allReceivers():
_killBackref( receiver, senderkey ) _killBackref( receiver, senderkey )
def _removeOldBackRefs(senderkey, signal, receiver, receivers): def _removeOldBackRefs(senderkey, signal, receiver, receivers):
"""Kill old sendersBack references from receiver """Kill old sendersBack references from receiver
This guards against multiple registration of the same This guards against multiple registration of the same
receiver for a given signal and sender leaking memory receiver for a given signal and sender leaking memory
as old back reference records build up. as old back reference records build up.
Also removes old receiver instance from receivers Also removes old receiver instance from receivers
""" """
try: try:
index = receivers.index(receiver) index = receivers.index(receiver)
# need to scan back references here and remove senderkey # need to scan back references here and remove senderkey
except ValueError: except ValueError:
return False return False
else: else:
oldReceiver = receivers[index] oldReceiver = receivers[index]
del receivers[index] del receivers[index]
found = 0 found = 0
signals = connections.get(signal) signals = connections.get(signal)
if signals is not None: if signals is not None:
for sig,recs in connections.get(signal,{}).iteritems(): for sig,recs in connections.get(signal,{}).iteritems():
if sig != signal: if sig != signal:
for rec in recs: for rec in recs:
if rec is oldReceiver: if rec is oldReceiver:
found = 1 found = 1
break break
if not found: if not found:
_killBackref( oldReceiver, senderkey ) _killBackref( oldReceiver, senderkey )
return True return True
return False return False
def _killBackref( receiver, senderkey ): def _killBackref( receiver, senderkey ):
"""Do the actual removal of back reference from receiver to senderkey""" """Do the actual removal of back reference from receiver to senderkey"""
receiverkey = id(receiver) receiverkey = id(receiver)
set = sendersBack.get( receiverkey, () ) set = sendersBack.get( receiverkey, () )
while senderkey in set: while senderkey in set:
try: try:
set.remove( senderkey ) set.remove( senderkey )
except: except:
break break
if not set: if not set:
try: try:
del sendersBack[ receiverkey ] del sendersBack[ receiverkey ]
except KeyError: except KeyError:
pass pass
return True return True

6
django/dispatch/errors.py
View File

@ -2,9 +2,9 @@
""" """
class DispatcherError(Exception): class DispatcherError(Exception):
"""Base class for all Dispatcher errors""" """Base class for all Dispatcher errors"""
class DispatcherKeyError(KeyError, DispatcherError): class DispatcherKeyError(KeyError, DispatcherError):
"""Error raised when unknown (sender,signal) set specified""" """Error raised when unknown (sender,signal) set specified"""
class DispatcherTypeError(TypeError, DispatcherError): class DispatcherTypeError(TypeError, DispatcherError):
"""Error raised when inappropriate signal-type specified (None)""" """Error raised when inappropriate signal-type specified (None)"""

52
django/dispatch/license.txt
View File

@ -1,34 +1,34 @@
PyDispatcher License PyDispatcher License
Copyright (c) 2001-2003, Patrick K. O'Brien and Contributors Copyright (c) 2001-2003, Patrick K. O'Brien and Contributors
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
Redistributions of source code must retain the above copyright Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials disclaimer in the documentation and/or other materials
provided with the distribution. provided with the distribution.
The name of Patrick K. O'Brien, or the name of any Contributor, The name of Patrick K. O'Brien, or the name of any Contributor,
may not be used to endorse or promote products derived from this may not be used to endorse or promote products derived from this
software without specific prior written permission. software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE. OF THE POSSIBILITY OF SUCH DAMAGE.

84
django/dispatch/robust.py
View File

@ -3,55 +3,55 @@ from django.dispatch.dispatcher import Any, Anonymous, liveReceivers, getAllRece
from django.dispatch.robustapply import robustApply from django.dispatch.robustapply import robustApply
def sendRobust( def sendRobust(
signal=Any, signal=Any,
sender=Anonymous, sender=Anonymous,
*arguments, **named *arguments, **named
): ):
"""Send signal from sender to all connected receivers catching errors """Send signal from sender to all connected receivers catching errors
signal -- (hashable) signal value, see connect for details signal -- (hashable) signal value, see connect for details
sender -- the sender of the signal sender -- the sender of the signal
if Any, only receivers registered for Any will receive if Any, only receivers registered for Any will receive
the message. the message.
if Anonymous, only receivers registered to receive if Anonymous, only receivers registered to receive
messages from Anonymous or Any will receive the message messages from Anonymous or Any will receive the message
Otherwise can be any python object (normally one Otherwise can be any python object (normally one
registered with a connect if you actually want registered with a connect if you actually want
something to occur). something to occur).
arguments -- positional arguments which will be passed to arguments -- positional arguments which will be passed to
*all* receivers. Note that this may raise TypeErrors *all* receivers. Note that this may raise TypeErrors
if the receivers do not allow the particular arguments. if the receivers do not allow the particular arguments.
Note also that arguments are applied before named Note also that arguments are applied before named
arguments, so they should be used with care. arguments, so they should be used with care.
named -- named arguments which will be filtered according named -- named arguments which will be filtered according
to the parameters of the receivers to only provide those to the parameters of the receivers to only provide those
acceptable to the receiver. acceptable to the receiver.
Return a list of tuple pairs [(receiver, response), ... ] Return a list of tuple pairs [(receiver, response), ... ]
if any receiver raises an error (specifically any subclass of Exception), if any receiver raises an error (specifically any subclass of Exception),
the error instance is returned as the result for that receiver. the error instance is returned as the result for that receiver.
""" """
# Call each receiver with whatever arguments it can accept. # Call each receiver with whatever arguments it can accept.
# Return a list of tuple pairs [(receiver, response), ... ]. # Return a list of tuple pairs [(receiver, response), ... ].
responses = [] responses = []
for receiver in liveReceivers(getAllReceivers(sender, signal)): for receiver in liveReceivers(getAllReceivers(sender, signal)):
try: try:
response = robustApply( response = robustApply(
receiver, receiver,
signal=signal, signal=signal,
sender=sender, sender=sender,
*arguments, *arguments,
**named **named
) )
except Exception, err: except Exception, err:
responses.append((receiver, err)) responses.append((receiver, err))
else: else:
responses.append((receiver, response)) responses.append((receiver, response))
return responses return responses

70
django/dispatch/robustapply.py
View File

@ -7,43 +7,41 @@ those which are acceptable.
""" """
def function( receiver ): def function( receiver ):
"""Get function-like callable object for given receiver """Get function-like callable object for given receiver
returns (function_or_method, codeObject, fromMethod) returns (function_or_method, codeObject, fromMethod)
If fromMethod is true, then the callable already If fromMethod is true, then the callable already
has its first argument bound has its first argument bound
""" """
if hasattr(receiver, '__call__'): if hasattr(receiver, '__call__'):
# receiver is a class instance; assume it is callable. # receiver is a class instance; assume it is callable.
# Reassign receiver to the actual method that will be called. # Reassign receiver to the actual method that will be called.
if hasattr( receiver.__call__, 'im_func') or hasattr( receiver.__call__, 'im_code'): if hasattr( receiver.__call__, 'im_func') or hasattr( receiver.__call__, 'im_code'):
receiver = receiver.__call__ receiver = receiver.__call__
if hasattr( receiver, 'im_func' ): if hasattr( receiver, 'im_func' ):
# an instance-method... # an instance-method...
return receiver, receiver.im_func.func_code, 1 return receiver, receiver.im_func.func_code, 1
elif not hasattr( receiver, 'func_code'): elif not hasattr( receiver, 'func_code'):
raise ValueError('unknown reciever type %s %s'%(receiver, type(receiver))) raise ValueError('unknown reciever type %s %s'%(receiver, type(receiver)))
return receiver, receiver.func_code, 0 return receiver, receiver.func_code, 0
def robustApply(receiver, *arguments, **named): def robustApply(receiver, *arguments, **named):
"""Call receiver with arguments and an appropriate subset of named """Call receiver with arguments and an appropriate subset of named
""" """
receiver, codeObject, startIndex = function( receiver ) receiver, codeObject, startIndex = function( receiver )
acceptable = codeObject.co_varnames[startIndex+len(arguments):codeObject.co_argcount] acceptable = codeObject.co_varnames[startIndex+len(arguments):codeObject.co_argcount]
for name in codeObject.co_varnames[startIndex:startIndex+len(arguments)]: for name in codeObject.co_varnames[startIndex:startIndex+len(arguments)]:
if named.has_key( name ): if named.has_key( name ):
raise TypeError( raise TypeError(
"""Argument %r specified both positionally and as a keyword for calling %r"""% ( """Argument %r specified both positionally and as a keyword for calling %r"""% (
name, receiver, name, receiver,
) )
) )
if not (codeObject.co_flags & 8): if not (codeObject.co_flags & 8):
# fc does not have a **kwds type parameter, therefore # fc does not have a **kwds type parameter, therefore
# remove unacceptable arguments. # remove unacceptable arguments.
for arg in named.keys(): for arg in named.keys():
if arg not in acceptable: if arg not in acceptable:
del named[arg] del named[arg]
return receiver(*arguments, **named) return receiver(*arguments, **named)

298
django/dispatch/saferef.py
View File

@ -2,164 +2,164 @@
import weakref, traceback import weakref, traceback
def safeRef(target, onDelete = None): def safeRef(target, onDelete = None):
"""Return a *safe* weak reference to a callable target """Return a *safe* weak reference to a callable target
target -- the object to be weakly referenced, if it's a target -- the object to be weakly referenced, if it's a
bound method reference, will create a BoundMethodWeakref, bound method reference, will create a BoundMethodWeakref,
otherwise creates a simple weakref. otherwise creates a simple weakref.
onDelete -- if provided, will have a hard reference stored onDelete -- if provided, will have a hard reference stored
to the callable to be called after the safe reference to the callable to be called after the safe reference
goes out of scope with the reference object, (either a goes out of scope with the reference object, (either a
weakref or a BoundMethodWeakref) as argument. weakref or a BoundMethodWeakref) as argument.
""" """
if hasattr(target, 'im_self'): if hasattr(target, 'im_self'):
if target.im_self is not None: if target.im_self is not None:
# Turn a bound method into a BoundMethodWeakref instance. # Turn a bound method into a BoundMethodWeakref instance.
# Keep track of these instances for lookup by disconnect(). # Keep track of these instances for lookup by disconnect().
assert hasattr(target, 'im_func'), """safeRef target %r has im_self, but no im_func, don't know how to create reference"""%( target,) assert hasattr(target, 'im_func'), """safeRef target %r has im_self, but no im_func, don't know how to create reference"""%( target,)
reference = BoundMethodWeakref( reference = BoundMethodWeakref(
target=target, target=target,
onDelete=onDelete onDelete=onDelete
) )
return reference return reference
if callable(onDelete): if callable(onDelete):
return weakref.ref(target, onDelete) return weakref.ref(target, onDelete)
else: else:
return weakref.ref( target ) return weakref.ref( target )
class BoundMethodWeakref(object): class BoundMethodWeakref(object):
"""'Safe' and reusable weak references to instance methods """'Safe' and reusable weak references to instance methods
BoundMethodWeakref objects provide a mechanism for BoundMethodWeakref objects provide a mechanism for
referencing a bound method without requiring that the referencing a bound method without requiring that the
method object itself (which is normally a transient method object itself (which is normally a transient
object) is kept alive. Instead, the BoundMethodWeakref object) is kept alive. Instead, the BoundMethodWeakref
object keeps weak references to both the object and the object keeps weak references to both the object and the
function which together define the instance method. function which together define the instance method.
Attributes: Attributes:
key -- the identity key for the reference, calculated key -- the identity key for the reference, calculated
by the class's calculateKey method applied to the by the class's calculateKey method applied to the
target instance method target instance method
deletionMethods -- sequence of callable objects taking deletionMethods -- sequence of callable objects taking
single argument, a reference to this object which single argument, a reference to this object which
will be called when *either* the target object or will be called when *either* the target object or
target function is garbage collected (i.e. when target function is garbage collected (i.e. when
this object becomes invalid). These are specified this object becomes invalid). These are specified
as the onDelete parameters of safeRef calls. as the onDelete parameters of safeRef calls.
weakSelf -- weak reference to the target object weakSelf -- weak reference to the target object
weakFunc -- weak reference to the target function weakFunc -- weak reference to the target function
Class Attributes: Class Attributes:
_allInstances -- class attribute pointing to all live _allInstances -- class attribute pointing to all live
BoundMethodWeakref objects indexed by the class's BoundMethodWeakref objects indexed by the class's
calculateKey(target) method applied to the target calculateKey(target) method applied to the target
objects. This weak value dictionary is used to objects. This weak value dictionary is used to
short-circuit creation so that multiple references short-circuit creation so that multiple references
to the same (object, function) pair produce the to the same (object, function) pair produce the
same BoundMethodWeakref instance. same BoundMethodWeakref instance.
""" """
_allInstances = weakref.WeakValueDictionary() _allInstances = weakref.WeakValueDictionary()
def __new__( cls, target, onDelete=None, *arguments,**named ): def __new__( cls, target, onDelete=None, *arguments,**named ):
"""Create new instance or return current instance """Create new instance or return current instance
Basically this method of construction allows us to Basically this method of construction allows us to
short-circuit creation of references to already- short-circuit creation of references to already-
referenced instance methods. The key corresponding referenced instance methods. The key corresponding
to the target is calculated, and if there is already to the target is calculated, and if there is already
an existing reference, that is returned, with its an existing reference, that is returned, with its
deletionMethods attribute updated. Otherwise the deletionMethods attribute updated. Otherwise the
new instance is created and registered in the table new instance is created and registered in the table
of already-referenced methods. of already-referenced methods.
""" """
key = cls.calculateKey(target) key = cls.calculateKey(target)
current =cls._allInstances.get(key) current =cls._allInstances.get(key)
if current is not None: if current is not None:
current.deletionMethods.append( onDelete) current.deletionMethods.append( onDelete)
return current return current
else: else:
base = super( BoundMethodWeakref, cls).__new__( cls ) base = super( BoundMethodWeakref, cls).__new__( cls )
cls._allInstances[key] = base cls._allInstances[key] = base
base.__init__( target, onDelete, *arguments,**named) base.__init__( target, onDelete, *arguments,**named)
return base return base
def __init__(self, target, onDelete=None): def __init__(self, target, onDelete=None):
"""Return a weak-reference-like instance for a bound method """Return a weak-reference-like instance for a bound method
target -- the instance-method target for the weak target -- the instance-method target for the weak
reference, must have im_self and im_func attributes reference, must have im_self and im_func attributes
and be reconstructable via: and be reconstructable via:
target.im_func.__get__( target.im_self ) target.im_func.__get__( target.im_self )
which is true of built-in instance methods. which is true of built-in instance methods.
onDelete -- optional callback which will be called onDelete -- optional callback which will be called
when this weak reference ceases to be valid when this weak reference ceases to be valid
(i.e. either the object or the function is garbage (i.e. either the object or the function is garbage
collected). Should take a single argument, collected). Should take a single argument,
which will be passed a pointer to this object. which will be passed a pointer to this object.
""" """
def remove(weak, self=self): def remove(weak, self=self):
"""Set self.isDead to true when method or instance is destroyed""" """Set self.isDead to true when method or instance is destroyed"""
methods = self.deletionMethods[:] methods = self.deletionMethods[:]
del self.deletionMethods[:] del self.deletionMethods[:]
try: try:
del self.__class__._allInstances[ self.key ] del self.__class__._allInstances[ self.key ]
except KeyError: except KeyError:
pass pass
for function in methods: for function in methods:
try: try:
if callable( function ): if callable( function ):
function( self ) function( self )
except Exception, e: except Exception, e:
try: try:
traceback.print_exc() traceback.print_exc()
except AttributeError, err: except AttributeError, err:
print '''Exception during saferef %s cleanup function %s: %s'''%( print '''Exception during saferef %s cleanup function %s: %s'''%(
self, function, e self, function, e
) )
self.deletionMethods = [onDelete] self.deletionMethods = [onDelete]
self.key = self.calculateKey( target ) self.key = self.calculateKey( target )
self.weakSelf = weakref.ref(target.im_self, remove) self.weakSelf = weakref.ref(target.im_self, remove)
self.weakFunc = weakref.ref(target.im_func, remove) self.weakFunc = weakref.ref(target.im_func, remove)
self.selfName = str(target.im_self) self.selfName = str(target.im_self)
self.funcName = str(target.im_func.__name__) self.funcName = str(target.im_func.__name__)
def calculateKey( cls, target ): def calculateKey( cls, target ):
"""Calculate the reference key for this reference """Calculate the reference key for this reference
Currently this is a two-tuple of the id()'s of the Currently this is a two-tuple of the id()'s of the
target object and the target function respectively. target object and the target function respectively.
""" """
return (id(target.im_self),id(target.im_func)) return (id(target.im_self),id(target.im_func))
calculateKey = classmethod( calculateKey ) calculateKey = classmethod( calculateKey )
def __str__(self): def __str__(self):
"""Give a friendly representation of the object""" """Give a friendly representation of the object"""
return """%s( %s.%s )"""%( return """%s( %s.%s )"""%(
self.__class__.__name__, self.__class__.__name__,
self.selfName, self.selfName,
self.funcName, self.funcName,
) )
__repr__ = __str__ __repr__ = __str__
def __nonzero__( self ): def __nonzero__( self ):
"""Whether we are still a valid reference""" """Whether we are still a valid reference"""
return self() is not None return self() is not None
def __cmp__( self, other ): def __cmp__( self, other ):
"""Compare with another reference""" """Compare with another reference"""
if not isinstance (other,self.__class__): if not isinstance (other,self.__class__):
return cmp( self.__class__, type(other) ) return cmp( self.__class__, type(other) )
return cmp( self.key, other.key) return cmp( self.key, other.key)
def __call__(self): def __call__(self):
"""Return a strong reference to the bound method """Return a strong reference to the bound method
If the target cannot be retrieved, then will If the target cannot be retrieved, then will
return None, otherwise returns a bound instance return None, otherwise returns a bound instance
method for our object and function. method for our object and function.
Note: Note:
You may call this method any number of times, You may call this method any number of times,
as it does not invalidate the reference. as it does not invalidate the reference.
""" """
target = self.weakSelf() target = self.weakSelf()
if target is not None: if target is not None:
function = self.weakFunc() function = self.weakFunc()
if function is not None: if function is not None:
return function.__get__(target) return function.__get__(target)
return None return None

2
django/template/defaultfilters.py
View File

@ -438,7 +438,7 @@ def pluralize(value, arg='s'):
the comma is used for the singular case. the comma is used for the singular case.
""" """
if not ',' in arg: if not ',' in arg:
arg = ',' + arg arg = ',' + arg
bits = arg.split(',') bits = arg.split(',')
if len(bits) > 2: if len(bits) > 2:
return '' return ''

4
docs/admin_css.txt
View File

@ -118,8 +118,8 @@ additional class on the ``a`` for that tool. These are ``.addlink`` and
Example from a changelist page:: Example from a changelist page::
<ul class="object-tools"> <ul class="object-tools">
<li><a href="/stories/add/" class="addlink">Add redirect</a></li> <li><a href="/stories/add/" class="addlink">Add redirect</a></li>
</ul> </ul>
.. image:: http://media.djangoproject.com/img/doc/admincss/objecttools_01.gif .. image:: http://media.djangoproject.com/img/doc/admincss/objecttools_01.gif
:alt: Object tools on a changelist page :alt: Object tools on a changelist page