diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py index 60f2a359ce..01e240d5dc 100644 --- a/lms/djangoapps/branding/api.py +++ b/lms/djangoapps/branding/api.py @@ -678,5 +678,5 @@ def get_logo_url_for_email(): """ Returns the url for the branded logo image for embedding in email templates. """ - default_logo_url = getattr(settings, 'DEFAULT_EMAIL_LOGO_URL') - return getattr(settings, 'LOGO_URL_PNG') or default_logo_url + default_logo_url = getattr(settings, 'DEFAULT_EMAIL_LOGO_URL', None) + return getattr(settings, 'LOGO_URL_PNG', None) or default_logo_url diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index 4fb1f3d522..3cf21cd0d8 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -185,7 +185,6 @@ def require_post_params(*args, **kwargs): required_params = [] required_params += [(arg, None) for arg in args] required_params += [(key, kwargs[key]) for key in kwargs] - # required_params = e.g. [('action', 'enroll or unenroll'), ['emails', None]] def decorator(func): @@ -208,9 +207,7 @@ def require_post_params(*args, **kwargs): return JsonResponse(error_response_data, status=400) else: return func(*args, **kwargs) - return wrapped - return decorator @@ -223,7 +220,6 @@ def require_course_permission(permission): Assumes that request is in args[0]. Assumes that course_id is in kwargs['course_id']. """ - def decorator(func): def wrapped(*args, **kwargs): request = args[0] @@ -233,9 +229,7 @@ def require_course_permission(permission): return func(*args, **kwargs) else: return HttpResponseForbidden() - return wrapped - return decorator @@ -247,7 +241,6 @@ def require_sales_admin(func): If the user does not have privileges for this operation, this will return HttpResponseForbidden (403). """ - def wrapped(request, course_id): try: @@ -262,7 +255,6 @@ def require_sales_admin(func): return func(request, course_id) else: return HttpResponseForbidden() - return wrapped @@ -274,7 +266,6 @@ def require_finance_admin(func): If the user does not have privileges for this operation, this will return HttpResponseForbidden (403). """ - def wrapped(request, course_id): try: @@ -289,7 +280,6 @@ def require_finance_admin(func): return func(request, course_id) else: return HttpResponseForbidden() - return wrapped