Skip to content

Commit 39b662f

Browse files
berkerpeksagagjohnson
authored andcommitted
Delete redundant _badge_return() helper (#2308)
Closes #1743
1 parent 6aaab49 commit 39b662f

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

readthedocs/projects/views/public.py

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import json
66
import logging
77
import mimetypes
8-
import md5
98

109
from django.core.urlresolvers import reverse
1110
from django.core.cache import cache
@@ -106,20 +105,8 @@ def get_context_data(self, **kwargs):
106105
return context
107106

108107

109-
def _badge_return(redirect, url):
110-
if redirect:
111-
return HttpResponseRedirect(url)
112-
else:
113-
response = requests.get(url)
114-
http_response = HttpResponse(response.content,
115-
content_type="image/svg+xml")
116-
http_response['Cache-Control'] = 'no-cache'
117-
http_response['Etag'] = md5.new(url)
118-
return http_response
119-
120-
121108
@cache_control(no_cache=True)
122-
def project_badge(request, project_slug, redirect=True):
109+
def project_badge(request, project_slug):
123110
"""Return a sweet badge for the project"""
124111
version_slug = request.GET.get('version', LATEST)
125112
style = request.GET.get('style', 'flat')
@@ -130,21 +117,21 @@ def project_badge(request, project_slug, redirect=True):
130117
url = (
131118
'https://img.shields.io/badge/docs-unknown%20version-yellow.svg?style={style}'
132119
.format(style=style))
133-
return _badge_return(redirect, url)
120+
return HttpResponseRedirect(url)
134121
version_builds = version.builds.filter(type='html', state='finished').order_by('-date')
135122
if not version_builds.exists():
136123
url = (
137124
'https://img.shields.io/badge/docs-no%20builds-yellow.svg?style={style}'
138125
.format(style=style))
139-
return _badge_return(redirect, url)
126+
return HttpResponseRedirect(url)
140127
last_build = version_builds[0]
141128
if last_build.success:
142129
color = 'brightgreen'
143130
else:
144131
color = 'red'
145132
url = 'https://img.shields.io/badge/docs-%s-%s.svg?style=%s' % (
146133
version.slug.replace('-', '--'), color, style)
147-
return _badge_return(redirect, url)
134+
return HttpResponseRedirect(url)
148135

149136

150137
def project_downloads(request, project_slug):

0 commit comments

Comments
 (0)