Move off of our fork onto a published fork of the rfc6266.

The published fork seems to be getting updates more regularly than the original project
and has the bugfix we forked for.

cms/djangoapps/contentstore/views/videos.py

@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
 from pytz import UTC
 from uuid import uuid4
 
-import rfc6266
+import rfc6266_parser
 from boto import s3
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
@@ -458,7 +458,7 @@ def video_encodings_download(request, course_key_string):
     # listing for videos uploaded through Studio
     filename = _("{course}_video_urls").format(course=course.id.course)
     # See https://tools.ietf.org/html/rfc6266#appendix-D
-    response["Content-Disposition"] = rfc6266.build_header(
+    response["Content-Disposition"] = rfc6266_parser.build_header(
         filename + ".csv",
         filename_compat="video_urls.csv"
     )

requirements/edx/base.in

@@ -125,6 +125,7 @@ python-openid
 python-saml==2.4.0
 pyuca==1.1                          # For more accurate sorting of translated country names in django-countries
 reportlab==3.1.44                   # Used for shopping cart's pdf invoice/receipt generation
+rfc6266-parser                      # Used to generate Content-Disposition headers.
 social-auth-app-django==1.2.0
 social-auth-core==1.4.0
 pysrt==0.4.7                        # Support for SubRip subtitle files, used in the video XModule

requirements/edx/github.in

@@ -75,9 +75,6 @@
 # This can go away when we update auth to not use django-rest-framework-oauth
 -e git+https://github.com/edx/django-oauth-plus.git@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1
 
-# NOTE (CCB): This must remain. There is one commit on the upstream repo that has not been released to PyPI.
--e git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx
-
 # Why a DRF fork? See: https://openedx.atlassian.net/browse/PLAT-1581
 -e git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3