summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <code@jaseg.net>2016-08-04 16:23:44 +0200
committerjaseg <code@jaseg.net>2016-08-04 16:23:44 +0200
commit588d74938c2fe84df0aed966a014faf82939db60 (patch)
tree9586fa0049c58b69e7ec3593d9d3f22fb7c632fc
parent73f2e87f66a2a5a2e14bb1c8b4a17bbf3eaf27ee (diff)
downloadpython-mpv-588d74938c2fe84df0aed966a014faf82939db60.tar.gz
python-mpv-588d74938c2fe84df0aed966a014faf82939db60.tar.bz2
python-mpv-588d74938c2fe84df0aed966a014faf82939db60.zip
Make video-pan-x and video-pan-y floats as they should be
-rwxr-xr-xmpv-test.py4
-rw-r--r--mpv.py4
2 files changed, 3 insertions, 5 deletions
diff --git a/mpv-test.py b/mpv-test.py
index 23a3d3a..10bb71b 100755
--- a/mpv-test.py
+++ b/mpv-test.py
@@ -38,11 +38,9 @@ class TestProperties(unittest.TestCase):
for name, (ptype, access) in mpv.ALL_PROPERTIES.items():
if 'r' in access:
name = name.replace('-', '_')
- try:
+ with self.subTest(property_name=name):
with self.swallow_mpv_errors():
rv = getattr(self.m, name)
- except Exception as e:
- raise RuntimeError('Error while testing property', name)
if rv is not None: # Technically, any property can return None (even if of type e.g. int)
self.assertEqual(type(rv), ptype, msg=name)
diff --git a/mpv.py b/mpv.py
index d49949b..f121c8d 100644
--- a/mpv.py
+++ b/mpv.py
@@ -626,8 +626,8 @@ ALL_PROPERTIES = {
'video': (str, 'rw'), # alias for vid
'video-align-x': (float, 'rw'),
'video-align-y': (float, 'rw'),
- 'video-pan-x': (int, 'rw'),
- 'video-pan-y': (int, 'rw'),
+ 'video-pan-x': (float, 'rw'),
+ 'video-pan-y': (float, 'rw'),
'video-zoom': (float, 'rw'),
'video-unscaled': (ynbool, 'w'),
'program': (int, 'w'),