1
0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00

[soc2009/multidb] Minor grammar fixes to some error messages. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-11-26 17:48:50 +00:00
parent 28c2d5fde7
commit 5a5e082161

View File

@ -13,15 +13,15 @@ def call_with_connection(func):
arg_names, varargs, varkwargs, defaults = getargspec(func) arg_names, varargs, varkwargs, defaults = getargspec(func)
takes_connection = 'connection' in arg_names or varkwargs takes_connection = 'connection' in arg_names or varkwargs
if not takes_connection: if not takes_connection:
warn("A Field class who's %s method doesn't take connection has been " warn("A Field class whose %s method doesn't take connection has been "
"defined, please add a connection argument" % func.__name__, "defined. Please add a connection argument" % func.__name__,
PendingDeprecationWarning, stacklevel=2) PendingDeprecationWarning, stacklevel=2)
def inner(*args, **kwargs): def inner(*args, **kwargs):
if 'connection' not in kwargs: if 'connection' not in kwargs:
from django.db import connection from django.db import connection
kwargs['connection'] = connection kwargs['connection'] = connection
warn("%s has been called without providing a connection argument, " warn("%s has been called without providing a connection argument. "
"please provide one" % func.__name__, PendingDeprecationWarning, "Please provide one" % func.__name__, PendingDeprecationWarning,
stacklevel=1) stacklevel=1)
if takes_connection: if takes_connection:
return func(*args, **kwargs) return func(*args, **kwargs)