Strip scopes on IPv6Interface instances

Author: jimfunk

netfields/fields.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 
-from ipaddress import ip_interface, ip_network
+from ipaddress import ip_interface, ip_network, IPv6Interface
 from netaddr import EUI
 from netaddr.core import AddrFormatError
 
@@ -159,6 +159,16 @@ def to_python(self, value):
                 return value.ip
         return value
 
+    def get_prep_value(self, value):
+        if not value:
+            return None
+
+        value = self.to_python(value)
+        # Strip IPv6 scope identifier if it is present
+        if getattr(value, 'scope_id', None):
+            value = IPv6Interface((value.ip, value.network.prefixlen))
+        return str(value)
+
     def form_class(self):
         if self.store_prefix_length:
             return InetAddressFormField

test/tests/test_sql_fields.py

@@ -432,6 +432,12 @@ def test_host(self):
         instance = self.model.objects.get(field__host='10.1.2.3/27')
         self.assertEqual(str(instance.field), '10.1.2.3/24')
 
+    @skipIf(PYTHON_VERSION < (3, 9), 'Scopes were added in Python 3.9')
+    def test_ipv6_strip_scope(self):
+        instance = self.model.objects.create(field='2001:db8::1%foo/64')
+        instance = self.model.objects.get(pk=instance.pk)
+        self.assertEqual(str(instance.field), '2001:db8::1/64')
+
 
 class TestInetFieldNullable(BaseInetFieldTestCase, TestCase):
     def setUp(self):