Improve and standardize empty data check for all parsers

changelog.txt

@@ -1,5 +1,8 @@
 jc changelog
 
+20200612 v1.11.6
+- Improve and standardize empty data check for all parsers
+
 20200612 v1.11.5
 - Update airport_s parser to fix error on parsing empty data
 - Update arp parser to fix error on parsing empty data

jc/cli.py

@@ -21,7 +21,7 @@ import jc.appdirs as appdirs
 
 
 class info():
-    version = '1.11.5'
+    version = '1.11.6'
     description = 'jc cli output JSON conversion tool'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'

jc/parsers/airport.py

@@ -55,7 +55,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'airport -I command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -131,6 +131,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
+    if jc.utils.has_data(data):
+
         for line in filter(None, data.splitlines()):
             linedata = line.split(':', maxsplit=1)
             raw_output[linedata[0].strip().lower().replace(' ', '_').replace('.', '_')] = linedata[1].strip()

jc/parsers/airport_s.py

@@ -88,7 +88,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'airport -s command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -173,7 +173,7 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
     cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
         # fix headers
         cleandata[0] = cleandata[0].lower()
         cleandata[0] = cleandata[0].replace('-', '_')

jc/parsers/arp.py

@@ -99,7 +99,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.5'
+    version = '1.6'
     description = 'arp command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -174,7 +174,7 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
     cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
 
         # remove final Entries row if -v was used
         if cleandata[-1].startswith('Entries:'):

jc/parsers/blkid.py

@@ -79,7 +79,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'blkid command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -176,7 +176,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    if list(filter(None, data.splitlines())):
+    if jc.utils.has_data(data):
+
         # if the first field is a device, use normal parsing:
         if data.split(maxsplit=1)[0][-1] == ':':
             linedata = data.splitlines()

jc/parsers/crontab.py

@@ -132,7 +132,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.3'
+    version = '1.4'
     description = 'crontab command and file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -225,7 +225,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         # Clear any commented lines
         for i, line in reversed(list(enumerate(cleandata))):
             if line.strip().startswith('#'):

jc/parsers/crontab_u.py

@@ -133,7 +133,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'crontab file parser with user support'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -226,7 +226,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         # Clear any commented lines
         for i, line in reversed(list(enumerate(cleandata))):
             if line.strip().startswith('#'):

jc/parsers/csv.py

@@ -63,7 +63,7 @@ import csv
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'CSV file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -123,7 +123,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         dialect = None
         try:
             dialect = csv.Sniffer().sniff(data[:1024])

jc/parsers/df.py

@@ -73,7 +73,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.4'
+    version = '1.5'
     description = 'df command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -186,7 +186,8 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()
     raw_output = []
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
+
         # fix headers
         cleandata[0] = cleandata[0].lower()
         cleandata[0] = cleandata[0].replace('-', '_')

jc/parsers/dig.py

@@ -324,7 +324,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'dig command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -574,6 +574,8 @@ def parse(data, raw=False, quiet=False):
     axfr = False
 
     output_entry = {}
+
+    if jc.utils.has_data(data):
         for line in cleandata:
 
             if line.startswith('; <<>> ') and ' axfr ' in line.lower():
@@ -668,6 +670,7 @@ def parse(data, raw=False, quiet=False):
                     raw_output.append(output_entry)
 
         raw_output = list(filter(None, raw_output))
+
     if raw:
         return raw_output
     else:

jc/parsers/dmidecode.py

@@ -102,7 +102,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'dmidecode command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -190,6 +190,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
+    if jc.utils.has_data(data):
+
         data = data.splitlines()
 
         # remove header rows

jc/parsers/du.py

@@ -73,7 +73,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'du command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -137,12 +137,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         cleandata.insert(0, 'size name')
         raw_output = jc.parsers.universal.simple_table_parse(cleandata)
 

jc/parsers/env.py

@@ -52,7 +52,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'env command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -116,12 +116,10 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
 
         for entry in cleandata:
             parsed_line = entry.split('=', maxsplit=1)

