Lint

Signed-off-by: Jean-Christophe Morin <[email protected]>
AcademySoftwareFoundation · Dec 4, 2022 · c228768 · c228768
1 parent 4949fc0
commit c228768
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 26 deletions.
diff --git a/src/py-opentimelineio/opentimelineio/core/__init__.py b/src/py-opentimelineio/opentimelineio/core/__init__.py
@@ -41,7 +41,12 @@
 Metadata: TypeAlias = Union[Dict[str, 'MetadataValue'], AnyDictionary]
 """OTIO custom metadata type."""
 
-MetadataValue: TypeAlias = Union[bool, int, float, str, None, SerializableObject, RationalTime, TimeRange, TimeTransform, Metadata]
+MetadataValue: TypeAlias = Union[
+    bool, int, float, str, None,
+    SerializableObject,
+    RationalTime, TimeRange, TimeTransform,
+    Metadata
+]
 """Metadata's values."""
 
 from . _core_utils import ( # noqa

diff --git a/tests/test_serializable_object.py b/tests/test_serializable_object.py
@@ -4,9 +4,9 @@
 # Copyright Contributors to the OpenTimelineIO project
 
 import opentimelineio as otio
-import opentimelineio._otio
+from opentimelineio._otio import AnyDictionary, AnyVector
 import opentimelineio.test_utils as otio_test_utils
-import opentimelineio.opentime
+from opentimelineio.opentime import RationalTime, TimeRange, TimeTransform
 
 import unittest
 import json
@@ -39,11 +39,11 @@ def test_cons(self):
         self.assertEqual(so.metadata['foo'], 'bar')
 
     def test_cons2(self):
-        v = opentimelineio._otio.AnyVector()
+        v = AnyVector()
         v.append(1)
         v.append('inside any vector')
 
-        d = opentimelineio._otio.AnyDictionary()
+        d = AnyDictionary()
         d['key_1'] = 1234
         d['key_2'] = {'asdasdasd': 5.6}
         so = otio.core.SerializableObjectWithMetadata(
@@ -54,13 +54,16 @@ def test_cons2(self):
                 'dict': {'map1': [345]},
                 'AnyVector': v,
                 'AnyDictionary': d,
-                'RationalTime': opentimelineio.opentime.RationalTime(value=10.0, rate=5.0),
-                'TimeRange': opentimelineio.opentime.TimeRange(
-                    opentimelineio.opentime.RationalTime(value=1.0),
-                    opentimelineio.opentime.RationalTime(value=100.0)
+                'RationalTime': RationalTime(
+                    value=10.0,
+                    rate=5.0
                 ),
-                'TimeTransform': opentimelineio.opentime.TimeTransform(
-                    offset=opentimelineio.opentime.RationalTime(value=55.0),
+                'TimeRange': TimeRange(
+                    RationalTime(value=1.0),
+                    RationalTime(value=100.0)
+                ),
+                'TimeTransform': TimeTransform(
+                    offset=RationalTime(value=55.0),
                     scale=999
                 )
             }
@@ -69,22 +72,34 @@ def test_cons2(self):
         self.assertEqual(so.metadata['foo'], 'bar')
         self.assertEqual(so.metadata['string'], 'myvalue')
         self.assertEqual(so.metadata['int'], -999999999999)
-        self.assertIsInstance(so.metadata['list'], opentimelineio._otio.AnyVector)
-        self.assertEqual(so.metadata['list'], opentimelineio._otio.AnyVector([1, 2.5, 'asd']))
-        self.assertIsInstance(so.metadata['dict'], opentimelineio._otio.AnyDictionary)
-        self.assertIsInstance(so.metadata['dict']['map1'], opentimelineio._otio.AnyVector)
-        self.assertEqual(so.metadata['dict'], opentimelineio._otio.AnyDictionary({'map1': [345]}))
-        self.assertIsInstance(so.metadata['AnyVector'], opentimelineio._otio.AnyVector)
-        self.assertEqual(list(so.metadata['AnyVector']), opentimelineio._otio.AnyVector([1, 'inside any vector']))
-        self.assertIsInstance(so.metadata['AnyDictionary'], opentimelineio._otio.AnyDictionary)
-        self.assertEqual(so.metadata['AnyDictionary'], opentimelineio._otio.AnyDictionary({'key_1': 1234, 'key_2': {'asdasdasd': 5.6}}))
-        self.assertEqual(so.metadata['RationalTime'], opentimelineio.opentime.RationalTime(value=10.0, rate=5.0))
-        self.assertEqual(so.metadata['TimeRange'], opentimelineio.opentime.TimeRange(
-            opentimelineio.opentime.RationalTime(value=1.0),
-            opentimelineio.opentime.RationalTime(value=100.0)
+        self.assertIsInstance(so.metadata['list'], AnyVector)
+        self.assertEqual(
+            so.metadata['list'],
+            AnyVector([1, 2.5, 'asd'])
+        )
+        self.assertIsInstance(so.metadata['dict'], AnyDictionary)
+        self.assertIsInstance(so.metadata['dict']['map1'], AnyVector)
+        self.assertEqual(so.metadata['dict'], AnyDictionary({'map1': [345]}))
+        self.assertIsInstance(so.metadata['AnyVector'], AnyVector)
+        self.assertEqual(
+            so.metadata['AnyVector'],
+            AnyVector([1, 'inside any vector'])
+        )
+        self.assertIsInstance(so.metadata['AnyDictionary'], AnyDictionary)
+        self.assertEqual(
+            so.metadata['AnyDictionary'],
+            AnyDictionary({'key_1': 1234, 'key_2': {'asdasdasd': 5.6}})
+        )
+        self.assertEqual(
+            so.metadata['RationalTime'],
+            RationalTime(value=10.0, rate=5.0)
+        )
+        self.assertEqual(so.metadata['TimeRange'], TimeRange(
+            RationalTime(value=1.0),
+            RationalTime(value=100.0)
         ))
-        self.assertEqual(so.metadata['TimeTransform'], opentimelineio.opentime.TimeTransform(
-            offset=opentimelineio.opentime.RationalTime(value=55.0),
+        self.assertEqual(so.metadata['TimeTransform'], TimeTransform(
+            offset=RationalTime(value=55.0),
             scale=999
         ))