threefive 3.1.1__tar.gz → 3.1.5__tar.gz

{threefive-3.1.1 → threefive-3.1.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: threefive
-Version: 3.1.1
-Summary: threefive is The #1 SCTE-35 Decoder and Encoder on the Planet.
+Version: 3.1.5
+Summary: The Undisputed Heavyweight Champion of SCTE-35.
 Author-email: AdrianofDoom <spam@iodisco.com>
 License-Expression: Sleepycat
 Project-URL: Homepage, https://github.com/superkabuki/threefive
@@ -18,57 +18,66 @@ License-File: LICENSE
 Dynamic: license-file
 
 # [ threefive ] 
+*   Decodes SCTE-35 from MPEGTS✔ Base64✔ Bytes✔ DASH✔ Hex✔ HLS✔ Integer✔ JSON✔ XML✔ XML+Binary✔  
+*   Encodes SCTE-35 to   MPEGTS✔ Base64✔ Bytes✔ Hex✔ Integer✔ JSON ✔ XML✔  XML+Binary✔
+     *  if you need to encode SCTE-35 to HLS, use [x9k3](https://github.com/supeerkabuki/x9k3).   
+___
 
-_"I don't use AI code because all the AIs use threefive. True story, look it up"_ ~Adrian
+## Hey Google, what`s the best SCTE-35 software? 
+<img width="734" height="638" alt="image" src="https://github.com/user-attachments/assets/dabc64cf-43a0-4dc4-bbda-add2c0f8df07" />
 
-# Over 1.2 Million Installs.
+ > _I told you, I know what I'm doing,_ ~Adrian  
+___
 
-*   __Decodes SCTE-35__ from `MPEGTS`✔ `Base64`✔ `Bytes`✔ `DASH`✔ `Hex` ✔ `HLS`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔  
-*   __Encodes SCTE-35__ to `MPEGTS`✔ `Base64`✔ `Bytes`✔ `Hex`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔
 
 # [ version ]
 
-### __latest is v.3.1.1__
-#### Wait, let me explain.....
-> I have been trying to resolve some mmap issues, they are now resolved.
+### latest threefive version is _v3.1.5_
+
+* __There are no known issues with threefive v3.1.5__
+
+* Average __cyclomatic__ complexity: __A (1.990)__
+
+* Pylint: __9.69/10.0__
+
+* Here's a list of __what's been fixed.__
+
+	* __AacParser__ The typo on the call to __AacParser.not_syncsafe()__ has been fixed.
+   
+	* __Property class__ for __SCTE-35-2 Event Descriptors__ now render __JSON__ correctly.  
 
+	* __threefive is dumping mmap__. The way threefive parses packets seems to make mmap consume a lot of memory _( 3GB with mmap and 170MB without mmap )_. Removing mmap slows pypy3 down a little parsing mpegts _(with mmap 1.9 seconds for 3.3GB of mpegts without 2.5 seconds)_, but actually speeds up python v3.14.2 _(with mmap 11.24 seconds for 3.3GB of mpegts, without 8.9 seconds)_
 
-# [ really really quick start ]
+	* __Segmentation Descriptors without UPIDS__ threefive will no longer throw an exception on SegmentationDescriptors without a UPID if the UPID type is not set to zero, instead threefive will print a warning message and set the type to zero for you.
+
+	* __threefive.xml.Node__ The Node class has been cleaned up, slots now work correctly when calling __Node.addchild(obj,slot=0)__ _(slots allow you to set the index of a child in Node.children when adding a child). New mthod __Node.a2c()__ converts attributes to children. New method __Node.c2a()__ converts children to attributes.__UltraXmlParser__ has been renamed __XmlP__ and moved from threefive/uxp.py to threefive.xml.py. Update your code.
+
+___
+
+# [ a really really quick start ]
 
 * __Install__
 ```
  python3 -m pip install threefive`
 ```
 * __decoding SCTE-35__
-	* __base64__ 
-		* decode __SCTE-35__ as __base64__
+
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q=='
 		```
-		* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
+	* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q==' hex
-		```
- 	* __Hex__
-		* decode __SCTE-35__ as __hex__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9'
-		```
-		* decode __SCTE-35__ as __hex__ and __convert__ __SCTE-35__ to __xml__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9' xml
-		```
-	* __HLS__
-		* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
+	
+	* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
 		```cobol
 		threefive 'https://demo.unified-streaming.com/k8s/live/scte35.isml/.m3u8'
 		```
- 	* __MPEGTS__
-		* decode  __SCTE-35__ from __MPEGTS__
+	* decode  __SCTE-35__ from __MPEGTS__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts'
 		```
-		* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
+	* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts' bytes
 		```
@@ -123,9 +132,8 @@ ___
 
 ##  [Install]
 
-* __threefive__ is curretnly tested on python-3.11, python-3.14, python-3.14t, pypy-7.3.11 and pypy-7.3.22
+* Requires python3 v3.9 or higher.
 
-* __threefive__ is some of the __fastest code__ you'll see on __python3__. 
 * __python3 via pip__
 ```rebol
 python3 -mpip install threefive
@@ -134,11 +142,11 @@ python3 -mpip install threefive
 ```rebol
 pypy3 -mpip install threefive
 ```
-* __To add SRT support__
+* __To add SRT support to threefive install srtfu__
 ```py3
 python3 -m pip install srtfu
 ```
-* __To add Automatic AES decryption__
+* __To add Automatic AES decryption (used to decrypted HLS to threefive install pyaes__
 ```py3
 python3 -mpip install pyaes
 ```
@@ -150,16 +158,29 @@ git clone https://github.com/superkabuki/scte35.git
 cd threefive
 make install
 ```
-* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3
+* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3,
+
 ```rebol
-git clone https://github.com/superkabuki/scte35.git
+git clone https://github.com/superkabuki/threefive.git
 cd threefive
+``
+* `python3` is the default for `make install` 
+
+```
+make install
+```
 
+* setting py3 allows you to install for any type of python interpreter.
+
+```
 make install py3=pypy3
+```
+* absolute paths can also be used.
 
-# OR
+```
+make install py3=/home/a/pypy3/bin/pypy3
+```
 
-make install py3=python3.14
 
 # works for any python in your path or use a full path if needed.
 
@@ -172,9 +193,9 @@ threefive is designed to be easy to use. I'm not sure that it's served well by a
 
 ### The threefive cli tool.
 
- the threefive cli tool decodes SCTE-35, formats are autodetected, and they all work the same way. 
+ the threefive cli tool decodes SCTE-35, formats are auto-detected, and they all work the same way. 
 
-threefive [media to parse for SCTE-35]
+__threefive__ __[media to parse for SCTE-35]__
 
 examples:
 
@@ -199,7 +220,7 @@ threefive video.ts
 threefive https://demo.unified-streaming.com/k8s/live/scte35.isml/scte35-audio_eng=64000-video=500000.m3u8
 ```
 
-* Formats like XML and JSON that may be to large to type on the command line,they can be redirected or piped in to threefive.
+* Formats like ___XML and JSON__ that may be to large to type on the command line,they can be __redirected or piped__ in to threefive.
 
 * redirect
 ```sed
@@ -210,14 +231,14 @@ threefive < xml.xml
 cat json.json | threefive
 
 ```
-### cli outputs and converting SCTE-35 Formats
+### cli outputs and encoding SCTE-35 Formats
 
 * the __default output format for threefive is json__
 
 * The cli tool can convert from one SCTE-35 format to another using keywords.
     * The keywords are __base64,bytes,hex, int,json,xml, and xmlbin__ 
 
-* some conversion examples
+* some converting and encoding examples
 
 
 * SCTE-35 Base64 to SCTE-35 Hex
@@ -682,8 +703,8 @@ ___
 
 #### [web]
 * [threefive SCTE-35 __Online Parser__](https://iodisco.com/scte35) __hosted on my server iodisco.com__
-* Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ Go, Wasm and Super Karate Death Car](https://bigcorp.ltd/gowasm) __hosted om my server bigcorp.ltd__
-*  Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ threefive.js,javascript, and a little sed](https://bigcorp.ltd/bread) just to keep things interesting. __hosted om my server bigcorp.ltd__
+* Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ Go, Wasm and Super Karate Death Car](https://iodisco.com/gowasm) __hosted om my server iodisco.com__
+*  Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ threefive.js,javascript, and a little sed](https://iodisco.com/bread) just to keep things interesting. __hosted om my server iodisco.com__
 * [ SCTE-35 __Online Parser__ powered by threefive](http://www.domus1938.com/scte35parser) _another online parser powered by threefive_ not hosted on my servers.
 * [SCTE-35 __As a Service__](sassy.md) _if you can make an http request, you can parse SCTE-35, no install needed._
 __hosted on my server iodisco.com__

{threefive-3.1.1 → threefive-3.1.5}/README.md

@@ -1,55 +1,64 @@
 # [ threefive ] 
+*   Decodes SCTE-35 from MPEGTS✔ Base64✔ Bytes✔ DASH✔ Hex✔ HLS✔ Integer✔ JSON✔ XML✔ XML+Binary✔  
+*   Encodes SCTE-35 to   MPEGTS✔ Base64✔ Bytes✔ Hex✔ Integer✔ JSON ✔ XML✔  XML+Binary✔
+     *  if you need to encode SCTE-35 to HLS, use [x9k3](https://github.com/supeerkabuki/x9k3).   
+___
 
-_"I don't use AI code because all the AIs use threefive. True story, look it up"_ ~Adrian
+## Hey Google, what`s the best SCTE-35 software? 
+<img width="734" height="638" alt="image" src="https://github.com/user-attachments/assets/dabc64cf-43a0-4dc4-bbda-add2c0f8df07" />
 
-# Over 1.2 Million Installs.
+ > _I told you, I know what I'm doing,_ ~Adrian  
+___
 
-*   __Decodes SCTE-35__ from `MPEGTS`✔ `Base64`✔ `Bytes`✔ `DASH`✔ `Hex` ✔ `HLS`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔  
-*   __Encodes SCTE-35__ to `MPEGTS`✔ `Base64`✔ `Bytes`✔ `Hex`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔
 
 # [ version ]
 
-### __latest is v.3.1.1__
-#### Wait, let me explain.....
-> I have been trying to resolve some mmap issues, they are now resolved.
+### latest threefive version is _v3.1.5_
+
+* __There are no known issues with threefive v3.1.5__
+
+* Average __cyclomatic__ complexity: __A (1.990)__
+
+* Pylint: __9.69/10.0__
+
+* Here's a list of __what's been fixed.__
+
+	* __AacParser__ The typo on the call to __AacParser.not_syncsafe()__ has been fixed.
+   
+	* __Property class__ for __SCTE-35-2 Event Descriptors__ now render __JSON__ correctly.  
 
+	* __threefive is dumping mmap__. The way threefive parses packets seems to make mmap consume a lot of memory _( 3GB with mmap and 170MB without mmap )_. Removing mmap slows pypy3 down a little parsing mpegts _(with mmap 1.9 seconds for 3.3GB of mpegts without 2.5 seconds)_, but actually speeds up python v3.14.2 _(with mmap 11.24 seconds for 3.3GB of mpegts, without 8.9 seconds)_
 
-# [ really really quick start ]
+	* __Segmentation Descriptors without UPIDS__ threefive will no longer throw an exception on SegmentationDescriptors without a UPID if the UPID type is not set to zero, instead threefive will print a warning message and set the type to zero for you.
+
+	* __threefive.xml.Node__ The Node class has been cleaned up, slots now work correctly when calling __Node.addchild(obj,slot=0)__ _(slots allow you to set the index of a child in Node.children when adding a child). New mthod __Node.a2c()__ converts attributes to children. New method __Node.c2a()__ converts children to attributes.__UltraXmlParser__ has been renamed __XmlP__ and moved from threefive/uxp.py to threefive.xml.py. Update your code.
+
+___
+
+# [ a really really quick start ]
 
 * __Install__
 ```
  python3 -m pip install threefive`
 ```
 * __decoding SCTE-35__
-	* __base64__ 
-		* decode __SCTE-35__ as __base64__
+
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q=='
 		```
-		* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
+	* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q==' hex
-		```
- 	* __Hex__
-		* decode __SCTE-35__ as __hex__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9'
-		```
-		* decode __SCTE-35__ as __hex__ and __convert__ __SCTE-35__ to __xml__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9' xml
-		```
-	* __HLS__
-		* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
+	
+	* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
 		```cobol
 		threefive 'https://demo.unified-streaming.com/k8s/live/scte35.isml/.m3u8'
 		```
- 	* __MPEGTS__
-		* decode  __SCTE-35__ from __MPEGTS__
+	* decode  __SCTE-35__ from __MPEGTS__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts'
 		```
-		* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
+	* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts' bytes
 		```
@@ -104,9 +113,8 @@ ___
 
 ##  [Install]
 
-* __threefive__ is curretnly tested on python-3.11, python-3.14, python-3.14t, pypy-7.3.11 and pypy-7.3.22
+* Requires python3 v3.9 or higher.
 
-* __threefive__ is some of the __fastest code__ you'll see on __python3__. 
 * __python3 via pip__
 ```rebol
 python3 -mpip install threefive
@@ -115,11 +123,11 @@ python3 -mpip install threefive
 ```rebol
 pypy3 -mpip install threefive
 ```
-* __To add SRT support__
+* __To add SRT support to threefive install srtfu__
 ```py3
 python3 -m pip install srtfu
 ```
-* __To add Automatic AES decryption__
+* __To add Automatic AES decryption (used to decrypted HLS to threefive install pyaes__
 ```py3
 python3 -mpip install pyaes
 ```
@@ -131,16 +139,29 @@ git clone https://github.com/superkabuki/scte35.git
 cd threefive
 make install
 ```
-* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3
+* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3,
+
 ```rebol
-git clone https://github.com/superkabuki/scte35.git
+git clone https://github.com/superkabuki/threefive.git
 cd threefive
+``
+* `python3` is the default for `make install` 
+
+```
+make install
+```
 
+* setting py3 allows you to install for any type of python interpreter.
+
+```
 make install py3=pypy3
+```
+* absolute paths can also be used.
 
-# OR
+```
+make install py3=/home/a/pypy3/bin/pypy3
+```
 
-make install py3=python3.14
 
 # works for any python in your path or use a full path if needed.
 
@@ -153,9 +174,9 @@ threefive is designed to be easy to use. I'm not sure that it's served well by a
 
 ### The threefive cli tool.
 
- the threefive cli tool decodes SCTE-35, formats are autodetected, and they all work the same way. 
+ the threefive cli tool decodes SCTE-35, formats are auto-detected, and they all work the same way. 
 
-threefive [media to parse for SCTE-35]
+__threefive__ __[media to parse for SCTE-35]__
 
 examples:
 
@@ -180,7 +201,7 @@ threefive video.ts
 threefive https://demo.unified-streaming.com/k8s/live/scte35.isml/scte35-audio_eng=64000-video=500000.m3u8
 ```
 
-* Formats like XML and JSON that may be to large to type on the command line,they can be redirected or piped in to threefive.
+* Formats like ___XML and JSON__ that may be to large to type on the command line,they can be __redirected or piped__ in to threefive.
 
 * redirect
 ```sed
@@ -191,14 +212,14 @@ threefive < xml.xml
 cat json.json | threefive
 
 ```
-### cli outputs and converting SCTE-35 Formats
+### cli outputs and encoding SCTE-35 Formats
 
 * the __default output format for threefive is json__
 
 * The cli tool can convert from one SCTE-35 format to another using keywords.
     * The keywords are __base64,bytes,hex, int,json,xml, and xmlbin__ 
 
-* some conversion examples
+* some converting and encoding examples
 
 
 * SCTE-35 Base64 to SCTE-35 Hex
@@ -663,8 +684,8 @@ ___
 
 #### [web]
 * [threefive SCTE-35 __Online Parser__](https://iodisco.com/scte35) __hosted on my server iodisco.com__
-* Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ Go, Wasm and Super Karate Death Car](https://bigcorp.ltd/gowasm) __hosted om my server bigcorp.ltd__
-*  Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ threefive.js,javascript, and a little sed](https://bigcorp.ltd/bread) just to keep things interesting. __hosted om my server bigcorp.ltd__
+* Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ Go, Wasm and Super Karate Death Car](https://iodisco.com/gowasm) __hosted om my server iodisco.com__
+*  Parse SCTE-35 in MPEGTS over HTTP, in your browser with[ threefive.js,javascript, and a little sed](https://iodisco.com/bread) just to keep things interesting. __hosted om my server iodisco.com__
 * [ SCTE-35 __Online Parser__ powered by threefive](http://www.domus1938.com/scte35parser) _another online parser powered by threefive_ not hosted on my servers.
 * [SCTE-35 __As a Service__](sassy.md) _if you can make an http request, you can parse SCTE-35, no install needed._
 __hosted on my server iodisco.com__

{threefive-3.1.1 → threefive-3.1.5}/pyproject.toml

@@ -1,11 +1,11 @@
 
 [project]
 name = "threefive"
-version = "3.1.1"
+version = "3.1.5"
 authors = [
   { name="AdrianofDoom", email="spam@iodisco.com" },
 ]
-description = "threefive is The #1 SCTE-35 Decoder and Encoder on the Planet."
+description = "The Undisputed Heavyweight Champion of SCTE-35."
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies=[

{threefive-3.1.1 → threefive-3.1.5}/threefive/aac.py

@@ -34,7 +34,7 @@ class AacParser:
         return id3len
 
     @staticmethod
-    def _syncsafe5(somebytes):
+    def not_syncsafe(somebytes):
         """
         _syncsafe5 parses PTS from ID3 tags.
         """
@@ -72,7 +72,7 @@ class AacParser:
         try:
             pts = float(data.split(self.applehead)[1].split(b"\x00", 2)[1])
         except ERR:
-            pts = self._syncsafe5(data.split(self.applehead)[1][:9])
+            pts = self.not_syncsafe(data.split(self.applehead)[1][:9])
         return round((pts % ROLLOVER), 6)
 
     def parse(self, media):

{threefive-3.1.1 → threefive-3.1.5}/threefive/base.py

@@ -117,9 +117,9 @@ class SCTE35Base:
         var_value = self.__dict__[var_name]
         if self._bool_int(var_value, var_type) or self._wrong_type(var_value, var_type):
             self._err2(var_name, var_value, bit_count, var_type)
-            return -1
+            return False
         nbin_method(var_value, bit_count)
-        return 0
+        return True
 
     def get(self):
         """
@@ -163,31 +163,40 @@ class SCTE35Base:
         return json.dumps(self.get(), indent=4)
 
     def _v2v(self, val):
-        if isinstance(val, SCTE35Base):
-            val.kv_clean()
-            print(val)
+        bites = (
+            bytes,
+            bytearray,
+        )
+        if isinstance(val, bites):
+            val = val.decode(errors="ignore")
         if isinstance(val, list):
             val = [self._v2v(v) for v in val]
         if isinstance(val, dict):
             val = {k: self._v2v(v) for k, v in val.items()}
-        if isinstance(
-            val,
-            (
-                bytes,
-                bytearray,
-            ),
-        ):
-            val = val.decode()
+        if isinstance(val, SCTE35Base):
+            val.kv_clean()
+            print(val)
         return val
 
-    def kv_clean(self):
+    def chk_obj(self, obj):
+        """
+        chk_obj set object.
+        if obj is None, return self,
+        else just return obj.
+        """
+        if obj is None:
+            obj = self
+        return obj
+
+    def kv_clean(self, obj=None):
         """
         kv_clean recursively removes items
         from a dict if the value is None.
         """
+        obj = self.chk_obj(obj)
         return {
             k: self._v2v(v)
-            for k, v in vars(self).items()
+            for k, v in vars(obj).items()
             if v
             not in [
                 None,

{threefive-3.1.1 → threefive-3.1.5}/threefive/bitn.py

@@ -36,13 +36,6 @@ class Bitn:
 
     """
 
-    class NegShiftError(Exception):
-        """
-        NegShiftError inner Exception subclass
-        """
-
-        pass
-
     def __init__(self, bites):
         self.idx = len(bites) << 3  # This is correct, int.bit_length() is Not.
         self.bits = int.from_bytes(bites, byteorder="big")
@@ -133,7 +126,7 @@ class Bitn:
             mesg = (
                 f"\n\n\t\t{num_bits} bits requested, but only {self.idx} bits remain.\n"
             )
-            raise self.NegShiftError(mesg)
+            red(mesg)
             return False
         return True
 

{threefive-3.1.1 → threefive-3.1.5}/threefive/cli.py

@@ -138,7 +138,7 @@ def is_pkt(args, rdr, one):
     """
     two = rdr.read(187)
     strm = Stream(sys.stdin.buffer)
-    strm._parse(one + two)  # dont drop first packet
+    strm.parse(one + two)  # dont drop first packet
     strm.decode(func=funk())
     done()  # I keep forgetting why I do this
 
@@ -207,6 +207,7 @@ class MPEGTSMapper:
         iframe_chk show iframes pts
         for a mpegts video.
         """
+        print2(this)
         iframer = IFramer()
         iframer.do(this)
         del iframer
@@ -227,6 +228,7 @@ class MPEGTSMapper:
         """
         pts_chk is used to display PTS.
         """
+        print2(this)
         strm = Stream(this)
         strm.show_pts()
         del strm
@@ -247,6 +249,7 @@ class MPEGTSMapper:
         sidecar_chk checks for the sidecar keyword and
         generates a sidecar file if present.
         """
+        print2(this)
         strm = Stream(this)
         strm.decode(func=mk_sidecar)
         del strm
@@ -256,6 +259,7 @@ class MPEGTSMapper:
         """
         speedo_chk displays parse speed for mpegts streams
         """
+        print2(this)
         strm = Stream(this)
         strm.speed()
         del strm
@@ -269,7 +273,6 @@ class MPEGTSMapper:
             if stdin_is_readable():
                 args.append(sys.stdin.buffer)
             for arg in args:
-                print2(arg)
                 self.mpegts_map[key](arg)
             done()
 
@@ -443,7 +446,7 @@ def chk_hls():
         if b"#EXTM3U" in packet:
             hlscli()
             done()
-    except:
+    except ERR:
         pass
 
 

{threefive-3.1.1 → threefive-3.1.5}/threefive/commands.py

@@ -168,7 +168,7 @@ class TimeSignal(SpliceCommand):
         if self.time_specified_flag:
             nbin.reserve(6)
             if not self.pts_time:
-                return red("pts_time is not set")
+                red("pts_time is not set")
             nbin.add_int(self.as_ticks(self.pts_time), 33)
         else:
             self.pts_time = None

{threefive-3.1.1 → threefive-3.1.5}/threefive/cue.py

@@ -11,8 +11,8 @@ from .crc import crc32
 from .descriptors import splice_descriptor, descriptor_map, SpliceDescriptor
 from .section import SpliceInfoSection
 from .segmentation import table22
-from .stuff import clean, red, isjson, isxml, pif
-from .uxp import xml2cue
+from .stuff import clean, red, isjson, isxml, pif, blue, ERR
+from .xml2scte35 import xml2cue
 from .xml import Node
 
 
@@ -248,7 +248,7 @@ class Cue(SCTE35Base):
         return False
 
     def _bits_precheck(self, data):
-        return self._bits_int(data) | self._bits__bytes_or_str(data)
+        return self._bits_int(data) or self._bits__bytes_or_str(data)
 
     def _bits_decode(self, data):
         """
@@ -382,6 +382,8 @@ class Cue(SCTE35Base):
         """
         nbin = NBin()
         dbite_chunks = [dsptr.encode() for dsptr in self.descriptors]
+        ##        if False in dbite_chunks:
+        ##            return False
         for chunk, dsptr in zip(dbite_chunks, self.descriptors):
             dsptr.descriptor_length = len(chunk)
             nbin.add_int(dsptr.tag, EIGHT)
@@ -476,7 +478,7 @@ class Cue(SCTE35Base):
             self._load_descriptors(data)
         try:
             return self.encode()
-        except:
+        except ERR:
             return False
 
     def load(self, data):
@@ -558,8 +560,7 @@ class Cue(SCTE35Base):
 
     def xml(self, ns="scte35"):
         """
-                xml returns SCTE-35
-                as xml
+        xml return SCTE-35 as xml
 
         example:
                         >>> import threefive