rpms/TurboGears/devel TurboGears-1.0.8-paginate.patch, NONE, 1.1 TurboGears.spec, 1.43, 1.44

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11344

Modified Files:
	TurboGears.spec 
Added Files:
	TurboGears-1.0.8-paginate.patch 
Log Message:
* Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
- Fix from upstream for pagination problem.


TurboGears-1.0.8-paginate.patch:

--- NEW FILE TurboGears-1.0.8-paginate.patch ---
Index: /branches/1.0/turbogears/paginate.py
===================================================================
--- /branches/1.0/turbogears/paginate.py (revision 5317)
+++ /branches/1.0/turbogears/paginate.py (revision 6575)
@@ -82,6 +82,6 @@
     @type limit: integer
 
-    @param max_limit: The maximum number to which the imposed limit
-    can be increased using the dynamic_limit keyword argument in the URL.
+    @param max_limit: The maximum number to which the imposed limit can be
+    increased using the "var_name"_tgp_limit keyword argument in the URL.
     If this is set to 0, no dynamic change at all will be allowed;
     if it is set to None, any change will be allowed.
@@ -113,4 +113,15 @@
     """
 
+    if default_reversed is not None:
+        warnings.warn("default_reversed is deprecated."
+            " Use default_order='-field' to indicate"
+            " default reversed order, or"
+            " default_order=['field1', '-field2, 'field3']"
+            " for multiple fields.", DeprecationWarning, 2)
+    if allow_limit_override is not None:
+        warnings.warn("allow_limit_override is deprecated."
+            " Use max_limit to specify an upper bound for limit.",
+            DeprecationWarning, 2)
+
     def entangle(func):
 
@@ -122,15 +133,4 @@
                 return kw.pop(var_name + '_tgp_' + name,
                     kw.pop('tg_paginate_' + name, default))
-
-            if default_reversed is not None:
-                warnings.warn("default_reversed is deprecated."
-                    " Use default_order='-field' to indicate"
-                    " default reversed order, or"
-                    " default_order=['field1', '-field2, 'field3']"
-                    " for multiple fields.", DeprecationWarning, 2)
-            if allow_limit_override is not None:
-                warnings.warn("allow_limit_override is deprecated."
-                    " Use max_limit to specify an upper bound for limit.",
-                    DeprecationWarning, 2)
 
             page = kwpop('no')
@@ -152,6 +152,7 @@
             try:
                 limit_ = int(kwpop('limit'))
-                if max_limit is not None:
-                    if max_limit <= 0 and not allow_limit_override:
+                if max_limit is not None and not (
+                        allow_limit_override and max_limit == 0):
+                    if max_limit <= 0:
                         raise ValueError
                     limit_ = min(limit_, max_limit)
Index: /branches/1.0/turbogears/tests/test_paginate.py
===================================================================
--- /branches/1.0/turbogears/tests/test_paginate.py (revision 5674)
+++ /branches/1.0/turbogears/tests/test_paginate.py (revision 6575)
@@ -471,4 +471,29 @@
         Spy.assert_ok(self.body, 'pages', xrange(1, 3))
 
+    def test_limit_override_deprecated(self):
+        import sys, StringIO
+        stderr, sys.stderr = sys.stderr, StringIO.StringIO()
+        try:
+            class DeprecatedMixin(RootController):
+                [expose()]
+                [paginate("data", limit=4, allow_limit_override=True)]
+                def custom_limit_deprecated(self):
+                    spy = Spy(var_name='data',
+                        order=None, ordering=[], row_count=10)
+                    data = range(10)
+                    return dict(data=data, spy=spy)
+        finally:
+            stderr, sys.stderr = sys.stderr, stderr
+            warn = stderr.getvalue()
+            stderr.close()
+        assert 'allow_limit_override is deprecated.' in warn
+        self.MyRoot.__bases__ = (DeprecatedMixin,) + self.MyRoot.__bases__
+        # can override limit (using deprecated parameter)
+        self.request('/custom_limit_deprecated?tg_paginate_limit=2')
+        assert '"data": [0, 1]' in self.body
+        Spy.assert_ok(self.body, 'page_count', 5)
+        Spy.assert_ok(self.body, 'limit', 2)
+        Spy.assert_ok(self.body, 'pages', xrange(1, 6))
+
     def test_max_pages(self):
         self.request("/default_max_pages")


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- TurboGears.spec	23 Feb 2009 23:42:01 -0000	1.43
+++ TurboGears.spec	2 May 2009 14:54:36 -0000	1.44
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -12,7 +12,8 @@ URL:            http://www.turbogears.or
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-cherrypyreq.patch
 Patch1:         %{name}-%{version}-setup.patch
-
+# From upstream changeset r6575
+Patch2:         %{name}-%{version}-paginate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -69,6 +70,7 @@ TurboGears is easy to use for a wide ran
 %setup -q
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
+%patch2 -p3 -b .paginate
 
 
 %build
@@ -92,6 +94,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
+- Fix from upstream for pagination problem.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild