From 38a24af07085119fb4b7b93dd0803138265af392 Mon Sep 17 00:00:00 2001 From: Mykhailo Poienko <22IMC10258@fh-krems.ac.at> Date: Thu, 2 Jan 2025 11:10:55 +0100 Subject: [PATCH] Ruff check and isort, cleanup templates and added version to the docs. --- demoapp/custom_user/admin.py | 2 - demoapp/custom_user/tests.py | 1 - demoapp/custom_user/views.py | 2 - demoapp/settings.py | 6 +- demoapp/static/uni/uni_logo.png | Bin 14112 -> 0 bytes demoapp/templates/email/contexed_uni.html | 110 ------------------ demoapp/templates/email/uni.html | 81 ------------- demoapp/tests/mailpit.py | 2 +- demoapp/tests/test_admin.py | 2 - demoapp/tests/test_backends.py | 3 +- demoapp/tests/test_commands.py | 6 +- demoapp/tests/test_connections.py | 2 +- demoapp/tests/test_dblock.py | 1 - demoapp/tests/test_emailmodel.py | 1 - demoapp/tests/test_integration.py | 6 +- demoapp/tests/test_mail.py | 12 +- demoapp/tests/test_tags.py | 8 +- demoapp/tests/test_templates.py | 6 +- docs/source/conf.py | 1 + docs/source/usage.rst | 2 - sendmail/admin/emailmerge.py | 2 +- sendmail/admin/emailmodel.py | 5 +- sendmail/django_compressor.py | 27 +++-- sendmail/mail.py | 6 +- sendmail/management/commands/sendmail.py | 4 +- .../commands/subcommands/cleanup_mail.py | 3 +- .../commands/subcommands/dblocks.py | 3 +- .../commands/subcommands/send_queued_mail.py | 3 +- sendmail/models/emailmerge.py | 2 +- sendmail/models/newsletter.py | 2 - sendmail/parser.py | 24 +--- sendmail/tasks.py | 2 +- sendmail/views.py | 4 +- 33 files changed, 57 insertions(+), 284 deletions(-) delete mode 100644 demoapp/static/uni/uni_logo.png delete mode 100644 demoapp/templates/email/contexed_uni.html delete mode 100644 demoapp/templates/email/uni.html diff --git a/demoapp/custom_user/admin.py b/demoapp/custom_user/admin.py index 8c38f3f3..846f6b40 100644 --- a/demoapp/custom_user/admin.py +++ b/demoapp/custom_user/admin.py @@ -1,3 +1 @@ -from django.contrib import admin - # Register your models here. diff --git a/demoapp/custom_user/tests.py b/demoapp/custom_user/tests.py index 7ce503c2..49290204 100644 --- a/demoapp/custom_user/tests.py +++ b/demoapp/custom_user/tests.py @@ -1,3 +1,2 @@ -from django.test import TestCase # Create your tests here. diff --git a/demoapp/custom_user/views.py b/demoapp/custom_user/views.py index 91ea44a2..60f00ef0 100644 --- a/demoapp/custom_user/views.py +++ b/demoapp/custom_user/views.py @@ -1,3 +1 @@ -from django.shortcuts import render - # Create your views here. diff --git a/demoapp/settings.py b/demoapp/settings.py index 94508441..d6d1fdcd 100644 --- a/demoapp/settings.py +++ b/demoapp/settings.py @@ -10,7 +10,6 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ """ import os -from datetime import timedelta from pathlib import Path from django.utils.translation import gettext_lazy as _ @@ -81,7 +80,7 @@ } } } - MEDIA_URL = f"http://127.0.0.1:9000/media/" + MEDIA_URL = "http://127.0.0.1:9000/media/" else: MEDIA_URL = '/media/' MEDIA_ROOT = BASE_DIR / 'workdir' / 'media' @@ -218,10 +217,7 @@ 'EMAIL_TEMPLATES': [ ('email/demo.html', _("Demo")), ('email/default.html', _('Default')), - ('email/placeholders.html', _('Placeholders')), ('email/in.html', _('Incoming')), - ('email/uni.html', _('University')), - ('email/contexed_uni.html', _('Contexed')), ('email/test_updated_parser.html', 'Test updated parser'), ('email/tracker.html', _('Tracker')), ], diff --git a/demoapp/static/uni/uni_logo.png b/demoapp/static/uni/uni_logo.png deleted file mode 100644 index 546713a6d8da215172abe699d0298f3cb763275d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14112 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 - - - - -
- - - - - - - -
- - - - - - - - - - -
1px transparent
zur -Online-Version
-Universität Innsbruck
- -
{{ topic }}
-
{{ subtopic }}
-
-
1px transparent
-
- - - - -
- - - - - -
- - - - - - -
- {% for new in news %} - {{ new.some.dur }} - {{ new.some.val }} - - - - - - - - - - -
Hello
-
Vorwort
-
{{ new.text }}
-Beitrag lesen
Schatten
- {% endfor %} -
-
-
- - - - -
-
- - - -
- - - - -
- - - - -
- - - - - - - -
1px transparent
Offenlegung -nach §25 MedG
-
-
-
- -{% endblock %} \ No newline at end of file diff --git a/demoapp/templates/email/uni.html b/demoapp/templates/email/uni.html deleted file mode 100644 index b6504001..00000000 --- a/demoapp/templates/email/uni.html +++ /dev/null @@ -1,81 +0,0 @@ -{% extends 'sendmail/base.html' %} -{% load sendmail %} - -{% block container %} -
- - - - -
- - - - - - - -
- - - - - - - - - - -
1px transparent
zur -Online-Version
-Universität Innsbruck
- -
{{ topic }}
-
{{ subtopic }}
-
-
1px transparent
-
- - - - -
- - -{% placeholder 'content' %} -
-
- - - - -
-
- - - -
- - - - -
- - - - -
- - - - - - - -
1px transparent
Offenlegung -nach §25 MedG
-
-
-
-
-{% endblock %} \ No newline at end of file diff --git a/demoapp/tests/mailpit.py b/demoapp/tests/mailpit.py index 022a62fb..0145cfdb 100644 --- a/demoapp/tests/mailpit.py +++ b/demoapp/tests/mailpit.py @@ -17,7 +17,7 @@ def __init__(self): try: response = self.info() self.already_running = attempts == 0 - except requests.exceptions.ConnectionError as e: + except requests.exceptions.ConnectionError: print("\nStarting Mailpit server\n") self.process = subprocess.Popen([MAILPIT_BINARY]) sleep(0.2) diff --git a/demoapp/tests/test_admin.py b/demoapp/tests/test_admin.py index 4f67bddf..6c3533e0 100644 --- a/demoapp/tests/test_admin.py +++ b/demoapp/tests/test_admin.py @@ -1,7 +1,5 @@ from dataclasses import dataclass -import pytest - from sendmail.admin.admin_utils import convert_media_urls_to_tags, get_message_preview, render_placeholder_content diff --git a/demoapp/tests/test_backends.py b/demoapp/tests/test_backends.py index b9957641..a2a1c914 100644 --- a/demoapp/tests/test_backends.py +++ b/demoapp/tests/test_backends.py @@ -1,6 +1,5 @@ -import os + import pathlib -from datetime import timedelta from email.mime.image import MIMEImage import pytest diff --git a/demoapp/tests/test_commands.py b/demoapp/tests/test_commands.py index 5bc5bb3d..1285a128 100644 --- a/demoapp/tests/test_commands.py +++ b/demoapp/tests/test_commands.py @@ -7,12 +7,12 @@ from django.core.management import call_command from django.utils.timezone import now -from sendmail.config import settings from sendmail.models.attachment import Attachment from sendmail.models.emailaddress import EmailAddress from sendmail.models.emailmodel import STATUS, EmailModel from sendmail.utils import set_recipients + def call_sendmail(*args, **kwargs): return call_command('sendmail', *args, **kwargs) @@ -92,7 +92,7 @@ def test_send_queued_mail(): @pytest.mark.django_db def test_send_batch(): with mock.patch('django.db.connection.close', return_value=None): - queue = [EmailModel.objects.create(from_email='from@example.com', status=STATUS.queued, language='en') for _ in range(200)] + _ = [EmailModel.objects.create(from_email='from@example.com', status=STATUS.queued, language='en') for _ in range(200)] call_sendmail('batch', processes=1) assert EmailModel.objects.filter(status=STATUS.sent).count() == 100 @@ -122,7 +122,7 @@ def test_failed_deliveries_logging(): """ with mock.patch('django.db.connection.close', return_value=None): - recipient = EmailAddress.objects.create(email=f'to@example.com') + recipient = EmailAddress.objects.create(email='to@example.com') email = EmailModel.objects.create( from_email='from@example.com', status=STATUS.queued, backend_alias='error', language='en' ) diff --git a/demoapp/tests/test_connections.py b/demoapp/tests/test_connections.py index ef410b3e..7c901b2e 100644 --- a/demoapp/tests/test_connections.py +++ b/demoapp/tests/test_connections.py @@ -10,4 +10,4 @@ def test_connections(): assert isinstance(connections['slow_backend'], SlowTestBackend) with pytest.raises(KeyError): - conn = connections['not_valid'] + _ = connections['not_valid'] diff --git a/demoapp/tests/test_dblock.py b/demoapp/tests/test_dblock.py index 2c162566..5a89f3e2 100644 --- a/demoapp/tests/test_dblock.py +++ b/demoapp/tests/test_dblock.py @@ -1,6 +1,5 @@ import time from datetime import timedelta -from multiprocessing import Process import pytest diff --git a/demoapp/tests/test_emailmodel.py b/demoapp/tests/test_emailmodel.py index a7481aa7..d85d430d 100644 --- a/demoapp/tests/test_emailmodel.py +++ b/demoapp/tests/test_emailmodel.py @@ -8,7 +8,6 @@ from sendmail.settings import get_template_engine from sendmail.utils import set_recipients -#from django.conf import settings @pytest.fixture diff --git a/demoapp/tests/test_integration.py b/demoapp/tests/test_integration.py index 18836fdd..27ecaf90 100644 --- a/demoapp/tests/test_integration.py +++ b/demoapp/tests/test_integration.py @@ -1,14 +1,12 @@ import tempfile from multiprocessing import Pool -from typing import List import pytest -import requests -from demoapp.tests.conftest import email_testing + from sendmail.mail import _send_bulk, send, send_many from sendmail.models.emailaddress import EmailAddress -from sendmail.models.emailmerge import EmailMergeModel, PlaceholderContent +from sendmail.models.emailmerge import PlaceholderContent from sendmail.utils import get_recipients_objects, split_emails diff --git a/demoapp/tests/test_mail.py b/demoapp/tests/test_mail.py index 4e3896c1..9dcd9d6a 100644 --- a/demoapp/tests/test_mail.py +++ b/demoapp/tests/test_mail.py @@ -1,24 +1,20 @@ import logging import tempfile from datetime import timedelta -from unittest.mock import patch -from zoneinfo import ZoneInfo import pytest from django.core.exceptions import ValidationError from django.db import connection -from django.db.utils import InterfaceError from django.test.utils import CaptureQueriesContext from django.utils import timezone +from django.core.files.base import ContentFile from sendmail.mail import _send_bulk, create_email, get_queued, send, send_many, split_into_batches from sendmail.models.attachment import Attachment from sendmail.models.emailaddress import EmailAddress, Recipient -from sendmail.models.emailmerge import EmailMergeModel, PlaceholderContent +from sendmail.models.emailmerge import EmailMergeModel from sendmail.models.emailmodel import PRIORITY, STATUS, EmailModel -from sendmail.settings import get_available_backends -#from django.conf import settings @pytest.fixture @@ -478,7 +474,6 @@ def test_get_queued(): assert list(get_queued()) == [queued_email, past_email] -from django.core import mail @pytest.mark.django_db @@ -572,7 +567,6 @@ def test_extra_recipients(template): assert extra[1].address.email == 'bcc2@email.com' -from django.core.files.base import ContentFile @pytest.fixture @@ -598,7 +592,7 @@ def template_with_extra_attachments(settings, template): def test_extra_attachments(template_with_extra_attachments): # Retrieve the template with the extra attachments already set up template = template_with_extra_attachments - en_translation = template.translated_contents.get(language='en') + template.translated_contents.get(language='en') # No need to create the attachment again since the fixture already does that recipients = ['mrec1@gmail.com', 'mrec2@gmail.com'] diff --git a/demoapp/tests/test_tags.py b/demoapp/tests/test_tags.py index f22bd486..080b8e65 100644 --- a/demoapp/tests/test_tags.py +++ b/demoapp/tests/test_tags.py @@ -6,7 +6,7 @@ from django.template import Context from sendmail.template.tags.media_inline import inline_media_image -from sendmail.templatetags.sendmail import inline_image, placeholder +from sendmail.templatetags.sendmail import inline_image @pytest.mark.django_db @@ -83,9 +83,6 @@ def test_media_urls(settings): assert template._attached_images[0].get_payload(decode=True) == open(abs_path, 'rb').read() -# def test_placeholders(): -# assert placeholder('', 'test') == '{{test}}' - def test_static(settings): #settings.STATICFILES_DIRS = [str(settings.BASE_DIR / 'demoapp' / 'tests' / 'assets')] @@ -144,9 +141,10 @@ def test_track_link(settings): assert tracker_link(target_img='invalid.png', context={'email_id': 5, 'target_uri': 'https://google.com'}) == '' def test_click_link(): - from sendmail.templatetags.sendmail import click_link from urllib.parse import quote + from sendmail.templatetags.sendmail import click_link + target_uri = 'https://google.com' quoted = quote(target_uri) diff --git a/demoapp/tests/test_templates.py b/demoapp/tests/test_templates.py index de87ce2e..af56fe6f 100644 --- a/demoapp/tests/test_templates.py +++ b/demoapp/tests/test_templates.py @@ -32,11 +32,7 @@ def test_creation(test_template): assert en_content.subject == 'test_subject' assert en_content.content == 'test_content' - de_content = main.translated_contents.create(language='de') - - # assert de_content.subject == 'Subject, language: de' - # - # assert de_content.content == 'Content, language: de' + main.translated_contents.create(language='de') placeholders_base = PlaceholderContent.objects.values_list('used_template_file', flat=True) diff --git a/docs/source/conf.py b/docs/source/conf.py index aeac8859..0223425d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,6 +15,7 @@ project = 'sendmail' copyright = '2024, Mykhailo Poienko' author = 'Mykhailo Poienko' +version = release = '.'.join(map(str,VERSION)) # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/docs/source/usage.rst b/docs/source/usage.rst index a6fb78fc..130a00b1 100644 --- a/docs/source/usage.rst +++ b/docs/source/usage.rst @@ -411,8 +411,6 @@ in.html All placeholders in the previous example will be parsed successfully and provided for users. -.. warning:: - Placeholders are not recognized in child templates when using the Django {% extends %} tag. Inlines ^^^^^^^^^^^^^^^ diff --git a/sendmail/admin/emailmerge.py b/sendmail/admin/emailmerge.py index db0fe8f2..2e608299 100644 --- a/sendmail/admin/emailmerge.py +++ b/sendmail/admin/emailmerge.py @@ -3,8 +3,8 @@ from django.contrib import admin, messages from django.db import models from django.db.models import Case, IntegerField, Value, When -from django.forms import BaseInlineFormSet, TextInput from django.db.models.fields.json import JSONField +from django.forms import BaseInlineFormSet, TextInput from django.shortcuts import redirect from django.urls import reverse from django.utils.text import Truncator diff --git a/sendmail/admin/emailmodel.py b/sendmail/admin/emailmodel.py index 19afc949..eb7dc6c4 100644 --- a/sendmail/admin/emailmodel.py +++ b/sendmail/admin/emailmodel.py @@ -109,7 +109,8 @@ def get_fieldsets(self, request, obj=None): has_plaintext_content = True elif content_type == 'text/html': has_html_content = True - except Exception as e: + except: #noqa:E722 + # If any exception happens, put its description in content field has_plaintext_content = True if has_html_content: @@ -125,7 +126,7 @@ def render_subject(self, instance): try: message = instance.email_message() return message.subject - except Exception: + except: #noqa:E722 return "Rendering exception" render_subject.short_description = _('Subject') diff --git a/sendmail/django_compressor.py b/sendmail/django_compressor.py index 7cde40a1..c168f403 100644 --- a/sendmail/django_compressor.py +++ b/sendmail/django_compressor.py @@ -1,14 +1,9 @@ from copy import copy -from django.template.base import VariableNode, TextNode, NodeList +from django.template import loader +from django.template.base import NodeList, TextNode, VariableNode from django.template.defaulttags import IfNode -from django.template.loader_tags import ( - BLOCK_CONTEXT_KEY, - ExtendsNode, - BlockNode, - BlockContext, -) - +from django.template.loader_tags import BLOCK_CONTEXT_KEY, BlockContext, BlockNode, ExtendsNode def handle_extendsnode(extendsnode, context): @@ -91,3 +86,19 @@ def expand_blocknode(node, block_stack, block_context): block_context.push(node.name, popped_block) return expanded_nodelist +def handle_includenode(includenode, context): + """ + Process an IncludeNode to include the content of the referenced template. + + Args: + includenode (IncludeNode): The IncludeNode to process. + context (Context): The context in which to render the included template. + + Returns: + NodeList: The nodelist of the included template. + """ + included_template = includenode.template.resolve(context) + if isinstance(included_template, str): + included_template = loader.get_template(included_template) + return included_template.template.nodelist + diff --git a/sendmail/mail.py b/sendmail/mail.py index 24ba9ddc..baa9725a 100644 --- a/sendmail/mail.py +++ b/sendmail/mail.py @@ -15,9 +15,9 @@ from sendmail.models.emailmerge import EmailMergeModel from sendmail.models.emailmodel import PRIORITY, STATUS, EmailModel from sendmail.models.log import Log -from sendmail.settings import (get_available_backends, get_batch_size, get_default_language, get_email_address_model, - get_log_level, get_max_retries, get_message_id_enabled, get_message_id_fqdn, - get_retry_timedelta, get_sending_order, get_break_after_batch) +from sendmail.settings import (get_available_backends, get_batch_size, get_break_after_batch, get_default_language, + get_email_address_model, get_log_level, get_max_retries, get_message_id_enabled, + get_message_id_fqdn, get_retry_timedelta, get_sending_order) from sendmail.signals import email_queued from sendmail.utils import (create_attachments, get_emailmerge, get_language_from_code, get_or_create_recipient, get_recipients_objects, parse_emails, parse_priority, set_recipients, diff --git a/sendmail/management/commands/sendmail.py b/sendmail/management/commands/sendmail.py index b24e76d2..a008decc 100644 --- a/sendmail/management/commands/sendmail.py +++ b/sendmail/management/commands/sendmail.py @@ -1,9 +1,11 @@ from collections import OrderedDict + import sendmail from sendmail.management.commands.subcommands.base import SubcommandsCommand from sendmail.management.commands.subcommands.cleanup_mail import Command as CleanupMailCommand -from sendmail.management.commands.subcommands.send_queued_mail import SendBatch, SendQueuedMail from sendmail.management.commands.subcommands.dblocks import Command as DBLocksCommand +from sendmail.management.commands.subcommands.send_queued_mail import SendBatch, SendQueuedMail + class Command(SubcommandsCommand): command_name = "sendmail" diff --git a/sendmail/management/commands/subcommands/cleanup_mail.py b/sendmail/management/commands/subcommands/cleanup_mail.py index ec85f797..3015d965 100644 --- a/sendmail/management/commands/subcommands/cleanup_mail.py +++ b/sendmail/management/commands/subcommands/cleanup_mail.py @@ -1,10 +1,9 @@ import datetime -from django.core.management.base import BaseCommand from django.utils.timezone import now -from sendmail.utils import cleanup_expired_mails from sendmail.management.commands.subcommands.base import SubcommandsCommand +from sendmail.utils import cleanup_expired_mails class Command(SubcommandsCommand): diff --git a/sendmail/management/commands/subcommands/dblocks.py b/sendmail/management/commands/subcommands/dblocks.py index 84cb2538..26918fed 100644 --- a/sendmail/management/commands/subcommands/dblocks.py +++ b/sendmail/management/commands/subcommands/dblocks.py @@ -1,8 +1,7 @@ -from django.core.management.base import BaseCommand from django.utils.timezone import localtime, now -from sendmail.models.dbmutex import DBMutex from sendmail.management.commands.subcommands.base import SubcommandsCommand +from sendmail.models.dbmutex import DBMutex class Command(SubcommandsCommand): diff --git a/sendmail/management/commands/subcommands/send_queued_mail.py b/sendmail/management/commands/subcommands/send_queued_mail.py index 05886555..f5d13499 100644 --- a/sendmail/management/commands/subcommands/send_queued_mail.py +++ b/sendmail/management/commands/subcommands/send_queued_mail.py @@ -1,11 +1,10 @@ from multiprocessing import Pool -from sendmail.management.commands.subcommands.base import SubcommandsCommand -from django.core.management.base import BaseCommand from django.db import connection as db_connection from sendmail.dblock import LockedException, TimeoutException, db_lock from sendmail.mail import _send_bulk, get_queued +from sendmail.management.commands.subcommands.base import SubcommandsCommand from sendmail.settings import get_batch_delivery_timeout from sendmail.utils import split_emails diff --git a/sendmail/models/emailmerge.py b/sendmail/models/emailmerge.py index 7303088c..19714614 100644 --- a/sendmail/models/emailmerge.py +++ b/sendmail/models/emailmerge.py @@ -7,10 +7,10 @@ from sendmail import cache from sendmail.cache_utils import get_placeholder_names, get_placeholders from sendmail.logutils import setup_loghandlers +from sendmail.parser import extract_variable_names, get_ckeditor_variables from sendmail.sanitizer import clean_html from sendmail.settings import get_email_address_setting from sendmail.validators import validate_template_syntax -from sendmail.parser import extract_variable_names, get_ckeditor_variables logger = setup_loghandlers('INFO') diff --git a/sendmail/models/newsletter.py b/sendmail/models/newsletter.py index 686a8cfd..49d477a9 100644 --- a/sendmail/models/newsletter.py +++ b/sendmail/models/newsletter.py @@ -6,10 +6,8 @@ from django.utils.translation import gettext_lazy as _ from sendmail import mail -from sendmail.models.attachment import Attachment from sendmail.models.emailmerge import EmailMergeModel from sendmail.models.recipients_list import RecipientsList -from sendmail.parser import extract_variable_names, get_ckeditor_variables, get_custom_vars from sendmail.validators import validate_email_with_name STATUS = namedtuple('STATUS', 'draft creation queued completed')._make(range(4)) diff --git a/sendmail/parser.py b/sendmail/parser.py index 116c6f8c..99f3bc44 100644 --- a/sendmail/parser.py +++ b/sendmail/parser.py @@ -1,30 +1,14 @@ import re + from django import template -from django.template import loader, TemplateSyntaxError, TemplateDoesNotExist -from django.template.base import Node, NodeList, VariableNode +from django.template import TemplateDoesNotExist, TemplateSyntaxError +from django.template.base import Node, VariableNode from django.template.context import Context from django.template.defaulttags import ForNode from django.template.loader import get_template from django.template.loader_tags import ExtendsNode, IncludeNode -from sendmail.django_compressor import handle_extendsnode - - -def handle_includenode(includenode, context): - """ - Process an IncludeNode to include the content of the referenced template. - - Args: - includenode (IncludeNode): The IncludeNode to process. - context (Context): The context in which to render the included template. - - Returns: - NodeList: The nodelist of the included template. - """ - included_template = includenode.template.resolve(context) - if isinstance(included_template, str): - included_template = loader.get_template(included_template) - return included_template.template.nodelist +from sendmail.django_compressor import handle_extendsnode, handle_includenode class SendmailParser: diff --git a/sendmail/tasks.py b/sendmail/tasks.py index 553f7d6a..e7795aa9 100644 --- a/sendmail/tasks.py +++ b/sendmail/tasks.py @@ -12,7 +12,7 @@ from django.utils.timezone import now from sendmail.mail import _send_bulk, get_queued -from sendmail.settings import get_celery_enabled, get_break_after_batch +from sendmail.settings import get_break_after_batch, get_celery_enabled from sendmail.utils import cleanup_expired_mails try: diff --git a/sendmail/views.py b/sendmail/views.py index 6ca84859..7f2bd357 100644 --- a/sendmail/views.py +++ b/sendmail/views.py @@ -1,7 +1,7 @@ from django.conf import settings -from django.contrib.messages.storage import default_storage from django.contrib.staticfiles.storage import staticfiles_storage +from django.core.exceptions import ValidationError from django.core.files.storage import default_storage from django.core.validators import URLValidator from django.http import FileResponse, HttpResponseBadRequest, HttpResponseNotFound, HttpResponseRedirect @@ -49,7 +49,7 @@ def click(request, pk): try: URLValidator()(target_uri) - except: + except ValidationError: return HttpResponseBadRequest("Invalid 'target_uri' parameter") if not email.clicked_at: