Context is updated, return it. Also avoid recursion error.

[django-pagination.git] / linaro_django_pagination / test_project / settings.py

diff --git a/linaro_django_pagination/test_project/settings.py b/linaro_django_pagination/test_project/settings.py
index 47da7e4..cf7ea25 100644 (file)
--- a/linaro_django_pagination/test_project/settings.py
+++ b/linaro_django_pagination/test_project/settings.py
@@ -1,10 +1,10 @@
 # Copyright (c) 2010, 2011 Linaro Limited
 # All rights reserved.
 # Copyright (c) 2010, 2011 Linaro Limited
 # All rights reserved.

-# 
+#

 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:

-# 
+#

 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above


@@ -14,7 +14,7 @@
 #     * Neither the name of the author nor the names of other
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #     * Neither the name of the author nor the names of other
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.

-# 
+#

 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR


@@ -42,15 +42,13 @@ locals().update(
     gen_settings(
         INSTALLED_APPS=[
             'example',
     gen_settings(
         INSTALLED_APPS=[
             'example',

-            'linaro_django_pagination',
-        ],
+            'linaro_django_pagination'],

         MIDDLEWARE_CLASSES=[
         MIDDLEWARE_CLASSES=[

-            'linaro_django_pagination.middleware.PaginationMiddleware',
-        ],
+            'linaro_django_pagination.middleware.PaginationMiddleware'],

         TEMPLATE_CONTEXT_PROCESSORS=[
             # Request processor needs to be enabled
         TEMPLATE_CONTEXT_PROCESSORS=[
             # Request processor needs to be enabled

-            'django.core.context_processors.request'
-        ],
-        ROOT_URLCONF="linaro_django_pagination.test_project.urls"
+            'django.core.context_processors.request'],
+        ROOT_URLCONF="linaro_django_pagination.test_project.urls"),
+        TEMPLATE_LOADERS = ['django.template.loaders.app_directories.Loader'],
+        SECRET_KEY = 'not for production',

     )
     )

-)