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

[django-pagination.git] / linaro_django_pagination / tests.py

diff --git a/linaro_django_pagination/tests.py b/linaro_django_pagination/tests.py
index c440339..90468d5 100644 (file)
--- a/linaro_django_pagination/tests.py
+++ b/linaro_django_pagination/tests.py
@@ -1,11 +1,11 @@
 # Copyright (c) 2008, Eric Florenzano
 # Copyright (c) 2010, 2011 Linaro Limited
 # All rights reserved.
 # Copyright (c) 2008, Eric Florenzano
 # 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


@@ -15,7 +15,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


@@ -171,24 +171,24 @@
 ...     page = lambda self, suffix: 1
 
 >>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
 ...     page = lambda self, suffix: 1
 
 >>> t.render(Context({'var': range(21), 'request': HttpRequest()}))

-u'\\n\\n<div class="pagination">...
+u'\\n...\\n...<div class="pagination">...

 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'request': HttpRequest()}))

-u'\\n\\n<div class="pagination">...
+u'\\n...\\n...<div class="pagination">...

 >>> t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
 >>> t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'request': HttpRequest()}))

-u'\\n\\n<div class="pagination">...
+u'\\n...\\n...<div class="pagination">...

 >>> t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
 >>> t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))

-u'\\n\\n<div class="pagination">...<a href="?page=2"...
+u'\\n...\\n...<div class="pagination">...<a href="?page=2"...

 >>> t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")
 >>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
 u'[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]'
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var2 by as foo2 %}{% paginate %}{% autopaginate var by as foo %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()}))
 >>> t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")
 >>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
 u'[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]'
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var2 by as foo2 %}{% paginate %}{% autopaginate var by as foo %}{% paginate %}")
 >>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()}))

-u'\\n\\n<div class="pagination">...<a href="?page_var2=2"...<a href="?page_var=2"...
+u'\\n...\\n...<div class="pagination">...<a href="?page_var2=2"...<a href="?page_var=2"...

 >>>
 
 # Testing InfinitePaginator
 >>>
 
 # Testing InfinitePaginator