jc/parsers/file.py

@@ -48,7 +48,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'file command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -104,6 +104,9 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
 
     warned = False
+
+    if jc.utils.has_data(data):
+
         for line in filter(None, data.splitlines()):
             linedata = line.rsplit(': ', maxsplit=1)
 

jc/parsers/foo.py

@@ -78,6 +78,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
+    if jc.utils.has_data(data):
+
         for line in filter(None, data.splitlines()):
             # parse the content
             pass

jc/parsers/free.py

@@ -53,7 +53,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'free command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -124,7 +124,8 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()
     raw_output = []
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         cleandata[0] = cleandata[0].lower()
         cleandata[0] = cleandata[0].replace('buff/cache', 'buff_cache')
         cleandata[0] = 'type ' + cleandata[0]

jc/parsers/fstab.py

@@ -70,7 +70,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'fstab file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -141,7 +141,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         for line in cleandata:
             output_line = {}
             # ignore commented lines

jc/parsers/group.py

@@ -94,7 +94,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/group file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -169,7 +169,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         for entry in cleandata:
             if entry.startswith('#'):
                 continue

jc/parsers/gshadow.py

@@ -60,7 +60,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/gshadow file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -131,7 +131,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         for entry in cleandata:
             if entry.startswith('#'):
                 continue

jc/parsers/history.py

@@ -44,7 +44,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'history command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -108,6 +108,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
+    if jc.utils.has_data(data):
+
         # split lines and clear out any non-ascii chars
         linedata = data.encode('ascii', errors='ignore').decode().splitlines()
 

jc/parsers/hosts.py

@@ -61,7 +61,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = '/etc/hosts file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -117,12 +117,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for line in cleandata:
             output_line = {}
             # ignore commented lines

jc/parsers/id.py

@@ -70,7 +70,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'id command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -166,12 +166,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = {}
-    cleandata = data.split()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.split()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for section in cleandata:
             if section.startswith('uid'):
                 uid_parsed = section.replace('(', '=').replace(')', '=')

jc/parsers/ifconfig.py

@@ -147,7 +147,7 @@ import jc.utils
 
 
 class info():
-    version = '1.7'
+    version = '1.8'
     description = 'ifconfig command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -475,6 +475,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
+    if jc.utils.has_data(data):
+
         parsed = IfconfigParser(console_output=data)
         interfaces = parsed.get_interfaces()
 

jc/parsers/ini.py

@@ -47,7 +47,7 @@ import configparser
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'INI file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -101,7 +101,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
-    if data:
+    if jc.utils.has_data(data):
+
         ini = configparser.ConfigParser()
         ini.read_string(data)
         raw_output = {s: dict(ini.items(s)) for s in ini.sections()}

jc/parsers/iptables.py

@@ -134,7 +134,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'iptables command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -245,6 +245,8 @@ def parse(data, raw=False, quiet=False):
 
     cleandata = data.splitlines()
 
+    if jc.utils.has_data(data):
+
         for line in cleandata:
 
             if line.startswith('Chain'):

jc/parsers/jobs.py

@@ -77,7 +77,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'jobs command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -144,12 +144,10 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
 
         for entry in cleandata:
             output_line = {}

jc/parsers/last.py

@@ -72,7 +72,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'last and lastb command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -149,12 +149,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for entry in cleandata:
             output_line = {}
 

jc/parsers/ls.py

@@ -149,7 +149,7 @@ import jc.utils
 
 
 class info():
-    version = '1.5'
+    version = '1.6'
     description = 'ls command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -226,7 +226,8 @@ def parse(data, raw=False, quiet=False):
 
     linedata = data.splitlines()
 
-    if linedata:
+    if jc.utils.has_data(data):
+
         # Delete first line if it starts with 'total 1234'
         if re.match(r'total [0-9]+', linedata[0]):
             linedata.pop(0)

jc/parsers/lsblk.py

@@ -216,7 +216,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.4'
+    version = '1.5'
     description = 'lsblk command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -327,12 +327,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         cleandata = data.splitlines()
 
         cleandata[0] = cleandata[0].lower()

