Pep8 fixes

common/lib/xmodule/xmodule/course_module.py

@@ -217,8 +217,8 @@ class CourseFields(object):
     has_children = True
     checklists = List(scope=Scope.settings,
                       default=[
-            {"short_description" : "Getting Started With Studio",
-             "items" : [{"short_description": "Add Course Team Members",
+                          {"short_description": "Getting Started With Studio",
+                           "items": [{"short_description": "Add Course Team Members",
                                       "long_description": "Grant your collaborators permission to edit your course so you can work together.",
                                       "is_checked": False,
                                       "action_url": "ManageUsers",
@@ -241,10 +241,9 @@ class CourseFields(object):
                                       "is_checked": False,
                                       "action_url": "",
                                       "action_text": "",
-                         "action_external": False}]
-            },
-            {"short_description" : "Draft a Rough Course Outline",
-             "items" : [{"short_description": "Create Your First Section and Subsection",
+                                      "action_external": False}]},
+                          {"short_description": "Draft a Rough Course Outline",
+                           "items": [{"short_description": "Create Your First Section and Subsection",
                                       "long_description": "Use your course outline to build your first Section and Subsection.",
                                       "is_checked": False,
                                       "action_url": "CourseOutline",
@@ -285,10 +284,9 @@ class CourseFields(object):
                                       "is_checked": False,
                                       "action_url": "CourseOutline",
                                       "action_text": "Edit Course Outline",
-                          "action_external": False}]
-            },
-            {"short_description" : "Explore edX's Support Tools",
-             "items" : [{"short_description": "Explore the Studio Help Forum",
+                                      "action_external": False}]},
+                          {"short_description": "Explore edX's Support Tools",
+                           "items": [{"short_description": "Explore the Studio Help Forum",
                                       "long_description": "Access the Studio Help forum from the menu that appears when you click your user name in the top right corner of Studio.",
                                       "is_checked": False,
                                       "action_url": "http://help.edge.edx.org/",
@@ -305,10 +303,9 @@ class CourseFields(object):
                                       "is_checked": False,
                                       "action_url": "http://files.edx.org/Getting_Started_with_Studio.pdf",
                                       "action_text": "Download Documentation",
-                          "action_external": True}]
-            },
-            {"short_description" : "Draft Your Course About Page",
-             "items" : [{"short_description": "Draft a Course Description",
+                                      "action_external": True}]},
+                          {"short_description": "Draft Your Course About Page",
+                           "items": [{"short_description": "Draft a Course Description",
                                       "long_description": "Courses on edX have an About page that includes a course video, description, and more. Draft the text students will read before deciding to enroll in your course.",
                                       "is_checked": False,
                                       "action_url": "SettingsDetails",
@@ -331,8 +328,7 @@ class CourseFields(object):
                                       "is_checked": False,
                                       "action_url": "SettingsDetails",
                                       "action_text": "Edit Course Schedule & Details",
-                          "action_external": False}]
-            }
+                                      "action_external": False}]}
         ])
     info_sidebar_name = String(scope=Scope.settings, default='Course Handouts')
     show_timezone = Boolean(help="True if timezones should be shown on dates in the courseware", scope=Scope.settings, default=True)

lms/djangoapps/shoppingcart/tests/test_models.py

@@ -3,8 +3,10 @@ Tests for the Shopping Cart Models
 """
 
 from factory import DjangoModelFactory
+from mock import patch
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.db import DatabaseError
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
@@ -12,7 +14,7 @@ from shoppingcart.models import Order, OrderItem, CertificateItem, InvalidCartIt
 from student.tests.factories import UserFactory
 from student.models import CourseEnrollment
 from course_modes.models import CourseMode
-from ..exceptions import PurchasedCallbackException
+from shoppingcart.exceptions import PurchasedCallbackException
 
 
 class OrderTest(TestCase):
@@ -74,6 +76,17 @@ class OrderTest(TestCase):
         cart.purchase()
         self.assertTrue(CourseEnrollment.is_enrolled(self.user, self.course_id))
 
+    def test_purchase_item_failure(self):
+        # once again, we're testing against the specific implementation of
+        # CertificateItem
+        cart = Order.get_cart_for_user(user=self.user)
+        CertificateItem.add_to_order(cart, self.course_id, self.cost, 'verified')
+        with patch('shoppingcart.models.CertificateItem.save', side_effect=DatabaseError):
+            with self.assertRaises(DatabaseError):
+                cart.purchase()
+                # verify that we rolled back the entire transaction
+                self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course_id))
+
 
 class OrderItemTest(TestCase):
     def setUp(self):

lms/djangoapps/shoppingcart/tests/test_views.py

@@ -22,6 +22,7 @@ from mitxmako.shortcuts import render_to_response
 from shoppingcart.processors import render_purchase_form_html, process_postpay_callback
 from mock import patch, Mock
 
+
 def mock_render_purchase_form_html(*args, **kwargs):
     return render_purchase_form_html(*args, **kwargs)
 
@@ -34,6 +35,7 @@ render_mock = Mock(side_effect=mock_render_to_response)
 
 postpay_mock = Mock()
 
+
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class ShoppingCartViewsTests(ModuleStoreTestCase):
     def setUp(self):
@@ -53,7 +55,6 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
     def login_user(self):
         self.client.login(username=self.user.username, password="password")
 
-
     def test_add_course_to_cart_anon(self):
         resp = self.client.post(reverse('shoppingcart.views.add_course_to_cart', args=[self.course_id]))
         self.assertEqual(resp.status_code, 403)
@@ -158,7 +159,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
     @patch('shoppingcart.views.process_postpay_callback', postpay_mock)
     @patch('shoppingcart.views.render_to_response', render_mock)
     def test_postpay_callback_failure(self):
-        postpay_mock.return_value = {'success': False, 'order': self.cart, 'error_html':'ERROR_TEST!!!'}
+        postpay_mock.return_value = {'success': False, 'order': self.cart, 'error_html': 'ERROR_TEST!!!'}
         self.login_user()
         resp = self.client.post(reverse('shoppingcart.views.postpay_callback', args=[]))
         self.assertEqual(resp.status_code, 200)

lms/djangoapps/shoppingcart/views.py

@@ -26,7 +26,7 @@ def add_course_to_cart(request, course_id):
         PaidCourseRegistration.add_to_order(cart, course_id)
     except ItemNotFoundError:
         return HttpResponseNotFound(_('The course you requested does not exist.'))
-    if request.method == 'GET': ### This is temporary for testing purposes and will go away before we pull
+    if request.method == 'GET':  # This is temporary for testing purposes and will go away before we pull
         return HttpResponseRedirect(reverse('shoppingcart.views.show_cart'))
     return HttpResponse(_("Course added to cart."))