pycaption 2.2.0__tar.gz → 2.2.2__tar.gz

{pycaption-2.2.0 → pycaption-2.2.2}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2012-2023 PBS.org
+   Copyright (c) 2012-2024 PBS.org
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{pycaption-2.2.0/pycaption.egg-info → pycaption-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycaption
-Version: 2.2.0
+Version: 2.2.2
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com
@@ -12,15 +12,15 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Multimedia :: Video
-Requires-Python: >=3.6,<4.0
+Requires-Python: >=3.8,<4.0
 License-File: LICENSE
 Requires-Dist: beautifulsoup4>=4.12.1
 Requires-Dist: lxml>=4.9.1
@@ -48,7 +48,7 @@ For details, see the `documentation <http://pycaption.readthedocs.org>`__.
 License
 -------
 
-This module is Copyright (c) 2012-2023 PBS.org and is available under the `Apache
+This module is Copyright (c) 2012-2024 PBS.org and is available under the `Apache
 License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`__.
 
 .. |Build Status| image:: https://github.com/pbs/pycaption/actions/workflows/unit_tests.yml/badge.svg

{pycaption-2.2.0 → pycaption-2.2.2}/README.rst

@@ -15,7 +15,7 @@ For details, see the `documentation <http://pycaption.readthedocs.org>`__.
 License
 -------
 
-This module is Copyright (c) 2012-2023 PBS.org and is available under the `Apache
+This module is Copyright (c) 2012-2024 PBS.org and is available under the `Apache
 License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`__.
 
 .. |Build Status| image:: https://github.com/pbs/pycaption/actions/workflows/unit_tests.yml/badge.svg

{pycaption-2.2.0 → pycaption-2.2.2}/pycaption/__init__.py

@@ -10,7 +10,7 @@ from .scc.translator import translate_scc
 from .transcript import TranscriptWriter
 from .webvtt import WebVTTReader, WebVTTWriter
 from .exceptions import (
-    CaptionReadError, CaptionReadNoCaptions, CaptionReadSyntaxError,
+    CaptionReadError, CaptionReadNoCaptions, CaptionReadSyntaxError, CaptionLineLengthError
 )
 
 

{pycaption-2.2.0 → pycaption-2.2.2}/pycaption/base.py

@@ -212,7 +212,7 @@ class Caption:
             f'{self.format_start()} --> {self.format_end()}\n{self.get_text()}'
         )
 
-    def get_text(self):
+    def get_text_nodes(self):
         """
         Get the text of the caption.
         """
@@ -224,7 +224,10 @@ class Caption:
                 return '\n'
             return ''
 
-        text_nodes = [get_text_for_node(node) for node in self.nodes]
+        return [get_text_for_node(node) for node in self.nodes]
+
+    def get_text(self):
+        text_nodes = self.get_text_nodes()
         return ''.join(text_nodes).strip()
 
     def _format_timestamp(self, microseconds, msec_separator=None):

{pycaption-2.2.0 → pycaption-2.2.2}/pycaption/exceptions.py

@@ -35,3 +35,9 @@ class RelativizationError(Exception):
 
 class InvalidInputError(RuntimeError):
     """Error raised when the input is invalid (i.e. a unicode string)"""
+
+
+class CaptionLineLengthError(CaptionReadError):
+    """
+    Error raised when a Caption has a line longer than 32 characters.
+    """

{pycaption-2.2.0 → pycaption-2.2.2}/pycaption/scc/__init__.py

@@ -88,7 +88,7 @@ from pycaption.base import (
     BaseReader, BaseWriter, CaptionSet, CaptionNode,
 )
 from pycaption.exceptions import CaptionReadNoCaptions, InvalidInputError, \
-    CaptionReadTimingError
+    CaptionReadTimingError, CaptionLineLengthError
 from .constants import (
     HEADER, COMMANDS, SPECIAL_CHARS, EXTENDED_CHARS, CHARACTERS,
     MICROSECONDS_PER_CODEWORD, CHARACTER_TO_CODE,
@@ -232,6 +232,22 @@ class SCCReader(BaseReader):
         captions = CaptionSet({lang: self.caption_stash.get_all()})
 
         # check captions for incorrect lengths
+        lines = []
+        for caption in self.caption_stash._collection:
+            caption_text = "".join(caption.to_real_caption().get_text_nodes())
+            lines.extend(caption_text.split("\n"))
+        lines_too_long = [line for line in lines if len(line) > 32]
+
+        if bool(lines_too_long):
+            msg = ""
+            for line in lines_too_long:
+                msg += line + f" - Length { len(line)}" + "\n"
+            raise CaptionLineLengthError(
+                f"32 character limit for caption cue in scc file.\n"
+                f"Lines longer than 32:\n"
+                f"{msg}"
+            )
+
         for cap in captions.get_captions(lang):
             # if there's an end time on a caption and the difference is
             # less than .05s kill it (this is likely caused by a standalone
@@ -526,13 +542,7 @@ class SCCWriter(BaseWriter):
     # Wrap lines at 32 chars
     @staticmethod
     def _layout_line(caption):
-        def caption_node_to_text(caption_node):
-            if caption_node.type_ == CaptionNode.TEXT:
-                return caption_node.content
-            elif caption_node.type_ == CaptionNode.BREAK:
-                return '\n'
-        caption_text = ''.join(
-            [caption_node_to_text(node) for node in caption.nodes])
+        caption_text = "".join(caption.get_text_nodes())
         inner_lines = caption_text.split('\n')
         inner_lines_laid_out = [textwrap.fill(x, 32) for x in inner_lines]
         return '\n'.join(inner_lines_laid_out)

{pycaption-2.2.0 → pycaption-2.2.2}/pycaption/scc/constants.py

@@ -1,4 +1,5 @@
 from itertools import product
+from collections import defaultdict
 
 COMMANDS = {
     '9420': '',
@@ -985,3 +986,64 @@ MICROSECONDS_PER_CODEWORD = 1000.0 * 1000.0 / (30.0 * 1000.0 / 1001.0)
 
 
 HEADER = 'Scenarist_SCC V1.0'
+
+# taken from
+# http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/CC_CHARS.HTML
+INCONVERTIBLE_TO_ASCII_EXTENDED_CHARS_ASSOCIATION = {
+    '¡': "!",   # inverted exclamation mark
+     '¤': "C",  # currency
+     '¥': "Y",  # yen
+     '¦': "-",  # broken bar
+     '©': "c",  # copyright sign
+     '«': '"',  # left pointing double angle quotation mark
+     '»': '"',  # right pointing double angle quotation mark
+     'À': "A",
+     'Á': "A",
+     'Â': "A",
+     'Ã': "A",
+     'Ä': "A",
+     'Å': "A",
+     'Ç': "C",
+     'È': "E",
+     'É': "E",
+     'Ê': "E",
+     'Ë': "E",
+     'Ì': "I",
+     'Í': "I",
+     'Î': "I",
+     'Ï': "I",
+     'Ò': "O",
+     'Ó': "O",
+     'Ô': ")",
+     'Õ': "O",
+     'Ö': "O",
+     'Ø': "O",
+     'Ù': "U",
+     'Ú': "U",
+     'Û': "U",
+     'Ü': "U",
+     'ß': "s",
+     'ã': "a",
+     'ä': "a",
+     'å': "a",
+     'ë': "e",
+     'ì': "i",
+     'ï': "i",
+     'ò': "o",
+     'õ': "o",
+     'ö': "o",
+     'ø': "o",
+     'ù': "u",
+     'ü': "u",
+     '—': "-",  # em dash
+     '‘': "'",
+     '’': "'",
+     '“': '"',
+     '”': '"',
+     '•': ".",
+     '℠': "s",
+     '┌': "+",
+     '┐': "+",
+     '└': "+",
+     '┘': "+"
+}

{pycaption-2.2.0 → pycaption-2.2.2}/pycaption/scc/specialized_collections.py

@@ -8,7 +8,7 @@ from ..geometry import (
 )
 from .constants import (
     PAC_BYTES_TO_POSITIONING_MAP, COMMANDS, PAC_TAB_OFFSET_COMMANDS,
-    MICROSECONDS_PER_CODEWORD,
+    MICROSECONDS_PER_CODEWORD, INCONVERTIBLE_TO_ASCII_EXTENDED_CHARS_ASSOCIATION
 )
 
 PopOnCue = collections.namedtuple("PopOnCue", "buffer, start, end")
@@ -423,14 +423,25 @@ class InstructionNodeCreator:
 
         :type accented_character: str
         """
-        if self._collection and self._collection[-1].is_text_node() and \
-                self._collection[-1].text:
-            ascii_char = unicodedata.normalize('NFD', accented_character)\
-                .encode('ascii', 'ignore').decode("utf-8")
+        is_text_node = (
+                self._collection and
+                self._collection[-1].is_text_node() and
+                self._collection[-1].text
+                )
+        if is_text_node:
+            try:
+                ascii_char = unicodedata.normalize('NFD', accented_character) \
+                    .encode('ascii', 'strict').decode("utf-8")
+            except (UnicodeEncodeError, UnicodeDecodeError):
+                ascii_char = INCONVERTIBLE_TO_ASCII_EXTENDED_CHARS_ASSOCIATION[
+                    accented_character
+                ]
+
             if ascii_char and self._collection[-1].text[-1] == ascii_char:
                 self._collection[-1].text = self._collection[-1].text[:-1]
 
 
+
 def _get_layout_from_tuple(position_tuple):
     """Create a Layout object from the positioning information given
 

{pycaption-2.2.0 → pycaption-2.2.2/pycaption.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycaption
-Version: 2.2.0
+Version: 2.2.2
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com
@@ -12,15 +12,15 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Multimedia :: Video
-Requires-Python: >=3.6,<4.0
+Requires-Python: >=3.8,<4.0
 License-File: LICENSE
 Requires-Dist: beautifulsoup4>=4.12.1
 Requires-Dist: lxml>=4.9.1
@@ -48,7 +48,7 @@ For details, see the `documentation <http://pycaption.readthedocs.org>`__.
 License
 -------
 
-This module is Copyright (c) 2012-2023 PBS.org and is available under the `Apache
+This module is Copyright (c) 2012-2024 PBS.org and is available under the `Apache
 License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`__.
 
 .. |Build Status| image:: https://github.com/pbs/pycaption/actions/workflows/unit_tests.yml/badge.svg

{pycaption-2.2.0 → pycaption-2.2.2}/setup.py

@@ -24,7 +24,7 @@ transcript_dependencies = [
 
 setup(
     name='pycaption',
-    version='2.2.0',
+    version='2.2.2',
     description='Closed caption converter',
     long_description=open(README_PATH).read(),
     author='Joe Norton',
@@ -35,7 +35,7 @@ setup(
         'Release notes': 'https://pycaption.readthedocs.io'
                          '/en/stable/changelog.html',
     },
-    python_requires='>=3.6,<4.0',
+    python_requires='>=3.8,<4.0',
     install_requires=dependencies,
     extras_require={
         'dev': dev_dependencies,
@@ -49,11 +49,11 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Multimedia :: Video',

{pycaption-2.2.0 → pycaption-2.2.2}/tests/conftest.py

@@ -60,7 +60,8 @@ from tests.fixtures.scc import (  # noqa: F401
     sample_scc_with_ampersand_character, sample_scc_multiple_formats,
     sample_scc_duplicate_tab_offset, sample_scc_duplicate_special_characters,
     sample_scc_tab_offset, sample_scc_with_unknown_commands,
-    sample_scc_special_and_extended_characters
+    sample_scc_special_and_extended_characters,
+    sample_scc_with_line_too_long
 )
 from tests.fixtures.srt import (  # noqa: F401
     sample_srt, sample_srt_ascii, sample_srt_numeric, sample_srt_empty,

{pycaption-2.2.0 → pycaption-2.2.2}/tests/fixtures/scc.py

@@ -314,6 +314,9 @@ def sample_scc_with_extended_characters():
 Scenarist_SCC V1.0
 
 00:04:36;06	9420 942c 942f 9420 91d6 cdc1 13b0 5254 c8c1 ba80 942f
+00:22:32:18	9420 942c 942f 9420 9454 97a1 4ad5 ce49 4f52 ba20 a180 92a7 d975 6da1 9470 9723 d961 206d e520 73e9
+
+00:22:34:28	942c e56e f4ef 206d 75e3 68ef 206d e5ea eff2 ae80 9420 942c 942f 9420 94f2 9723 4ad5 ce49 4f52 ba20 4f79 e52c 20c1 ec6d 612c
 """
 
 
@@ -422,4 +425,21 @@ Scenarist_SCC V1.0
 00:20:19;12 1326 13a7 13a8 1329 132a 13ab 132c 13ad 13ae 132f 13b0 1331 1332
 
 00:24:39;28 13b3 1334 13b5 13b6 1337 1338 13b9 13ba 133b 13bc 133d 133e 13bf
-"""
+"""
+
+
+@pytest.fixture(scope="session")
+def sample_scc_with_line_too_long():
+    return """\
+Scenarist_SCC V1.0
+
+00:00:00;03	942c
+
+00:00:01;45	9420 91f4 cb45 4c4c d920 4ac1 cd45 d3ba 20c8 eff7 9254 f468 e520 7368 eff7 2073 f461 f2f4 e564 942c 8080 8080 942f
+
+00:00:02;55	9420 91e0 9723 f761 7320 4361 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 ec20 c4e5 6ee9 73ef 6e2c 2061 20e6 f2e9 e56e 6480 9240 9723 efe6 20ef 75f2 732c 20f7 6173 2064 efe9 6e67 206d 7920 43c4 73ae 942c 8080 8080 942f
+
+00:00:06;57	9420 94e0 c16e 6420 68e5 2073 61e9 642c 2049 20e3 616e 2064 ef20 6120 54d6 2073 68ef f7ae 942c 8080 8080 942f
+
+00:00:08;58	9420 9452 4920 ea75 73f4 20f7 616e f4e5 6420 ef6e e520 7368 eff7 2c80 94f2 ea75 73f4 20f4 ef20 6861 76e5 2061 7320 6120 ece9 f4f4 ece5 942c 8080 8080 942f
+"""

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_dfxp.py

@@ -2,14 +2,12 @@ import pytest
 
 from pycaption import DFXPReader, CaptionReadNoCaptions
 from pycaption.exceptions import (
-    CaptionReadSyntaxError, InvalidInputError, CaptionReadError,
-    CaptionReadTimingError,
+    CaptionReadSyntaxError, CaptionReadError, CaptionReadTimingError,
 )
 from pycaption.geometry import (
     UnitEnum, HorizontalAlignmentEnum, VerticalAlignmentEnum,
 )
 from tests.mixins import ReaderTestingMixIn
-from pytest_lazyfixture import lazy_fixture
 
 
 class TestDFXPReader(ReaderTestingMixIn):
@@ -19,15 +17,20 @@ class TestDFXPReader(ReaderTestingMixIn):
     def test_positive_answer_for_detection(self, sample_dfxp):
         super().assert_positive_answer_for_detection(sample_dfxp)
 
-    @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
-    ])
-    def test_negative_answer_for_detection(self, different_sample):
-        super().assert_negative_answer_for_detection(different_sample)
+    def test_negative_answer_for_microdvd(self, sample_microdvd):
+        super().assert_negative_answer_for_detection(sample_microdvd)
+
+    def test_negative_answer_for_sami(self, sample_sami):
+        super().assert_negative_answer_for_detection(sample_sami)
+
+    def test_negative_answer_for_scc_on_pop_on(self, sample_scc_pop_on):
+        super().assert_negative_answer_for_detection(sample_scc_pop_on)
+
+    def test_negative_answer_for_srt(self, sample_srt):
+        super().assert_negative_answer_for_detection(sample_srt)
+
+    def test_negative_answer_for_webvtt(self, sample_webvtt):
+        super().assert_negative_answer_for_detection(sample_webvtt)
 
     def test_caption_length(self, sample_dfxp):
         captions = DFXPReader().read(sample_dfxp)
@@ -87,9 +90,6 @@ class TestDFXPReader(ReaderTestingMixIn):
         with pytest.raises(CaptionReadTimingError) as exc_info:
             DFXPReader()._convert_timestamp_to_microseconds(timestamp)
 
-        assert exc_info.value.args[0].startswith(
-            f'Invalid timestamp: {timestamp}.')
-
     def test_empty_file(self, sample_dfxp_empty):
         with pytest.raises(CaptionReadNoCaptions):
             DFXPReader().read(sample_dfxp_empty)

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_geometry.py

@@ -140,4 +140,4 @@ class TestSize:
         with pytest.raises(CaptionReadSyntaxError) as exc_info:
             Size.from_string(string)
 
-        assert exc_info.value.args[0].startswith(f"Invalid size: {string}.")
+        assert exc_info.value.args[0].startswith(f"Invalid size: {string}.")

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_microdvd.py

@@ -13,15 +13,20 @@ class TestMicroDVDReader(ReaderTestingMixIn):
     def test_positive_answer_for_detection(self, sample_microdvd):
         super().assert_positive_answer_for_detection(sample_microdvd)
 
-    @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
-    ])
-    def test_negative_answer_for_detection(self, different_sample):
-        super().assert_negative_answer_for_detection(different_sample)
+    def test_negative_answer_for_detection_dfxp(self, sample_dfxp):
+        super().assert_negative_answer_for_detection(sample_dfxp)
+
+    def test_negative_answer_for_detection_sami(self, sample_sami):
+        super().assert_negative_answer_for_detection(sample_sami)
+
+    def test_negative_answer_for_detection_scc_pop_on(self, sample_scc_pop_on):
+        super().assert_negative_answer_for_detection(sample_scc_pop_on)
+
+    def test_negative_answer_for_detection_srt(self, sample_srt):
+        super().assert_negative_answer_for_detection(sample_srt)
+
+    def test_negative_answer_for_detection_webvtt(self, sample_webvtt):
+        super().assert_negative_answer_for_detection(sample_webvtt)
 
     def test_caption_length(self, sample_microdvd):
         captions = MicroDVDReader().read(sample_microdvd)

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_sami.py

@@ -15,15 +15,20 @@ class TestSAMIReader(ReaderTestingMixIn):
     def test_positive_answer_for_detection(self, sample_sami):
         super().assert_positive_answer_for_detection(sample_sami)
 
-    @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
-    ])
-    def test_negative_answer_for_detection(self, different_sample):
-        super().assert_negative_answer_for_detection(different_sample)
+    def test_negative_answer_for_detection_dfxp(self, sample_dfxp):
+        super().assert_negative_answer_for_detection(sample_dfxp)
+
+    def test_negative_answer_for_detection_microdvd(self, sample_microdvd):
+        super().assert_negative_answer_for_detection(sample_microdvd)
+
+    def test_negative_answer_for_detection_scc_pop_on(self, sample_scc_pop_on):
+        super().assert_negative_answer_for_detection(sample_scc_pop_on)
+
+    def test_negative_answer_for_detection_srt(self, sample_srt):
+        super().assert_negative_answer_for_detection(sample_srt)
+
+    def test_negative_answer_for_detection_webvtt(self, sample_webvtt):
+        super().assert_negative_answer_for_detection(sample_webvtt)
 
     def test_caption_length(self, sample_sami):
         caption_set = self.reader.read(sample_sami)

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_scc.py

@@ -1,7 +1,7 @@
 import pytest
 
 from pycaption import SCCReader, CaptionReadNoCaptions, CaptionNode
-from pycaption.exceptions import CaptionReadTimingError
+from pycaption.exceptions import CaptionReadTimingError, CaptionLineLengthError
 from pycaption.geometry import (
     UnitEnum, HorizontalAlignmentEnum, VerticalAlignmentEnum,
 )
@@ -22,15 +22,20 @@ class TestSCCReader(ReaderTestingMixIn):
     def test_positive_answer_for_detection(self, sample_scc_pop_on):
         super().assert_positive_answer_for_detection(sample_scc_pop_on)
 
-    @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
-    ])
-    def test_negative_answer_for_detection(self, different_sample):
-        super().assert_negative_answer_for_detection(different_sample)
+    def test_negative_answer_for_detection_dfxp(self, sample_dfxp):
+        super().assert_negative_answer_for_detection(sample_dfxp)
+
+    def test_negative_answer_for_detection_microdvd(self, sample_microdvd):
+        super().assert_negative_answer_for_detection(sample_microdvd)
+
+    def test_negative_answer_for_detection_sami(self, sample_sami):
+        super().assert_negative_answer_for_detection(sample_sami)
+
+    def test_negative_answer_for_detection_srt(self, sample_srt):
+        super().assert_negative_answer_for_detection(sample_srt)
+
+    def test_negative_answer_for_detection_webvtt(self, sample_webvtt):
+        super().assert_negative_answer_for_detection(sample_webvtt)
 
     def test_caption_length(self, sample_scc_pop_on):
         captions = SCCReader().read(sample_scc_pop_on)
@@ -193,9 +198,11 @@ class TestSCCReader(ReaderTestingMixIn):
     def test_skip_extended_characters_ascii_duplicate(
             self, sample_scc_with_extended_characters):
         caption_set = SCCReader().read(sample_scc_with_extended_characters)
-        nodes = caption_set.get_captions('en-US')[0].nodes
-
-        assert nodes[0].content == 'MÄRTHA:'
+        captions = caption_set.get_captions('en-US')
+        assert captions[0].nodes[0].content == 'MÄRTHA:'
+        expected_result = ['JUNIOR: ¡Yum!', None, 'Ya me siento mucho mejor.']
+        content = [node.content for node in captions[1].nodes]
+        assert all(result in expected_result for result in content)
 
     def test_skip_duplicate_tab_offset(self, sample_scc_duplicate_tab_offset):
         expected_lines = [
@@ -237,6 +244,15 @@ class TestSCCReader(ReaderTestingMixIn):
         assert exc_info.value.args[0].startswith(
             "Unsupported cue duration around 00:00:20.433")
 
+    def test_line_too_long(self, sample_scc_with_line_too_long):
+        with pytest.raises(CaptionLineLengthError) as exc_info:
+            SCCReader().read(sample_scc_with_line_too_long)
+
+        assert exc_info.value.args[0].startswith(
+            "32 character limit for caption cue in scc file.")
+        assert ("was Cal l l l l l l l l l l l l l l l l l l l l l l l l l l l l Denison, a friend - Length 81"
+                in exc_info.value.args[0].split("\n"))
+
 
 class TestCoverageOnly:
     """In order to refactor safely, we need coverage of 95% or more.
@@ -272,7 +288,6 @@ class TestCoverageOnly:
             'And wildlife.',
             '>> Bike Iowa, your source for',
         ]
-
         assert expected_texts == actual_texts
 
     def test_multiple_formats(self, sample_scc_multiple_formats):

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_srt.py

@@ -11,15 +11,20 @@ class TestSRTReader(ReaderTestingMixIn):
     def test_positive_answer_for_detection(self, sample_srt):
         super().assert_positive_answer_for_detection(sample_srt)
 
-    @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_webvtt')
-    ])
-    def test_negative_answer_for_detection(self, different_sample):
-        super().assert_negative_answer_for_detection(different_sample)
+    def test_negative_answer_for_detection_dfxp(self, sample_dfxp):
+        super().assert_negative_answer_for_detection(sample_dfxp)
+
+    def test_negative_answer_for_detection_microdvd(self, sample_microdvd):
+        super().assert_negative_answer_for_detection(sample_microdvd)
+
+    def test_negative_answer_for_detection_sami(self, sample_sami):
+        super().assert_negative_answer_for_detection(sample_sami)
+
+    def test_negative_answer_for_detection_scc_pop_on(self, sample_scc_pop_on):
+        super().assert_negative_answer_for_detection(sample_scc_pop_on)
+
+    def test_negative_answer_for_detection_webvtt(self, sample_webvtt):
+        super().assert_negative_answer_for_detection(sample_webvtt)
 
     def test_caption_length(self, sample_srt):
         captions = self.reader.read(sample_srt)

{pycaption-2.2.0 → pycaption-2.2.2}/tests/test_webvtt.py

@@ -14,15 +14,20 @@ class TestWebVTTReader(ReaderTestingMixIn):
     def test_positive_answer_for_detection(self, sample_webvtt):
         super().assert_positive_answer_for_detection(sample_webvtt)
 
-    @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt')
-    ])
-    def test_negative_answer_for_detection(self, different_sample):
-        super().assert_negative_answer_for_detection(different_sample)
+    def test_negative_answer_for_detection_dfxp(self, sample_dfxp):
+        super().assert_negative_answer_for_detection(sample_dfxp)
+
+    def test_negative_answer_for_detection_microdvd(self, sample_microdvd):
+        super().assert_negative_answer_for_detection(sample_microdvd)
+
+    def test_negative_answer_for_detection_sami(self, sample_sami):
+        super().assert_negative_answer_for_detection(sample_sami)
+
+    def test_negative_answer_for_detection_scc_pop_on(self, sample_scc_pop_on):
+        super().assert_negative_answer_for_detection(sample_scc_pop_on)
+
+    def test_negative_answer_for_detection_srt(self, sample_srt):
+        super().assert_negative_answer_for_detection(sample_srt)
 
     def test_caption_length(self, sample_webvtt_2):
         captions = self.reader.read(sample_webvtt_2)