use jc.utils.input_type_check() and simplify compatibility check

jc/parsers/acpi.py

@@ -302,8 +302,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     output_line = {}

jc/parsers/airport.py

@@ -130,8 +130,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/airport_s.py

@@ -166,8 +166,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = list(filter(None, data.splitlines()))

jc/parsers/arp.py

@@ -171,8 +171,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = list(filter(None, data.splitlines()))

jc/parsers/blkid.py

@@ -176,8 +176,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/cksum.py

@@ -103,8 +103,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/crontab.py

@@ -225,8 +225,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
     cleandata = data.splitlines()

jc/parsers/crontab_u.py

@@ -220,8 +220,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
     cleandata = data.splitlines()

jc/parsers/csv.py

@@ -119,8 +119,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = data.splitlines()

jc/parsers/date.py

@@ -115,8 +115,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/df.py

@@ -203,9 +203,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()
     fix_data = []

jc/parsers/dig.py

@@ -528,9 +528,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = data.splitlines()

jc/parsers/dir.py

@@ -173,8 +173,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/dmidecode.py

@@ -177,8 +177,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     item_header = False
     item_values = False

jc/parsers/dpkg_l.py

@@ -217,8 +217,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     working_list = []
     raw_output = []

jc/parsers/du.py

@@ -137,8 +137,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/env.py

@@ -121,8 +121,8 @@ def parse(data, raw=False, quiet=False):
         Dictionary of raw structured data or
         List of Dictionaries of processed structured data
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/file.py

@@ -106,8 +106,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/finger.py

@@ -168,8 +168,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/foo.py

@@ -86,8 +86,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/free.py

@@ -122,8 +122,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()
     raw_output = []

jc/parsers/fstab.py

@@ -132,8 +132,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = data.splitlines()

jc/parsers/group.py

@@ -160,8 +160,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = data.splitlines()

jc/parsers/gshadow.py

@@ -126,8 +126,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     cleandata = data.splitlines()

jc/parsers/hash.py

@@ -85,8 +85,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()
     raw_output = []

jc/parsers/hashsum.py

@@ -113,8 +113,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/hciconfig.py

@@ -372,8 +372,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     device_object = {}

jc/parsers/history.py

@@ -109,8 +109,8 @@ def parse(data, raw=False, quiet=False):
         Dictionary of raw structured data or
         List of Dictionaries of processed structured data
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/hosts.py

@@ -117,8 +117,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/id.py

@@ -161,8 +161,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/ifconfig.py

@@ -474,8 +474,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/ini.py

@@ -125,8 +125,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary representing the ini file
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/iptables.py

@@ -240,8 +240,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     chain = {}

jc/parsers/iw_scan.py

@@ -293,8 +293,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     section = {}

jc/parsers/jobs.py

@@ -141,8 +141,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/last.py

@@ -185,8 +185,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/ls.py

@@ -162,8 +162,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     warned = False

jc/parsers/lsblk.py

@@ -321,8 +321,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     # Clear any blank lines
     cleandata = list(filter(None, data.splitlines()))

jc/parsers/lsmod.py

@@ -174,8 +174,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()
     raw_output = []

jc/parsers/lsof.py

@@ -168,8 +168,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/lsusb.py

@@ -815,8 +815,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     lsusb = _LsUsb()
 

jc/parsers/mount.py

@@ -163,8 +163,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     # Clear any blank lines
     cleandata = list(filter(None, data.splitlines()))

jc/parsers/netstat.py

