From f0a1633425d5afdaec85e188ce67d647e218ff23 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 9 Feb 2012 18:58:36 +0000
Subject: Fixed #17358 -- Updated logging calls to use official syntax for
 arguments instead of string interpolation. Thanks, spulec.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/views/decorators/http.py | 6 +++---
 django/views/generic/base.py    | 4 ++--
 django/views/generic/simple.py  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'django/views')

diff --git a/django/views/decorators/http.py b/django/views/decorators/http.py
index 387b869000..d5c4bff744 100644
--- a/django/views/decorators/http.py
+++ b/django/views/decorators/http.py
@@ -31,7 +31,7 @@ def require_http_methods(request_method_list):
         @wraps(func, assigned=available_attrs(func))
         def inner(request, *args, **kwargs):
             if request.method not in request_method_list:
-                logger.warning('Method Not Allowed (%s): %s' % (request.method, request.path),
+                logger.warning('Method Not Allowed (%s): %s', request.method, request.path,
                     extra={
                         'status_code': 405,
                         'request': request
@@ -122,7 +122,7 @@ def condition(etag_func=None, last_modified_func=None):
                     if request.method in ("GET", "HEAD"):
                         response = HttpResponseNotModified()
                     else:
-                        logger.warning('Precondition Failed: %s' % request.path,
+                        logger.warning('Precondition Failed: %s', request.path,
                             extra={
                                 'status_code': 412,
                                 'request': request
@@ -131,7 +131,7 @@ def condition(etag_func=None, last_modified_func=None):
                         response = HttpResponse(status=412)
                 elif if_match and ((not res_etag and "*" in etags) or
                         (res_etag and res_etag not in etags)):
-                    logger.warning('Precondition Failed: %s' % request.path,
+                    logger.warning('Precondition Failed: %s', request.path,
                         extra={
                             'status_code': 412,
                             'request': request
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
index ea14281a71..f443cebfc0 100644
--- a/django/views/generic/base.py
+++ b/django/views/generic/base.py
@@ -68,7 +68,7 @@ class View(object):
 
     def http_method_not_allowed(self, request, *args, **kwargs):
         allowed_methods = [m for m in self.http_method_names if hasattr(self, m)]
-        logger.warning('Method Not Allowed (%s): %s' % (request.method, request.path),
+        logger.warning('Method Not Allowed (%s): %s', request.method, request.path,
             extra={
                 'status_code': 405,
                 'request': self.request
@@ -157,7 +157,7 @@ class RedirectView(View):
             else:
                 return http.HttpResponseRedirect(url)
         else:
-            logger.warning('Gone: %s' % self.request.path,
+            logger.warning('Gone: %s', self.request.path,
                         extra={
                             'status_code': 410,
                             'request': self.request
diff --git a/django/views/generic/simple.py b/django/views/generic/simple.py
index f7b4b1c2b1..f63860a4cf 100644
--- a/django/views/generic/simple.py
+++ b/django/views/generic/simple.py
@@ -60,7 +60,7 @@ def redirect_to(request, url, permanent=True, query_string=False, **kwargs):
         klass = permanent and HttpResponsePermanentRedirect or HttpResponseRedirect
         return klass(url)
     else:
-        logger.warning('Gone: %s' % request.path,
+        logger.warning('Gone: %s', request.path,
                     extra={
                         'status_code': 410,
                         'request': request
-- 
cgit v1.3