From a500b83ff2fc63fd0ac98c2aaba783f007def739 Mon Sep 17 00:00:00 2001 From: David Medina Date: Thu, 10 Oct 2013 11:14:46 +0200 Subject: [PATCH] Move strict_positive_int to pagination module --- rest_framework/generics.py | 12 +----------- rest_framework/pagination.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 4f134bce6..127957514 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -11,20 +11,10 @@ from django.utils.translation import ugettext as _ from rest_framework import views, mixins, exceptions from rest_framework.request import clone_request from rest_framework.settings import api_settings +from rest_framework.pagination import strict_positive_int import warnings -def strict_positive_int(integer_string, cutoff=None): - """ - Cast a string to a strictly positive integer. - """ - ret = int(integer_string) - if ret <= 0: - raise ValueError() - if cutoff: - ret = min(ret, cutoff) - return ret - def get_object_or_404(queryset, *filter_args, **filter_kwargs): """ Same as Django's standard shortcut, but make sure to raise 404 diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index d51ea929b..0e8ac9db6 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -7,6 +7,18 @@ from rest_framework import serializers from rest_framework.templatetags.rest_framework import replace_query_param +def strict_positive_int(integer_string, cutoff=None): + """ + Cast a string to a strictly positive integer. + """ + ret = int(integer_string) + if ret <= 0: + raise ValueError() + if cutoff: + ret = min(ret, cutoff) + return ret + + class NextPageField(serializers.Field): """ Field that returns a link to the next page in paginated results.