From dc7b1d643020cac5d585aac42f98962cc7aa6bf7 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 29 Apr 2013 12:45:00 +0100
Subject: 2.2's PendingDeprecationWarnings now become DeprecationWarnings. 
 2.3's PendingDeprecationWarnings added.

---
 rest_framework/permissions.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'rest_framework/permissions.py')

diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 2aa45c71..91bf5ad6 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -26,9 +26,11 @@ class BasePermission(object):
         Return `True` if permission is granted, `False` otherwise.
         """
         if len(inspect.getargspec(self.has_permission).args) == 4:
-            warnings.warn('The `obj` argument in `has_permission` is due to be deprecated. '
-                      'Use `has_object_permission()` instead for object permissions.',
-                       PendingDeprecationWarning, stacklevel=2)
+            warnings.warn(
+                'The `obj` argument in `has_permission` is deprecated. '
+                'Use `has_object_permission()` instead for object permissions.',
+                DeprecationWarning, stacklevel=2
+            )
             return self.has_permission(request, view, obj)
         return True
 
-- 
cgit v1.2.3