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

updated the division operation to make the output compatible in python 2 and python 3

Browse Source 
changes made to fix quality errors

changes made to fix issues on BOM-587

minor changes made to fix quality issues

minor changes

removed unused pylint supression
This commit is contained in:
aarif
2019-10-01 13:46:12 +05:00
parent 6e13e061a7
commit 86c7b9f809
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/contentserver/middleware.py
View File

@@ -156,7 +156,7 @@ class StaticContentServer(object):
if 0 <= first <= last < content.length:
# If the byte range is satisfiable
response = HttpResponse(content.stream_data_in_range(first, last))
response['Content-Range'] = b'bytes {first}-{last}/{length}'.format(
response['Content-Range'] = u'bytes {first}-{last}/{length}'.format(
first=first, last=last, length=content.length
)
response['Content-Length'] = str(last - first + 1)

15
openedx/core/djangoapps/contentserver/test/test_contentserver.py
View File

@@ -218,13 +218,8 @@ class ContentStoreToyCourseTest(SharedModuleStoreTestCase):
resp = self.client.get(self.url_unlocked, HTTP_RANGE='bytes=0-')
self.assertEqual(resp.status_code, 206) # HTTP_206_PARTIAL_CONTENT
self.assertEqual(
resp['Content-Range'],
b'bytes {first}-{last}/{length}'.format(
first=0, last=self.length_unlocked - 1,
length=self.length_unlocked
)
)
self.assertEqual(resp['Content-Range'], u'bytes {first}-{last}/{length}'
.format(first=0, last=self.length_unlocked - 1, length=self.length_unlocked))
self.assertEqual(resp['Content-Length'], str(self.length_unlocked))
def test_range_request_partial_file(self):
@@ -233,13 +228,13 @@ class ContentStoreToyCourseTest(SharedModuleStoreTestCase):
outputs partial content status code and valid Content-Range and Content-Length.
first_byte and last_byte are chosen to be simple but non trivial values.
"""
first_byte = self.length_unlocked / 4
last_byte = self.length_unlocked / 2
first_byte = self.length_unlocked // 4
last_byte = self.length_unlocked // 2
resp = self.client.get(self.url_unlocked, HTTP_RANGE='bytes={first}-{last}'.format(
first=first_byte, last=last_byte))
self.assertEqual(resp.status_code, 206) # HTTP_206_PARTIAL_CONTENT
self.assertEqual(resp['Content-Range'], b'bytes {first}-{last}/{length}'.format(
self.assertEqual(resp['Content-Range'], u'bytes {first}-{last}/{length}'.format(
first=first_byte, last=last_byte, length=self.length_unlocked))
self.assertEqual(resp['Content-Length'], str(last_byte - first_byte + 1))