Skip to content

Commit dc6a2fe

Browse files
Resolve linting messages in readthedocs.restapi.*
1 parent 937f287 commit dc6a2fe

File tree

7 files changed

+44
-22
lines changed

7 files changed

+44
-22
lines changed

readthedocs/restapi/permissions.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,3 @@ def has_object_permission(self, request, view, obj):
4343
has_perm = super(APIPermission, self).has_object_permission(
4444
request, view, obj)
4545
return has_perm or (request.user and request.user.is_staff)
46-
47-
48-

readthedocs/restapi/urls.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@
1919
url(r'docurl/', 'readthedocs.restapi.views.core_views.docurl', name='docurl'),
2020
url(r'cname/', 'readthedocs.restapi.views.core_views.cname', name='cname'),
2121
url(r'footer_html/', 'readthedocs.restapi.views.footer_views.footer_html', name='footer_html'),
22-
url(r'index_search/', 'readthedocs.restapi.views.search_views.index_search', name='index_search'),
22+
url(r'index_search/',
23+
'readthedocs.restapi.views.search_views.index_search',
24+
name='index_search'),
2325
url(r'search/$', 'readthedocs.restapi.views.search_views.search', name='api_search'),
24-
url(r'search/project/$', 'readthedocs.restapi.views.search_views.project_search', name='api_project_search'),
25-
url(r'search/section/$', 'readthedocs.restapi.views.search_views.section_search', name='api_section_search'),
26+
url(r'search/project/$',
27+
'readthedocs.restapi.views.search_views.project_search',
28+
name='api_project_search'),
29+
url(r'search/section/$',
30+
'readthedocs.restapi.views.search_views.section_search',
31+
name='api_section_search'),
2632
)

