pycaption 2.2.2__tar.gz → 2.2.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycaption
-Version: 2.2.2
+Version: 2.2.4
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

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

@@ -339,7 +339,7 @@ class SCCReader(BaseReader):
         # same as the first.
         # Also like codes, Special Characters are always doubled up,
         # with only one member of each pair being displayed.
-        if word in COMMANDS or _is_pac_command(word) or word in SPECIAL_CHARS:
+        if word in COMMANDS or _is_pac_command(word) or word in SPECIAL_CHARS or word in EXTENDED_CHARS:
             if word == self.last_command:
                 self.last_command = ''
                 return True

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

@@ -990,60 +990,60 @@ 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",
-     '┌': "+",
-     '┐': "+",
-     '└': "+",
-     '┘': "+"
+    '¡': ["!", "i"],   # 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.2 → pycaption-2.2.4}/pycaption/scc/specialized_collections.py

@@ -430,18 +430,17 @@ class InstructionNodeCreator:
                 )
         if is_text_node:
             try:
-                ascii_char = unicodedata.normalize('NFD', accented_character) \
+                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
                 ]
+            except (UnicodeEncodeError, UnicodeDecodeError):
+                ascii_char = INCONVERTIBLE_TO_ASCII_EXTENDED_CHARS_ASSOCIATION.get(accented_character)
 
-            if ascii_char and self._collection[-1].text[-1] == ascii_char:
+            if ascii_char and self._collection[-1].text[-1] in 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.2 → pycaption-2.2.4/pycaption.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycaption
-Version: 2.2.2
+Version: 2.2.4
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

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

@@ -24,7 +24,7 @@ transcript_dependencies = [
 
 setup(
     name='pycaption',
-    version='2.2.2',
+    version='2.2.4',
     description='Closed caption converter',
     long_description=open(README_PATH).read(),
     author='Joe Norton',

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

@@ -279,7 +279,7 @@ class TestCoverageOnly:
             'WE SERVE.',
             '®°½',
             'ABû',
-            'ÁÁÉÓ¡',
+            'ÁÉÓ¡',
             "WHERE YOU'RE STANDING NOW,",
             "LOOKING OUT THERE, THAT'S AL",
             'THE CROWD.',