Merge pull request #35181 from openedx/feanil/fix_bad_merge

fix: Remove errant pluses from a bad merge.

cms/djangoapps/contentstore/utils.py

@@ -1699,7 +1699,8 @@ def get_home_context(request, no_course=False):
         'library_authoring_mfe_url': LIBRARY_AUTHORING_MICROFRONTEND_URL,
         'taxonomy_list_mfe_url': get_taxonomy_list_url(),
         'libraries': libraries,
-        'show_new_library_button': user_can_view_create_library_button(user) and not should_redirect_to_library_authoring_mfe(),
+        'show_new_library_button': user_can_view_create_library_button(user)
+        and not should_redirect_to_library_authoring_mfe(),
         'user': user,
         'request_course_creator_url': reverse('request_course_creator'),
         'course_creator_status': _get_course_creator_status(user),

cms/djangoapps/contentstore/views/library.py

@@ -68,6 +68,7 @@ def should_redirect_to_library_authoring_mfe():
         REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND.is_enabled()
     )
 
+
 def user_can_view_create_library_button(user):
     """
     Helper method for displaying the visibilty of the create_library_button.
@@ -92,7 +93,6 @@ def user_can_view_create_library_button(user):
             return not disable_course_creation
 
 
-
 def user_can_create_library(user, org):
     """
     Helper method for returning the library creation status for a particular user,

cms/djangoapps/contentstore/views/tests/test_library.py

@@ -111,7 +111,7 @@ class UnitTestLibraries(CourseTestCase):
             self.assertEqual(user_can_create_library(nostaff_user, 'SomEOtherOrg'), False)
 
     # When creator groups are enabled, course instructor members can create libraries
-     # but only in the org they are course staff for.
+    # but only in the org they are course staff for.
     @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
     def test_library_creator_status_with_course_instructor_role_for_enabled_creator_group_setting(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()

common/djangoapps/util/file.py

@@ -80,10 +80,10 @@ def store_uploaded_file(
         stored_file_name = file_storage.save(stored_file_name, uploaded_file)
         if is_private and settings.DEFAULT_FILE_STORAGE == 'storages.backends.s3boto3.S3Boto3Storage':
             S3Boto3Storage().connection.meta.client.put_object_acl(
-+                ACL='private',
-+                Bucket=settings.AWS_STORAGE_BUCKET_NAME,
-+                Key=stored_file_name,
-+           )
+                ACL='private',
+                Bucket=settings.AWS_STORAGE_BUCKET_NAME,
+                Key=stored_file_name,
+            )
 
         if validator:
             try: