pyderasn.py | 8 ++++---- tests/test_pyderasn.py | 12 ++++++------ diff --git a/pyderasn.py b/pyderasn.py index c69060481b3737cdba80c2bdb75de3edcb9ef901eabe44b7842f802958a53d91..66e2c4f8308402cc5f305255c042069be44c396dfeca207afb21ad48e2323528 100755 --- a/pyderasn.py +++ b/pyderasn.py @@ -6107,7 +6107,7 @@ **NAMEDTUPLE_KWARGS ) -class SequenceEncode1stMixing: +class SequenceEncode1stMixin: __slots__ = () def _encode1st(self, state): @@ -6121,7 +6121,7 @@ state[idx] = vlen return len(self.tag) + len_size(vlen) + vlen, state -class Sequence(SequenceEncode1stMixing, Obj): +class Sequence(SequenceEncode1stMixin, Obj): """``SEQUENCE`` structure type You have to make specification of sequence:: @@ -6619,7 +6619,7 @@ for pp in self.pps_lenindef(decode_path): yield pp -class Set(Sequence, SequenceEncode1stMixing): +class Set(Sequence, SequenceEncode1stMixin): """``SET`` structure type Its usage is identical to :py:class:`pyderasn.Sequence`. @@ -6822,7 +6822,7 @@ **NAMEDTUPLE_KWARGS ) -class SequenceOf(SequenceEncode1stMixing, Obj): +class SequenceOf(SequenceEncode1stMixin, Obj): """``SEQUENCE OF`` sequence type For that kind of type you must specify the object it will carry on diff --git a/tests/test_pyderasn.py b/tests/test_pyderasn.py index 94122189a4677942b8eb4574b1aa393c055c3d068e420aebd5ac020d385c5fd8..c4705f474bb8a5f2bf9aa462d46e7d13abe9c3a8033c7cc35e57749d2dfa8d3e 100644 --- a/tests/test_pyderasn.py +++ b/tests/test_pyderasn.py @@ -5937,7 +5937,7 @@ expect_outers.append(expect) return seq_outer, expect_outers -class SeqMixing(object): +class SeqMixin(object): def test_invalid_value_type(self): with self.assertRaises(InvalidValueType) as err: self.base_klass(123) @@ -6451,7 +6451,7 @@ self.assertFalse(decoded.lenindef) self.assertTrue(decoded.bered) -class TestSequence(SeqMixing, CommonMixin, TestCase): +class TestSequence(SeqMixin, CommonMixin, TestCase): base_klass = Sequence @given( @@ -6497,7 +6497,7 @@ self.assertEqual(seq["name"], "Smith") self.assertEqual(seq["ok"], True) -class TestSet(SeqMixing, CommonMixin, TestCase): +class TestSet(SeqMixin, CommonMixin, TestCase): base_klass = Set @settings(max_examples=LONG_TEST_MAX_EXAMPLES) @@ -6612,7 +6612,7 @@ _decoded, ) -class SeqOfMixing(object): +class SeqOfMixin(object): def test_invalid_value_type(self): with self.assertRaises(InvalidValueType) as err: self.base_klass(123) @@ -7082,7 +7082,7 @@ self.assertFalse(decoded.lenindef) self.assertTrue(decoded.bered) -class TestSequenceOf(SeqOfMixing, CommonMixin, TestCase): +class TestSequenceOf(SeqOfMixin, CommonMixin, TestCase): class SeqOf(SequenceOf): schema = "whatever" base_klass = SeqOf @@ -7166,7 +7166,7 @@ seqof = SeqOf() self.assertFalse(seqof.ready) -class TestSetOf(SeqOfMixing, CommonMixin, TestCase): +class TestSetOf(SeqOfMixin, CommonMixin, TestCase): class SeqOf(SetOf): schema = "whatever" base_klass = SeqOf