Update data.py

Author: vmalaviya-splunk

splunklib/data.py

@@ -12,16 +12,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-"""The **splunklib.data** module reads the responses from splunkd in Atom Feed 
+"""The **splunklib.data** module reads the responses from splunkd in Atom Feed
 format, which is the format used by most of the REST API.
 """
 
-from __future__ import absolute_import
-import sys
 from xml.etree.ElementTree import XML
-from splunklib import six
 
-__all__ = ["load"]
+__all__ = ["load", "record"]
 
 # LNAME refers to element names without namespaces; XNAME is the same
 # name, but with an XML namespace.
@@ -36,33 +33,41 @@
 XNAME_KEY = XNAMEF_REST % LNAME_KEY
 XNAME_LIST = XNAMEF_REST % LNAME_LIST
 
+
 # Some responses don't use namespaces (eg: search/parse) so we look for
 # both the extended and local versions of the following names.
 
+
 def isdict(name):
-    return name == XNAME_DICT or name == LNAME_DICT
+    return name in (XNAME_DICT, LNAME_DICT)
+
 
 def isitem(name):
-    return name == XNAME_ITEM or name == LNAME_ITEM
+    return name in (XNAME_ITEM, LNAME_ITEM)
+
 
 def iskey(name):
-    return name == XNAME_KEY or name == LNAME_KEY
+    return name in (XNAME_KEY, LNAME_KEY)
+
 
 def islist(name):
-    return name == XNAME_LIST or name == LNAME_LIST
+    return name in (XNAME_LIST, LNAME_LIST)
+
 
 def hasattrs(element):
     return len(element.attrib) > 0
 
+
 def localname(xname):
     rcurly = xname.find('}')
-    return xname if rcurly == -1 else xname[rcurly+1:]
+    return xname if rcurly == -1 else xname[rcurly + 1:]
+
 
 def load(text, match=None):
-    """This function reads a string that contains the XML of an Atom Feed, then 
-    returns the 
-    data in a native Python structure (a ``dict`` or ``list``). If you also 
-    provide a tag name or path to match, only the matching sub-elements are 
+    """This function reads a string that contains the XML of an Atom Feed, then
+    returns the
+    data in a native Python structure (a ``dict`` or ``list``). If you also
+    provide a tag name or path to match, only the matching sub-elements are
     loaded.
 
     :param text: The XML text to load.
@@ -78,30 +83,28 @@ def load(text, match=None):
         'names': {}
     }
 
-    # Convert to unicode encoding in only python 2 for xml parser
-    if(sys.version_info < (3, 0, 0) and isinstance(text, unicode)):
-        text = text.encode('utf-8')
-
     root = XML(text)
     items = [root] if match is None else root.findall(match)
     count = len(items)
-    if count == 0: 
+    if count == 0:
         return None
-    elif count == 1: 
+    elif count == 1:
         return load_root(items[0], nametable)
     else:
         return [load_root(item, nametable) for item in items]
 
+
 # Load the attributes of the given element.
 def load_attrs(element):
     if not hasattrs(element): return None
     attrs = record()
-    for key, value in six.iteritems(element.attrib): 
+    for key, value in list(element.attrib.items()):
         attrs[key] = value
     return attrs
 
+
 # Parse a <dict> element and return a Python dict
-def load_dict(element, nametable = None):
+def load_dict(element, nametable=None):
     value = record()
     children = list(element)
     for child in children:
@@ -110,6 +113,7 @@ def load_dict(element, nametable = None):
         value[name] = load_value(child, nametable)
     return value
 
+
 # Loads the given elements attrs & value into single merged dict.
 def load_elem(element, nametable=None):
     name = localname(element.tag)
@@ -118,12 +122,12 @@ def load_elem(element, nametable=None):
     if attrs is None: return name, value
     if value is None: return name, attrs
     # If value is simple, merge into attrs dict using special key
-    if isinstance(value, six.string_types):
+    if isinstance(value, str):
         attrs["$text"] = value
         return name, attrs
     # Both attrs & value are complex, so merge the two dicts, resolving collisions.
     collision_keys = []
-    for key, val in six.iteritems(attrs):
+    for key, val in list(attrs.items()):
         if key in value and key in collision_keys:
             value[key].append(val)
         elif key in value and key not in collision_keys:
@@ -133,6 +137,7 @@ def load_elem(element, nametable=None):
             value[key] = val
     return name, value
 
+
 # Parse a <list> element and return a Python list
 def load_list(element, nametable=None):
     assert islist(element.tag)
@@ -143,6 +148,7 @@ def load_list(element, nametable=None):
         value.append(load_value(child, nametable))
     return value
 
+
 # Load the given root element.
 def load_root(element, nametable=None):
     tag = element.tag
@@ -151,6 +157,7 @@ def load_root(element, nametable=None):
     k, v = load_elem(element, nametable)
     return Record.fromkv(k, v)
 
+
 # Load the children of the given element.
 def load_value(element, nametable=None):
     children = list(element)
@@ -159,7 +166,7 @@ def load_value(element, nametable=None):
     # No children, assume a simple text value
     if count == 0:
         text = element.text
-        if text is None: 
+        if text is None:
             return None
 
         if len(text.strip()) == 0:
@@ -179,31 +186,32 @@ def load_value(element, nametable=None):
         # If we have seen this name before, promote the value to a list
         if name in value:
             current = value[name]
-            if not isinstance(current, list): 
+            if not isinstance(current, list):
                 value[name] = [current]
             value[name].append(item)
         else:
             value[name] = item
 
     return value
 
+
 # A generic utility that enables "dot" access to dicts
 class Record(dict):
-    """This generic utility class enables dot access to members of a Python 
+    """This generic utility class enables dot access to members of a Python
     dictionary.
 
-    Any key that is also a valid Python identifier can be retrieved as a field. 
-    So, for an instance of ``Record`` called ``r``, ``r.key`` is equivalent to 
-    ``r['key']``. A key such as ``invalid-key`` or ``invalid.key`` cannot be 
-    retrieved as a field, because ``-`` and ``.`` are not allowed in 
+    Any key that is also a valid Python identifier can be retrieved as a field.
+    So, for an instance of ``Record`` called ``r``, ``r.key`` is equivalent to
+    ``r['key']``. A key such as ``invalid-key`` or ``invalid.key`` cannot be
+    retrieved as a field, because ``-`` and ``.`` are not allowed in
     identifiers.
 
-    Keys of the form ``a.b.c`` are very natural to write in Python as fields. If 
-    a group of keys shares a prefix ending in ``.``, you can retrieve keys as a 
+    Keys of the form ``a.b.c`` are very natural to write in Python as fields. If
+    a group of keys shares a prefix ending in ``.``, you can retrieve keys as a
     nested dictionary by calling only the prefix. For example, if ``r`` contains
     keys ``'foo'``, ``'bar.baz'``, and ``'bar.qux'``, ``r.bar`` returns a record
-    with the keys ``baz`` and ``qux``. If a key contains multiple ``.``, each 
-    one is placed into a nested dictionary, so you can write ``r.bar.qux`` or 
+    with the keys ``baz`` and ``qux``. If a key contains multiple ``.``, each
+    one is placed into a nested dictionary, so you can write ``r.bar.qux`` or
     ``r['bar.qux']`` interchangeably.
     """
     sep = '.'
@@ -215,7 +223,7 @@ def __call__(self, *args):
     def __getattr__(self, name):
         try:
             return self[name]
-        except KeyError: 
+        except KeyError:
             raise AttributeError(name)
 
     def __delattr__(self, name):
@@ -235,7 +243,7 @@ def __getitem__(self, key):
             return dict.__getitem__(self, key)
         key += self.sep
         result = record()
-        for k,v in six.iteritems(self):
+        for k, v in list(self.items()):
             if not k.startswith(key):
                 continue
             suffix = k[len(key):]
@@ -250,17 +258,16 @@ def __getitem__(self, key):
             else:
                 result[suffix] = v
         if len(result) == 0:
-            raise KeyError("No key or prefix: %s" % key)
+            raise KeyError(f"No key or prefix: {key}")
         return result
-    
 
-def record(value=None): 
-    """This function returns a :class:`Record` instance constructed with an 
+
+def record(value=None):
+    """This function returns a :class:`Record` instance constructed with an
     initial value that you provide.
-    
-    :param `value`: An initial record value.
-    :type `value`: ``dict``
+
+    :param value: An initial record value.
+    :type value: ``dict``
     """
     if value is None: value = {}
     return Record(value)
-