Bug#1001500: pymca: Fails with python3.10

[Steve Langasek]

Package: pymca
Version: 5.6.5+dfsg-2
Severity: serious
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu jammy ubuntu-patch
Control: affects -1 src:python3-defaults

Dear maintainers,

With a recent upload of python3-defaults the autopkgtest of pymca fails in
testing when that autopkgtest is run with the binary packages of
python3-defaults from unstable.  It passes when run with only packages from
testing.  In tabular form:

                       pass            fail
python3-defaults       from testing    3.9.8-1
pymca                  from testing    5.6.5+dfsg-2
all others             from testing    from testing

The output is:

======================================================================
ERROR: testShow (WidgetsInstantiationTest.TestPyMcaMain)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/PyMca5/tests/WidgetsInstantiationTest.py"
, line 133, in testShow
    widget = PyMcaMain.PyMcaMain()
  File "/usr/lib/python3/dist-packages/PyMca5/PyMcaGui/pymca/PyMcaMain.py", line
 394, in __init__
    self.glWindow = SceneGLWindow.SceneGLWindow()
  File "/usr/lib/python3/dist-packages/PyMca5/Object3D/SceneGLWindow.py", line 1
77, in __init__
    self.wheelSlider10.wheel.setValue(0.0)
  File "/usr/lib/python3/dist-packages/PyMca5/Object3D/Object3DSlider.py", line 77, in setValue
    self.slider.setValue(value * self.__factor)
TypeError: setValue(self, int): argument 1 has unexpected type 'float'

----------------------------------------------------------------------

Please find attached a patch to fix this issue.
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru pymca-5.6.5+dfsg/debian/patches/python-3.10.patch pymca-5.6.5+dfsg/debian/patches/python-3.10.patch
--- pymca-5.6.5+dfsg/debian/patches/python-3.10.patch	1969-12-31 16:00:00.000000000 -0800
+++ pymca-5.6.5+dfsg/debian/patches/python-3.10.patch	2021-12-10 20:04:49.000000000 -0800
@@ -0,0 +1,31 @@
+Description: compatibility with python 3.10
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Update: 2021-12-10
+Forwarded: no
+
+Index: pymca-5.6.5+dfsg/PyMca5/Object3D/Object3DSlider.py
+===================================================================
+--- pymca-5.6.5+dfsg.orig/PyMca5/Object3D/Object3DSlider.py
++++ pymca-5.6.5+dfsg/PyMca5/Object3D/Object3DSlider.py
+@@ -74,7 +74,7 @@
+                              int(maxValue * self.__factor))
+ 
+     def setValue(self, value):
+-        self.slider.setValue(value * self.__factor)
++        self.slider.setValue(int(value * self.__factor))
+ 
+     def value(self):
+         if self.__factor != 0.0:
+Index: pymca-5.6.5+dfsg/PyMca5/Object3D/Object3DMovement.py
+===================================================================
+--- pymca-5.6.5+dfsg.orig/PyMca5/Object3D/Object3DMovement.py
++++ pymca-5.6.5+dfsg/PyMca5/Object3D/Object3DMovement.py
+@@ -231,7 +231,7 @@
+         self.validatorList = []
+         for axis in ['X', 'Y', 'Z']:
+             slider = qt.QDial(self)
+-            slider.setRange(0., 36000.)
++            slider.setRange(0, 36000)
+             slider.setWrapping(1)
+             self.l.addWidget(slider, i, j)
+             self.l.setAlignment(slider, qt.Qt.AlignHCenter)
diff -Nru pymca-5.6.5+dfsg/debian/patches/series pymca-5.6.5+dfsg/debian/patches/series
--- pymca-5.6.5+dfsg/debian/patches/series	2021-09-19 01:55:12.000000000 -0700
+++ pymca-5.6.5+dfsg/debian/patches/series	2021-12-10 20:02:59.000000000 -0800
@@ -1,2 +1,3 @@
 0002-use-the-local-mathjax.patch
 0002-switch-to-qhull_r.patch
+python-3.10.patch