@@ -424,8 +424,8 @@ def parse(data, raw=False, quiet=False):
         List of Dictionaries. Raw or processed structured data.
     """
     import jc.utils
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = list(filter(None, data.splitlines()))
     raw_output = []

jc/parsers/ntpq.py

@@ -264,8 +264,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()
     raw_output = []

jc/parsers/passwd.py

@@ -142,8 +142,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/ping.py

@@ -616,8 +616,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/pip_list.py

@@ -91,8 +91,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/pip_show.py

@@ -108,8 +108,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     package = {}

jc/parsers/ps.py

@@ -276,8 +276,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()
     raw_output = []

jc/parsers/route.py

@@ -180,8 +180,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()[1:]
 

jc/parsers/rpm_qi.py

@@ -216,8 +216,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     entry_obj = {}

jc/parsers/sfdisk.py

@@ -265,8 +265,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     item = {}

jc/parsers/shadow.py

@@ -149,8 +149,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/ss.py

@@ -337,8 +337,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     contains_colon = ['nl', 'p_raw', 'raw', 'udp', 'tcp', 'v_str', 'icmp6']
     raw_output = []

jc/parsers/stat.py

@@ -229,8 +229,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/sysctl.py

@@ -105,8 +105,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/systemctl.py

@@ -101,8 +101,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     # Clear any blank lines
     linedata = list(filter(None, data.splitlines()))

jc/parsers/systemctl_lj.py

@@ -123,8 +123,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     # Clear any blank lines
     linedata = list(filter(None, data.splitlines()))

jc/parsers/systemctl_ls.py

@@ -93,8 +93,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     # Clear any blank lines
     linedata = list(filter(None, data.splitlines()))

jc/parsers/systemctl_luf.py

@@ -89,8 +89,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     # Clear any blank lines
     linedata = list(filter(None, data.splitlines()))

jc/parsers/systeminfo.py

@@ -303,8 +303,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     delim = ":"  # k/v delimiter
     raw_data = {}  # intermediary output

jc/parsers/time.py

@@ -198,8 +198,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/timedatectl.py

@@ -116,8 +116,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/tracepath.py

@@ -192,8 +192,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     RE_TTL_HOST = re.compile(r'^\s?(?P<ttl>\d+)(?P<ttl_guess>\??):\s+(?P<host>(?:no reply|\S+))')  # groups: ttl, ttl_guess, host
     RE_PMTU = re.compile(r'\spmtu\s(?P<pmtu>[\d]+)')          # group: pmtu

jc/parsers/traceroute.py

@@ -368,8 +368,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/ufw.py

@@ -394,8 +394,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
     rules_list = []

jc/parsers/ufw_appinfo.py

@@ -265,8 +265,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     item_obj = {}

jc/parsers/uname.py

@@ -91,8 +91,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
 

jc/parsers/upower.py

@@ -323,8 +323,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     device_obj = {}

jc/parsers/uptime.py

@@ -155,8 +155,8 @@ def parse(data, raw=False, quiet=False):
 
         Dictionary. Raw or processed structured data
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = {}
     cleandata = data.splitlines()

jc/parsers/vmstat.py

@@ -181,8 +181,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
     output_line = {}

jc/parsers/w.py

@@ -153,8 +153,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     cleandata = data.splitlines()[1:]
     raw_output = []

jc/parsers/wc.py

@@ -103,8 +103,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/who.py

@@ -186,8 +186,8 @@ def parse(data, raw=False, quiet=False):
 
         List of Dictionaries. Raw or processed structured data.
     """
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/xml.py

@@ -121,8 +121,8 @@ def parse(data, raw=False, quiet=False):
     except Exception:
         raise LibraryNotInstalled('The xmltodict library is not installed.')
 
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/parsers/yaml.py

@@ -135,8 +135,8 @@ def parse(data, raw=False, quiet=False):
     except Exception:
         raise LibraryNotInstalled('The ruamel.yaml library is not installed.')
 
-    if not quiet: jc.utils.compatibility(__name__, info.compatible)
-    if not isinstance(data, str): raise TypeError("Input data must be a 'str' object.")
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
 
     raw_output = []
 

jc/utils.py

@@ -75,7 +75,7 @@ def error_message(message_lines):
         print(message, file=sys.stderr)
 
 
-def compatibility(mod_name, compatible):
+def compatibility(mod_name, compatible, quiet=False):
     """Checks for the parser's compatibility with the running OS platform.
 
     Parameters:
@@ -86,10 +86,13 @@ def compatibility(mod_name, compatible):
                         compatible options:
                         linux, darwin, cygwin, win32, aix, freebsd
 
+        quiet:          (bool) supress compatibility message if True
+
     Returns:
 
         None - just prints output to STDERR
     """
+    if not quiet:
         platform_found = False
 
         for platform in compatible:
@@ -235,6 +238,21 @@ def stream_error(e, ignore_exceptions, line):
     }
 
 
+def input_type_check(data):
+    if not isinstance(data, str):
+        raise TypeError("Input data must be a 'str' object.")
+
+
+def streaming_input_type_check(data):
+    if not hasattr(data, '__iter__') or isinstance(data, (str, bytes)):
+        raise TypeError("Input data must be a non-string iterable object.")
+
+
+def streaming_line_input_type_check(line):
+    if not isinstance(line, str):
+        raise TypeError("Input line must be a 'str' object.")
+
+
 class timestamp:
     """
     Input a date-time text string of several formats and convert to a naive or timezone-aware epoch timestamp in UTC