Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #9460 from edx/bderusha/edx-search-for-teams-TNL-3013-patch

Browse Source 
Remove pylint: disable invalid-name for paginator error and fix syntax
This commit is contained in:
Bill DeRusha
2015-08-25 11:01:11 -04:00
parent 154c9bae43 81ced1c964
commit cd751ab5fe
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
openedx/core/lib/api/paginators.py
View File

@@ -1,7 +1,6 @@
""" Paginatator methods for edX API implementations.""" """ Paginatator methods for edX API implementations."""
from django.http import Http404 from django.http import Http404
from django.utils.translation import ugettext as _
from django.core.paginator import Paginator, InvalidPage from django.core.paginator import Paginator, InvalidPage
@@ -26,15 +25,17 @@ def paginate_search_results(object_class, search_results, page_size, page):
if page == 'last': if page == 'last':
page_number = paginator.num_pages page_number = paginator.num_pages
else: else:
raise Http404(_("Page is not 'last', nor can it be converted to an int.")) raise Http404("Page is not 'last', nor can it be converted to an int.")
try: try:
paged_results = paginator.page(page_number) paged_results = paginator.page(page_number)
except InvalidPage as e: # pylint: disable=invalid-name except InvalidPage as exception:
raise Http404(_('Invalid page (%(page_number)s): %(message)s') % { raise Http404(
'page_number': page_number, "Invalid page {page_number}: {message}".format(
'message': str(e) page_number=page_number,
}) message=str(exception)
)
)
search_queryset_pks = [item['data']['pk'] for item in paged_results.object_list] search_queryset_pks = [item['data']['pk'] for item in paged_results.object_list]
queryset = object_class.objects.filter(pk__in=search_queryset_pks) queryset = object_class.objects.filter(pk__in=search_queryset_pks)