Tweaks for swig v4.4

I've started testing the development version of swig, and these small
changes enable it to work satisfactorily.

Author: jim-easterbrook

setup.py

@@ -1,6 +1,6 @@
 # python-exiv2 - Python interface to libexiv2
 # http://github.com/jim-easterbrook/python-exiv2
-# Copyright (C) 2021-24  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2021-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -153,6 +153,8 @@ def get_mod_src_dir(exiv2_version):
 extra_compile_args = []
 define_macros = [('PY_SSIZE_T_CLEAN', None),
                  ('SWIG_TYPE_TABLE', 'exiv2')]
+if sys.version_info < (3, 9):
+    define_macros.append(('SWIG_NO_HEAPTYPES', None))
 if platform in ('linux', 'darwin', 'mingw'):
     extra_compile_args = [
         '-O3', '-Wno-unused-variable', '-Wno-unused-function',

tests/test_value.py

@@ -355,9 +355,9 @@ def test_Date(self):
         self.assertEqual(dict(value), {
             'year': today.year, 'month': today.month, 'day': today.day})
         value['day'] = 1
-        with self.assertRaises(TypeError):
+        with self.assertRaises((AttributeError, TypeError)):
             del value['day']
-        with self.assertRaises(TypeError):
+        with self.assertRaises((AttributeError, TypeError)):
             del value.day
 
     def do_test_DateValue(self, py_date):
@@ -421,9 +421,9 @@ def test_Time(self):
             'hour': now.hour, 'minute': now.minute, 'second': now.second,
             'tzHour': 1, 'tzMinute': 30})
         value['second'] = 1
-        with self.assertRaises(TypeError):
+        with self.assertRaises((AttributeError, TypeError)):
             del value['second']
-        with self.assertRaises(TypeError):
+        with self.assertRaises((AttributeError, TypeError)):
             del value.second
 
     def do_test_TimeValue(self, py_time):

utils/build_swig.py

@@ -1,6 +1,6 @@
 # python-exiv2 - Python interface to exiv2
 # http://github.com/jim-easterbrook/python-exiv2
-# Copyright (C) 2021-24  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2021-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -152,7 +152,7 @@ def main():
             # Functions with just one parameter and a default value don't
             # work with fastunpack.
             # See https://github.com/swig/swig/issues/2786
-            if swig_version < (4, 4, 0) and ext_name in (
+            if swig_version < (4, 5, 0) and ext_name in (
                     'basicio', 'exif', 'iptc', 'metadatum', 'value', 'xmp'):
                 cmd.append('-nofastunpack')
             cmd += ['-o', os.path.join(output_dir, ext_name + '_wrap.cxx')]