Merge pull request #327 from MITx/fix-beautifulsoup4

djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4

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',

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

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