mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-29 06:38:47 +01:00
New fixes
This commit is contained in:
@@ -83,7 +83,7 @@ def check_spf_ip4(value):
|
||||
try:
|
||||
ipaddress.ip_network(parts[1], False)
|
||||
except ValueError:
|
||||
raise DNSSyntaxError(_("Wrong IPv4 address format"))
|
||||
raise DNSSyntaxError(_("Wrong IPv4 address format")) from None
|
||||
|
||||
|
||||
def check_spf_ip6(value):
|
||||
@@ -94,7 +94,7 @@ def check_spf_ip6(value):
|
||||
try:
|
||||
ipaddress.ip_network(value, False)
|
||||
except ValueError:
|
||||
raise DNSSyntaxError(_("Wrong IPv6 address format"))
|
||||
raise DNSSyntaxError(_("Wrong IPv6 address format")) from None
|
||||
|
||||
|
||||
def _check_domain_and_mask(value, mechanism):
|
||||
@@ -229,7 +229,7 @@ def check_dmarc_tag(tag, value):
|
||||
try:
|
||||
value = int(value)
|
||||
except ValueError:
|
||||
raise DNSSyntaxError(error + _(" not an integer"))
|
||||
raise DNSSyntaxError(error + _(" not an integer")) from None
|
||||
if "min_value" in tdef and value < tdef["min_value"]:
|
||||
raise DNSSyntaxError(error + _(" less than {}").format(tdef["min_value"]))
|
||||
if "max_value" in tdef and value > tdef["max_value"]:
|
||||
|
||||
@@ -133,7 +133,7 @@ class ViewsTestCase(ModoTestCase):
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create some records."""
|
||||
super(ViewsTestCase, cls).setUpTestData()
|
||||
super().setUpTestData()
|
||||
cls.spf_rec = factories.DNSRecordFactory(
|
||||
type="spf", value="v=SPF1 mx -all", is_valid=True, domain__name="test.com"
|
||||
)
|
||||
|
||||
@@ -16,7 +16,7 @@ class DomainAccessRequiredMixin(auth_mixins.AccessMixin):
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
if not request.user.can_access(self.get_object()):
|
||||
return self.handle_no_permission()
|
||||
return super(DomainAccessRequiredMixin, self).dispatch(request, *args, **kwargs)
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
|
||||
class DNSRecordDetailView(
|
||||
@@ -29,7 +29,7 @@ class DNSRecordDetailView(
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
"""Add extra variables."""
|
||||
context = super(DNSRecordDetailView, self).get_context_data(**kwargs)
|
||||
context = super().get_context_data(**kwargs)
|
||||
context.update(
|
||||
{
|
||||
"title": _("{} record of {}").format(
|
||||
@@ -59,7 +59,7 @@ class AutoConfigRecordsStatusView(
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
"""Add extra data to context."""
|
||||
context = super(AutoConfigRecordsStatusView, self).get_context_data(**kwargs)
|
||||
context = super().get_context_data(**kwargs)
|
||||
context.update(
|
||||
{"title": _("Auto configuration records for {}").format(self.object.name)}
|
||||
)
|
||||
@@ -76,6 +76,6 @@ class DomainDNSConfigurationView(
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
"""Add extra variables."""
|
||||
context = super(DomainDNSConfigurationView, self).get_context_data(**kwargs)
|
||||
context = super().get_context_data(**kwargs)
|
||||
context.update({"title": _("DNS configuration for {}").format(self.object)})
|
||||
return context
|
||||
|
||||
Reference in New Issue
Block a user