aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-11-23 13:21:18 +0000
committerTom Christie2012-11-23 13:21:18 +0000
commitfd89bca35f065cd3917fffc79b59927460a88a3a (patch)
tree1644b495a280277b9252971850b57f6d7143d2fc
parent95aa99d8dfc4b073bf549f5acba8ef2387512c86 (diff)
downloaddjango-rest-framework-fd89bca35f065cd3917fffc79b59927460a88a3a.tar.bz2
Version 2.1.6. AKA: I am a doofus.2.1.6
-rw-r--r--README.md6
-rw-r--r--docs/topics/release-notes.md6
-rw-r--r--rest_framework/__init__.py2
-rw-r--r--rest_framework/permissions.py2
4 files changed, 14 insertions, 2 deletions
diff --git a/README.md b/README.md
index cef95cb8..f646f957 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,12 @@ To run the tests.
# Changelog
+## 2.1.6
+
+**Date**: 23rd Nov 2012
+
+* Bugfix: Unfix DjangoModelPermissions. (I am a doofus.)
+
## 2.1.5
**Date**: 23rd Nov 2012
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 118e764b..867b138b 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -4,6 +4,12 @@
>
> — Eric S. Raymond, [The Cathedral and the Bazaar][cite].
+## 2.1.6
+
+**Date**: 23rd Nov 2012
+
+* Bugfix: Unfix DjangoModelPermissions. (I am a doofus.)
+
## 2.1.5
**Date**: 23rd Nov 2012
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index c1452d52..48cebbc5 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '2.1.5'
+__version__ = '2.1.6'
VERSION = __version__ # synonym
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 258eb9ad..655b78a3 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -109,6 +109,6 @@ class DjangoModelPermissions(BasePermission):
if (request.user and
request.user.is_authenticated() and
- request.user.has_perm(perms, obj)):
+ request.user.has_perms(perms, obj)):
return True
return False