diff --git a/cms/envs/dev.py b/cms/envs/dev.py index b0729ba8852e7bf0b8243b8d48946c29c2735290..59bc623729e7e29d1f532d1eebc47e6b65c84c93 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -37,7 +37,8 @@ REPOS = { }, 'content-mit-6002x': { 'branch': 'master', - 'origin': 'git@github.com:MITx/6002x-fall-2012.git', + #'origin': 'git@github.com:MITx/6002x-fall-2012.git', + 'origin': 'git@github.com:MITx/content-mit-6002x.git', }, '6.00x': { 'branch': 'master', diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index eeda9a6b653e7813ab8dce840f41bbb035966507..b739e0e37ccf71899cd181eb66ed0fe479df324e 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -23,7 +23,8 @@ from django.http import HttpResponse, Http404 from django.shortcuts import redirect from mitxmako.shortcuts import render_to_response, render_to_string from django.core.urlresolvers import reverse -from BeautifulSoup import BeautifulSoup +#from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from django.core.cache import cache from django_future.csrf import ensure_csrf_cookie diff --git a/requirements.txt b/requirements.txt index 4cc132d6ff7a0920c40425b4da98e7ed62179f91..46c822642ec85e4d2d24e421d996ff2f1c58dd43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,8 @@ django_debug_toolbar -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline django-staticfiles>=1.2.1 fs -beautifulsoup +beautifulsoup +beautifulsoup4 feedparser requests sympy