jc/parsers/lsmod.py

@@ -107,7 +107,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'lsmod command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -177,7 +177,8 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()
     raw_output = []
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
+
         cleandata[0] = cleandata[0].lower()
 
         raw_output = jc.parsers.universal.simple_table_parse(cleandata)

jc/parsers/lsof.py

@@ -97,7 +97,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'lsof command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -169,12 +169,11 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         cleandata[0] = cleandata[0].lower()
         cleandata[0] = cleandata[0].replace('/', '_')
 

jc/parsers/mount.py

@@ -56,7 +56,7 @@ import jc.utils
 
 
 class info():
-    version = '1.4'
+    version = '1.5'
     description = 'mount command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -158,13 +158,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         # check for OSX output
         if ' type ' not in cleandata[0]:
             raw_output = osx_parse(cleandata)

jc/parsers/netstat.py

@@ -247,7 +247,7 @@ Examples:
 
 
 class info():
-    version = '1.7'
+    version = '1.8'
     description = 'netstat command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -431,11 +431,11 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    cleandata = data.splitlines()
+    cleandata = list(filter(None, data.splitlines()))
-    cleandata = list(filter(None, cleandata))
     raw_output = []
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         # check for FreeBSD/OSX vs Linux
         # is this from FreeBSD/OSX?
         if cleandata[0] == 'Active Internet connections' \

jc/parsers/ntpq.py

@@ -183,7 +183,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'ntpq -p command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -271,7 +271,8 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()
     raw_output = []
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
+
         cleandata[0] = 's ' + cleandata[0]
         cleandata[0] = cleandata[0].lower()
 

jc/parsers/passwd.py

@@ -78,7 +78,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/passwd file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -146,12 +146,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for entry in cleandata:
             if entry.startswith('#'):
                 continue

jc/parsers/pip_list.py

@@ -32,7 +32,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'pip list command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -88,12 +88,11 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         # detect legacy output type
         if ' (' in cleandata[0]:
             for row in cleandata:

jc/parsers/pip_show.py

@@ -42,7 +42,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'pip show command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -107,12 +107,11 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
     package = {}
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for row in cleandata:
             if row.startswith('---'):
                 raw_output.append(package)

jc/parsers/ps.py

@@ -177,7 +177,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'ps command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -284,9 +284,9 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()
     raw_output = []
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
-        cleandata[0] = cleandata[0].lower()
 
+        cleandata[0] = cleandata[0].lower()
         raw_output = jc.parsers.universal.simple_table_parse(cleandata)
 
     if raw:

jc/parsers/route.py

@@ -84,7 +84,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'route command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -184,9 +184,9 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()[1:]
     raw_output = []
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
-        cleandata[0] = cleandata[0].lower()
 
+        cleandata[0] = cleandata[0].lower()
         raw_output = jc.parsers.universal.simple_table_parse(cleandata)
 
     if raw:

jc/parsers/shadow.py

@@ -84,7 +84,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/shadow file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -153,12 +153,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for entry in cleandata:
             if entry.startswith('#'):
                 continue

jc/parsers/ss.py

@@ -251,7 +251,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'ss command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -342,12 +342,12 @@ def parse(data, raw=False, quiet=False):
 
     contains_colon = ['nl', 'p_raw', 'raw', 'udp', 'tcp', 'v_str', 'icmp6']
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         header_text = cleandata[0].lower()
         header_text = header_text.replace('netidstate', 'netid state')
         header_text = header_text.replace('local address:port', 'local_address local_port')

jc/parsers/stat.py

@@ -105,7 +105,7 @@ import jc.utils
 
 
 class info():
-    version = '1.4'
+    version = '1.5'
     description = 'stat command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -197,12 +197,11 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
 
         # linux output
         if cleandata[0].startswith('  File: '):

jc/parsers/systemctl.py

@@ -40,7 +40,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'systemctl command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -96,12 +96,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
     # Clear any blank lines
