From 44ff2e0add240915d3217ba418178e58e2920419 Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Wed, 14 Nov 2012 19:36:29 +0100
Subject: fixed some typos

---
 rest_framework/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 906a7cf6..4f10481d 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -152,7 +152,7 @@ class APISettings(object):
 
     def validate_setting(self, attr, val):
         if attr == 'FILTER_BACKEND' and val is not None:
-            # Make sure we can initilize the class
+            # Make sure we can initialize the class
             val()
 
 api_settings = APISettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS)
-- 
cgit v1.2.3


From 38e94bb8b4e04249b18b9b57ef2ddcb7cfc4efa4 Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Thu, 15 Nov 2012 11:15:05 +0100
Subject: added global and per resource on/off switch + updated docs

---
 rest_framework/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 906a7cf6..1daa9dfd 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -66,7 +66,9 @@ DEFAULTS = {
     'URL_ACCEPT_OVERRIDE': 'accept',
     'URL_FORMAT_OVERRIDE': 'format',
 
-    'FORMAT_SUFFIX_KWARG': 'format'
+    'FORMAT_SUFFIX_KWARG': 'format',
+
+    'ALLOW_PAGE_SIZE_PARAM': True
 }
 
 
-- 
cgit v1.2.3


From 3ae203a0184d27318a8a828ce322b151ade0340f Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Thu, 15 Nov 2012 12:06:43 +0100
Subject: updated script to just use page_size_kwarg

---
 rest_framework/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 1daa9dfd..c7b0643f 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -68,7 +68,7 @@ DEFAULTS = {
 
     'FORMAT_SUFFIX_KWARG': 'format',
 
-    'ALLOW_PAGE_SIZE_PARAM': True
+    'PAGE_SIZE_KWARG': 'page_size'
 }
 
 
-- 
cgit v1.2.3


From 31f01bd6315f46bf28bb4c9c25a5298785fc4fc6 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 16 Nov 2012 22:45:57 +0000
Subject: Polishing to page size query parameters & more docs

---
 rest_framework/settings.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 8883b963..ee24a4ad 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -54,12 +54,19 @@ DEFAULTS = {
         'user': None,
         'anon': None,
     },
+
+    # Pagination
     'PAGINATE_BY': None,
+    'PAGINATE_BY_PARAM': None,
+
+    # Filtering
     'FILTER_BACKEND': None,
 
+    # Authentication
     'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser',
     'UNAUTHENTICATED_TOKEN': None,
 
+    # Browser enhancements
     'FORM_METHOD_OVERRIDE': '_method',
     'FORM_CONTENT_OVERRIDE': '_content',
     'FORM_CONTENTTYPE_OVERRIDE': '_content_type',
@@ -67,8 +74,6 @@ DEFAULTS = {
     'URL_FORMAT_OVERRIDE': 'format',
 
     'FORMAT_SUFFIX_KWARG': 'format',
-
-    'PAGE_SIZE_KWARG': 'page_size'
 }
 
 
-- 
cgit v1.2.3


From c736b80290dfd650bee0fa3c530da65792dcde32 Mon Sep 17 00:00:00 2001
From: Marc Tamlyn
Date: Mon, 7 Jan 2013 12:52:20 +0000
Subject: Be more informative when reporting import errors.

---
 rest_framework/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index ee24a4ad..5c77c55c 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -115,8 +115,8 @@ def import_from_string(val, setting_name):
         module_path, class_name = '.'.join(parts[:-1]), parts[-1]
         module = importlib.import_module(module_path)
         return getattr(module, class_name)
-    except:
-        msg = "Could not import '%s' for API setting '%s'" % (val, setting_name)
+    except ImportError as e:
+        msg = "Could not import '%s' for API setting '%s'. %s: %s." % (val, setting_name, e.__class__.__name__, e)
         raise ImportError(msg)
 
 
-- 
cgit v1.2.3