readthedocs/restapi/utils.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ def sync_versions(project, versions, type):
4141
type=type,
4242
machine=False,
4343
)
44-
log.info("(Sync Versions) Updated Version: [%s=%s] " % (version['verbose_name'], version['identifier']))
44+
log.info("(Sync Versions) Updated Version: [%s=%s] " % (
45+
version['verbose_name'], version['identifier']))
4546
else:
4647
# New Version
4748
created_version = Version.objects.create(
@@ -82,15 +83,16 @@ def delete_versions(project, version_data):
8283
return set()
8384

8485

85-
def index_search_request(version, page_list, commit, project_scale, page_scale, section=True, delete=True):
86+
def index_search_request(version, page_list, commit, project_scale, page_scale,
87+
section=True, delete=True):
8688
log_msg = ' '.join([page['path'] for page in page_list])
8789
log.info("(Server Search) Indexing Pages: %s [%s]" % (
8890
version.project.slug, log_msg))
8991
project = version.project
9092
page_obj = PageIndex()
9193
section_obj = SectionIndex()
9294

93-
#tags = [tag.name for tag in project.tags.all()]
95+
# tags = [tag.name for tag in project.tags.all()]
9496

9597
project_obj = ProjectIndex()
9698
project_obj.index_document(data={
@@ -125,7 +127,10 @@ def index_search_request(version, page_list, commit, project_scale, page_scale,
125127
if section:
126128
for section in page['sections']:
127129
section_index_list.append({
128-
'id': hashlib.md5('%s-%s-%s-%s' % (project.slug, version.slug, page['path'], section['id'])).hexdigest(),
130+
'id': hashlib.md5(
131+
'%s-%s-%s-%s' % (project.slug, version.slug,
132+
page['path'], section['id'])
133+
).hexdigest(),
129134
'project': project.slug,
130135
'version': version.slug,
131136
'path': page['path'],

readthedocs/restapi/views/core_views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ def docurl(request):
5959
doc = request.GET.get('doc', 'index')
6060

6161
project = get_object_or_404(Project, slug=project)
62-
version = get_object_or_404(Version.objects.public(request.user, project=project, only_active=False), slug=version)
62+
version = get_object_or_404(
63+
Version.objects.public(request.user, project=project, only_active=False),
64+
slug=version)
6365
return Response({
6466
'url': make_document_url(project=project, version=version.slug, page=doc)
6567
})

readthedocs/restapi/views/footer_views.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@ def footer_html(request):
2727
new_theme = (theme == "sphinx_rtd_theme")
2828
using_theme = (theme == "default")
2929
project = get_object_or_404(Project, slug=project_slug)
30-
version = get_object_or_404(Version.objects.public(request.user, project=project, only_active=False), slug=version_slug)
30+
version = get_object_or_404(
31+
Version.objects.public(request.user, project=project, only_active=False),
32+
slug=version_slug)
3133
main_project = project.main_language_project or project
3234

3335
if page_slug and page_slug != "index":
34-
if main_project.documentation_type == "sphinx_htmldir" or main_project.documentation_type == "mkdocs":
36+
if (
37+
main_project.documentation_type == "sphinx_htmldir" or
38+
main_project.documentation_type == "mkdocs"):
3539
path = page_slug + "/"
3640
elif main_project.documentation_type == "sphinx_singlehtml":
3741
path = "index.html#document-" + page_slug
@@ -41,10 +45,11 @@ def footer_html(request):
4145
path = ""
4246

4347
if version.type == 'tag' and version.project.has_pdf(version.slug):
44-
print_url = 'https://keminglabs.com/print-the-docs/quote?project={project}&version={version}'.format(
45-
project=project.slug,
46-
version=version.slug,
47-
)
48+
print_url = (
49+
'https://keminglabs.com/print-the-docs/quote?project={project}&version={version}'
50+
.format(
51+
project=project.slug,
52+
version=version.slug))
4853
else:
4954
print_url = None
5055

readthedocs/restapi/views/model_views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ def valid_versions(self, request, **kwargs):
4343
project = get_object_or_404(
4444
Project.objects.api(self.request.user), pk=kwargs['pk'])
4545
if not project.num_major or not project.num_minor or not project.num_point:
46-
return Response({'error': 'Project does not support point version control'}, status=status.HTTP_400_BAD_REQUEST)
46+
return Response(
47+
{'error': 'Project does not support point version control'},
48+
status=status.HTTP_400_BAD_REQUEST)
4749
version_strings = project.supported_versions()
4850
# Disable making old versions inactive for now.
4951
# project.versions.exclude(verbose_name__in=version_strings).update(active=False)

readthedocs/restapi/views/search_views.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def index_search(request):
3232
project_scale = 1
3333
page_scale = 1
3434

35-
utils.index_search_request(version=version, page_list=data['page_list'], commit=commit, project_scale=project_scale, page_scale=page_scale)
35+
utils.index_search_request(
36+
version=version, page_list=data['page_list'], commit=commit,
37+
project_scale=project_scale, page_scale=page_scale)
3638

3739
return Response({'indexed': True})
3840

@@ -133,8 +135,9 @@ def section_search(request):
133135
Facets
134136
------
135137
136-
When you search, you will have a ``project`` facet, which includes the number of matching sections per project.
137-
When you search inside a project, the ``path`` facet will show the number of matching sections per page.
138+
When you search, you will have a ``project`` facet, which includes the
139+
number of matching sections per project. When you search inside a project,
140+
the ``path`` facet will show the number of matching sections per page.
138141
139142
Possible GET args
140143
-----------------
@@ -155,7 +158,9 @@ def section_search(request):
155158
"""
156159
query = request.GET.get('q', None)
157160
if not query:
158-
return Response({'error': 'Search term required. Use the "q" GET arg to search. '}, status=status.HTTP_400_BAD_REQUEST)
161+
return Response(
162+
{'error': 'Search term required. Use the "q" GET arg to search. '},
163+
status=status.HTTP_400_BAD_REQUEST)
159164

160165
project_slug = request.GET.get('project', None)
161166
version_slug = request.GET.get('version', LATEST)

0 commit comments

Comments
 (0)