-    linedata = list(filter(None, linedata))
+    linedata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    if linedata:
+    if jc.utils.has_data(data):
+
         # clean up non-ascii characters, if any
         cleandata = []
         for entry in linedata:

jc/parsers/systemctl_lj.py

@@ -59,7 +59,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'systemctl list-jobs command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -122,12 +122,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
     # Clear any blank lines
-    linedata = list(filter(None, linedata))
+    linedata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    if linedata:
+    if jc.utils.has_data(data):
+
         cleandata = []
 
         # clean up non-ascii characters, if any

jc/parsers/systemctl_ls.py

@@ -34,7 +34,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'systemctl list-sockets command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -88,12 +88,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
     # Clear any blank lines
-    linedata = list(filter(None, linedata))
+    linedata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    if linedata:
+    if jc.utils.has_data(data):
+
         cleandata = []
         # clean up non-ascii characters, if any
         for entry in linedata:

jc/parsers/systemctl_luf.py

@@ -31,7 +31,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'systemctl list-unit-files command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -84,12 +84,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
     # Clear any blank lines
-    linedata = list(filter(None, linedata))
+    linedata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    if linedata:
+    if jc.utils.has_data(data):
+
         cleandata = []
         # clean up non-ascii characters, if any
         for entry in linedata:

jc/parsers/timedatectl.py

@@ -38,7 +38,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'timedatectl status command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -109,6 +109,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
+    if jc.utils.has_data(data):
+
         for line in filter(None, data.splitlines()):
             linedata = line.split(':', maxsplit=1)
             raw_output[linedata[0].strip().lower().replace(' ', '_')] = linedata[1].strip()

jc/parsers/uname.py

@@ -30,7 +30,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'uname -a command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -88,9 +88,9 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = {}
-    split_line = data.split()
 
-    if len(split_line) > 1:
+    if jc.utils.has_data(data):
+
         # check for OSX output
         if data.startswith('Darwin'):
             parsed_line = data.split()

jc/parsers/uptime.py

@@ -34,7 +34,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'uptime command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -109,7 +109,8 @@ def parse(data, raw=False, quiet=False):
     raw_output = {}
     cleandata = data.splitlines()
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
+
         parsed_line = cleandata[0].split()
 
         # allow space for odd times

jc/parsers/w.py

@@ -83,7 +83,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'w command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -151,7 +151,8 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()[1:]
     raw_output = []
 
-    if list(filter(None, cleandata)):
+    if jc.utils.has_data(data):
+
         header_text = cleandata[0].lower()
         # fixup for 'from' column that can be blank
         from_col = header_text.find('from')

jc/parsers/who.py

@@ -103,7 +103,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'who command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -174,12 +174,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for line in cleandata:
             output_line = {}
             linedata = line.split()

jc/parsers/xml.py

@@ -59,7 +59,7 @@ import xmltodict
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'XML file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -113,7 +113,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    if list(filter(None, data.splitlines())):
+    if jc.utils.has_data(data):
+
         raw_output = xmltodict.parse(data)
 
     if raw:

jc/parsers/yaml.py

@@ -71,7 +71,7 @@ from ruamel.yaml import YAML
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'YAML file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -126,6 +126,9 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
+
+    if jc.utils.has_data(data):
+
         yaml = YAML(typ='safe')
 
         for document in yaml.load_all(data):

jc/utils.py

@@ -67,3 +67,7 @@ def compatibility(mod_name, compatible):
         mod = mod_name.split('.')[-1]
         compat_list = ', '.join(compatible)
         warning_message(f'{mod} parser not compatible with your OS ({sys.platform}).\n         Compatible platforms: {compat_list}')
+
+
+def has_data(data):
+    return True if data and not data.isspace() else False

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
 
 setuptools.setup(
     name='jc',
-    version='1.11.5',
+    version='1.11.6',
     author='Kelly Brazil',
     author_email='kellyjonbrazil@gmail.com',
     description='Converts the output of popular command-line tools and file-types to JSON.',