Reverts the changes made to accommodate edX's deleted forks

https://github.com/edx-olive/edx-platform/compare/38577488cb8c9335f73456939d480b19fdd92f3c...239cb23502a8616d826acdde50bc4dad70aa7b2b

And uses upstream (constrained) versions of requests-oauthlib and oauthlib

Bumping requests-oauthlib to 1.2 updates oauthlib, which changes a response
code in certain cases, and causes a test to fail.

See oauthlib/oauthlib#264 for more context

cms/djangoapps/contentstore/views/videos.py

@@ -6,7 +6,7 @@
 from datetime import datetime, timedelta
 from uuid import uuid4
 
-import rfc6266_parser
+import rfc6266
 from boto import s3
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
@@ -212,7 +212,7 @@ def make_csv_dict(video):
     # 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_parser.build_header(
+    response["Content-Disposition"] = rfc6266.build_header(
         filename + ".csv",
         filename_compat="video_urls.csv"
     )

requirements/edx/base.txt

@@ -62,7 +62,6 @@ edx-search==1.0.1
 facebook-sdk==0.4.0
 feedparser==5.1.3
 firebase-token-generator==1.3.2
-fs==0.5.4
 GitPython==0.3.2.RC1
 glob2==0.3
 gunicorn==0.17.4
@@ -78,7 +77,7 @@ mongoengine==0.10.0
 MySQL-python==1.2.5
 networkx==1.7
 nose-xunitmp==0.3.2
-oauthlib==1.0.3
+oauthlib==2.1.0
 path.py==8.2.1
 piexif==1.0.2
 Pillow==3.4
@@ -100,8 +99,7 @@ pytz==2016.7
 pysrt==0.4.7
 PyYAML==3.12
 requests==2.9.1
-requests-oauthlib==1.2.0
-rfc6266-parser==0.0.5.post2
+requests-oauthlib==1.1.0
 rules==1.1.1
 scipy==0.14.0
 Shapely==1.2.16

requirements/edx/github.txt

@@ -56,9 +56,19 @@ git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
 git+https://github.com/mitodl/django-cas.git@v2.1.1#egg=django-cas==2.1.1
 -e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest
+# Master pyfs has a bug working with VPC auth. This is a fix. We should switch
+# back to master when and if this fix is merged back.
+# fs==0.4.0
+git+https://github.com/edx/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b#egg=fs==0.4.0
 # The officially released version of django-debug-toolbar-mongo doesn't support DJDT 1.x. This commit does.
 git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808#egg=django-debug-toolbar-mongo==0.1.10
 
+# NOTE (CCB): This must remain. There is one commit on the upstream repo that has not been released to PyPI.
+git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx
+
+# Used for testing
+git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002
+
 # Our libraries:
 -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail==0.0
 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1

requirements/edx/testing.txt

@@ -10,4 +10,3 @@
 #   * @edx/devops - to check system requirements
 
 pysqlite==2.8.3
-lettuce==0.2.23