python-ubercode-utils 1.0.10__tar.gz → 2.0.0__tar.gz

{python-ubercode-utils-1.0.10/python_ubercode_utils.egg-info → python-ubercode-utils-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ubercode-utils
-Version: 1.0.10
+Version: 2.0.0
 Summary: Core python utilities for all apps
 Home-page: https://github.com/sstacha/python-ubercode-utils
 Author: Steve Stacha

{python-ubercode-utils-1.0.10 → python-ubercode-utils-2.0.0/python_ubercode_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ubercode-utils
-Version: 1.0.10
+Version: 2.0.0
 Summary: Core python utilities for all apps
 Home-page: https://github.com/sstacha/python-ubercode-utils
 Author: Steve Stacha

{python-ubercode-utils-1.0.10 → python-ubercode-utils-2.0.0}/setup.py

@@ -4,7 +4,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(name='python-ubercode-utils',
-      version='1.0.10',
+      version='2.0.0',
       description='Core python utilities for all apps',
       long_description=long_description,
       long_description_content_type="text/markdown",

{python-ubercode-utils-1.0.10 → python-ubercode-utils-2.0.0}/test/test_data.py

@@ -49,12 +49,10 @@ class TestJSON(unittest.TestCase):
 """
         # test we can construct from a json string
         json = JSON(json_string=json_string)
-        self.assertEqual(len(json.json_dict['people']), 3)
+        self.assertEqual(len(json.data['people']), 3)
         # test we can construct by chaining and reading file
         json2 = JSON().from_json_file(str(file_path))
-        self.assertEqual(json.json_dict, json2.json_dict)
-        # test the dict matches the to_dict() result
-        self.assertEqual(json.json_dict, json.to_dict())
+        self.assertEqual(json.data, json2.data)
         # test encoding
         json_string = """
 {
@@ -92,11 +90,11 @@ class TestJSON(unittest.TestCase):
 }
 """
         json = JSON(json_string=json_string, encode_ampersands=True)
-        self.assertEqual(len(json.json_dict['people']), 3)
-        first_name = json.to_dict()['people'][0]['firstName']
+        self.assertEqual(len(json.data['people']), 3)
+        first_name = json.data['people'][0]['firstName']
         self.assertEqual(first_name, "Joe & Baker")
         #  make sure the second name isn't double encoded
-        second_name = json.to_dict()['people'][1]['firstName']
+        second_name = json.data['people'][1]['firstName']
         self.assertEqual(second_name, "James &")
         # test the str function
         result = "{'people': [{'firstName': 'Joe & Baker', 'lastName': 'Jackson', 'gender': 'male', 'age': 28, 'number': '7349282382', 'groups': ['members', 'student']}, {'firstName': 'James &', 'lastName': 'Smith', 'gender': 'male', 'age': 32, 'number': '5678568567', 'groups': ['members', 'professional']}, {'firstName': 'Emily', 'lastName': 'Jones', 'gender': 'female', 'age': 24, 'number': '456754675'}]}"

{python-ubercode-utils-1.0.10 → python-ubercode-utils-2.0.0}/ubercode/utils/convert.py

@@ -250,3 +250,31 @@ def to_mask(value: str or None) -> str or None:
         _mask += value[-_iqtr:]
     return _mask
 
+def obj_to_str(obj, property_filter_list=None):
+    """
+    Mostly used for debugging.  Very useful to print the properties of an object on a line; condensing reasonably
+
+    :param obj: the object to inspect properties for
+    :param property_filter_list: any property names we want to omit
+    :return: a string containing the outputted properties
+    """
+    attbuf = ""
+    for key, value in vars(obj).items():
+        if property_filter_list and key in property_filter_list:
+            continue
+        if not key.startswith('__'):
+            if len(attbuf) > 0:
+                attbuf += ", "
+            # show the first 50 chars and last 25 chars
+            this_content = str(value)
+            this_content = this_content.replace('\n', ' ').replace('\r', '').strip()
+            if this_content:
+                if len(this_content) > 150:
+                    attbuf += str(key) + ": [" + this_content[0:25] + " ... " + this_content[
+                                                                                len(this_content) - 25:len(
+                                                                                    this_content)] + "]"
+                else:
+                    attbuf += str(key) + ": " + this_content or ""
+            else:
+                attbuf += str(key) + ": " + this_content or ""
+    return "[" + attbuf + "]"

{python-ubercode-utils-1.0.10 → python-ubercode-utils-2.0.0}/ubercode/utils/data.py

@@ -11,10 +11,9 @@ from collections import defaultdict
 
 class JSON:
     """ simple json class to encapsulate basic json operations """
-    # the base implementation will be dict
-    json_dict = {}
-
     def __init__(self, json_string: str or None = None, encode_ampersands: bool = False):
+        # data is core python objects (list, dict, object, etc) from the core python JSON.loads
+        self.data = None
         self.encode_ampersands = encode_ampersands
         self.from_json_string(json_string)
 
@@ -28,7 +27,7 @@ class JSON:
             if self.encode_ampersands:
                 regex = re.compile(r"&(?!amp;|lt;|gt;)")
                 json_string = regex.sub("&", json_string)
-            self.json_dict = json.loads(json_string)
+            self.data = json.loads(json_string)
         return self
 
     def from_json_file(self, json_file_path: str):
@@ -43,26 +42,18 @@ class JSON:
             if self.encode_ampersands:
                 regex = re.compile(r"&(?!amp;|lt;|gt;)")
                 json_string = regex.sub("&", json_string)
-            self.json_dict = json.loads(json_string)
+            self.data = json.loads(json_string)
         return self
 
-    def to_dict(self) -> dict:
-        """
-        output to dict
-        :return: dict
-        """
-        return self.json_dict
-
     def __str__(self):
-        return str(self.json_dict)
+        return str(self.data)
 
 
 class XML:
-    """ simple xml class to encapsulate basic xml operations """
-    # the base implementation will be Etree from the base python lib
-    xml_tree = None
-
+    """ simple xml class to encapsulate basic xml operations using build in python ETree """
     def __init__(self, xml_string: str or None = None, encode_ampersands: bool = False):
+        # data is core python ElementTree object
+        self.data = None
         self.encode_ampersands = encode_ampersands
         self.from_xml_string(xml_string)
 
@@ -76,7 +67,7 @@ class XML:
             if self.encode_ampersands:
                 regex = re.compile(r"&(?!amp;|lt;|gt;)")
                 xml_string = regex.sub("&", xml_string)
-            self.xml_tree = Etree.fromstring(xml_string)
+            self.data = Etree.fromstring(xml_string)
         return self
 
     def from_xml_file(self, xml_file_path: str):
@@ -96,7 +87,7 @@ class XML:
         else:
             tree = Etree.parse(xml_file_path)
             tree = tree.getroot()
-        self.xml_tree = tree
+        self.data = tree
         return self
 
     def to_dict(self) -> dict:
@@ -104,10 +95,10 @@ class XML:
         output to dict
         :return: dict
         """
-        return XML.tree_to_dict(self.xml_tree)
+        return XML.tree_to_dict(self.data)
 
     @staticmethod
-    def tree_to_dict(t) -> dict:
+    def tree_to_dict(t: Etree) -> dict:
         """
         Convert an etree structure to a dictionary of values
         :param t: etree instance
@@ -133,6 +124,6 @@ class XML:
         return d
 
     def __str__(self):
-        if self.xml_tree:
-            return Etree.tostring(self.xml_tree, encoding='unicode')
+        if self.data:
+            return Etree.tostring(self.data, encoding='unicode')
         return ""