fix: fix quality warnings

cms/djangoapps/contentstore/management/commands/export_content_library.py

@@ -51,16 +51,15 @@ def handle(self, *args, **options):
             tarball = tasks.create_export_tarball(library, library_key, {}, None)
         except Exception as e:
             raise CommandError(f'Failed to export "{library_key}" with "{e}"')  # lint-amnesty, pylint: disable=raise-missing-from
-        else:
-            with tarball:
-                # Save generated archive with keyed filename
-                prefix, suffix, n = str(library_key).replace(':', '+'), '.tar.gz', 0
-                while os.path.exists(prefix + suffix):
-                    n += 1
-                    prefix = '{}_{}'.format(prefix.rsplit('_', 1)[0], n) if n > 1 else f'{prefix}_1'
-                filename = prefix + suffix
-                target = os.path.join(dest_path, filename)
-                tarball.file.seek(0)
-                with open(target, 'wb') as f:
-                    shutil.copyfileobj(tarball.file, f)
-                print(f'Library "{library.location.library_key}" exported to "{target}"')
+        with tarball:
+            # Save generated archive with keyed filename
+            prefix, suffix, n = str(library_key).replace(':', '+'), '.tar.gz', 0
+            while os.path.exists(prefix + suffix):
+                n += 1
+                prefix = '{}_{}'.format(prefix.rsplit('_', 1)[0], n) if n > 1 else f'{prefix}_1'
+            filename = prefix + suffix
+            target = os.path.join(dest_path, filename)
+            tarball.file.seek(0)
+            with open(target, 'wb') as f:
+                shutil.copyfileobj(tarball.file, f)
+            print(f'Library "{library.location.library_key}" exported to "{target}"')

common/djangoapps/track/views/segmentio.py

@@ -205,9 +205,8 @@ def track_segmentio_event(request):  # pylint: disable=too-many-statements
         raise EventValidationError(ERROR_USER_NOT_EXIST)  # lint-amnesty, pylint: disable=raise-missing-from
     except ValueError:
         raise EventValidationError(ERROR_INVALID_USER_ID)  # lint-amnesty, pylint: disable=raise-missing-from
-    else:
-        context['user_id'] = user.id
-        context['username'] = user.username
+    context['user_id'] = user.id
+    context['username'] = user.username
 
     # course_id is expected to be provided in the context when applicable
     course_id = context.get('course_id')

lms/djangoapps/static_template_view/views.py

@@ -92,8 +92,7 @@ def render_press_release(request, slug):
         resp = render_to_response('static_templates/press_releases/' + template, {})
     except TemplateDoesNotExist:
         raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
-    else:
-        return resp
+    return resp
 
 
 @fix_crum_request

openedx/core/djangoapps/credit/tasks.py

@@ -41,8 +41,7 @@ def update_credit_course_requirements(course_id):
     except (InvalidKeyError, ItemNotFoundError, InvalidCreditRequirements) as exc:
         LOGGER.error('Error on adding the requirements for course %s - %s', course_id, str(exc))
         raise update_credit_course_requirements.retry(args=[course_id], exc=exc)
-    else:
-        LOGGER.info('Requirements added for course %s', course_id)
+    LOGGER.info('Requirements added for course %s', course_id)
 
 
 def _get_course_credit_requirements(course_key):

openedx/core/djangoapps/enrollments/data.py

@@ -341,8 +341,7 @@ def get_course_enrollment_info(course_id, include_expired=False):
         msg = f"Requested enrollment information for unknown course {course_id}"
         log.warning(msg)
         raise CourseNotFoundError(msg)  # lint-amnesty, pylint: disable=raise-missing-from
-    else:
-        return CourseSerializer(course, include_expired=include_expired).data
+    return CourseSerializer(course, include_expired=include_expired).data
 
 
 def get_user_roles(username):

openedx/core/djangoapps/safe_sessions/middleware.py

@@ -244,14 +244,13 @@ def parse(cls, safe_cookie_string):
             raise SafeCookieError(  # lint-amnesty, pylint: disable=raise-missing-from
                 f"SafeCookieData BWC parse error: {safe_cookie_string!r}."
             )
-        else:
-            if safe_cookie_data.version != cls.CURRENT_VERSION:
-                raise SafeCookieError(
-                    "SafeCookieData version {!r} is not supported. Current version is {}.".format(
-                        safe_cookie_data.version,
-                        cls.CURRENT_VERSION,
-                    ))
-            return safe_cookie_data
+        if safe_cookie_data.version != cls.CURRENT_VERSION:
+            raise SafeCookieError(
+                "SafeCookieData version {!r} is not supported. Current version is {}.".format(
+                    safe_cookie_data.version,
+                    cls.CURRENT_VERSION,
+                ))
+        return safe_cookie_data
 
     def __str__(self):
         """

openedx/core/djangoapps/user_api/management/commands/bulk_user_org_email_optout.py

@@ -135,11 +135,10 @@ def handle(self, *args, **options):
                               optout_rows[end_idx][0], optout_rows[end_idx][1],
                               str(err))
                     raise
-                else:
-                    cursor.execute('COMMIT;')
-                    log.info("Committed opt-out for rows (%s, %s) through (%s, %s).",
-                             optout_rows[start_idx][0], optout_rows[start_idx][1],
-                             optout_rows[end_idx][0], optout_rows[end_idx][1])
+                cursor.execute('COMMIT;')
+                log.info("Committed opt-out for rows (%s, %s) through (%s, %s).",
+                            optout_rows[start_idx][0], optout_rows[start_idx][1],
+                            optout_rows[end_idx][0], optout_rows[end_idx][1])
                 log.info("Sleeping %s seconds...", sleep_between)
                 time.sleep(sleep_between)
             curr_row_idx += chunk_size

openedx/core/lib/celery/task_utils.py

@@ -50,9 +50,8 @@ def emulate_http_request(site=None, user=None, middleware_classes=None):
         for middleware in reversed(middleware_instances):
             _run_method_if_implemented(middleware, 'process_exception', request, exc)
         raise
-    else:
-        for middleware in reversed(middleware_instances):
-            _run_method_if_implemented(middleware, 'process_response', request, response)
+    for middleware in reversed(middleware_instances):
+        _run_method_if_implemented(middleware, 'process_response', request, response)
 
 
 def _run_method_if_implemented(instance, method_name, *args, **kwargs):

xmodule/capa/tests/test_input_templates.py

@@ -76,8 +76,7 @@ def render_to_xml(self, context_dict):
         except Exception as exc:
             raise TemplateError("Could not parse XML from '{0}': {1}".format(  # lint-amnesty, pylint: disable=raise-missing-from
                                 xml_str, str(exc)))
-        else:
-            return xml
+        return xml
 
     def assert_has_xpath(self, xml_root, xpath, context_dict, exact_num=1):
         """

xmodule/split_test_block.py

@@ -419,9 +419,8 @@ def log_child_render(self, request, suffix=''):  # lint-amnesty, pylint: disable
                 )
             )
             raise
-        else:
-            self.runtime.publish(self, 'xblock.split_test.child_render', {'child_id': child_id})
-            return Response()
+        self.runtime.publish(self, 'xblock.split_test.child_render', {'child_id': child_id})
+        return Response()
 
     def get_icon_class(self):
         return self.child.get_icon_class() if self.child else 'other'