bare-script 3.1.1__tar.gz → 3.2.0__tar.gz

{bare_script-3.1.1/src/bare_script.egg-info → bare_script-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bare-script
-Version: 3.1.1
+Version: 3.2.0
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -21,6 +21,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: schema-markdown>=1.2.0
+Dynamic: license-file
 
 # bare-script
 

{bare_script-3.1.1 → bare_script-3.2.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 3.1.1
+version = 3.2.0
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare_script-3.1.1 → bare_script-3.2.0}/src/bare_script/value.py

@@ -123,6 +123,8 @@ class _JSONEncoder(json.JSONEncoder):
     def default(self, o):
         if isinstance(o, datetime.date):
             return value_string(o)
+        elif callable(o):
+            return value_string(o)
         return None
 
 
@@ -206,6 +208,17 @@ def value_compare(left, right):
             if item_compare != 0:
                 return item_compare
         return -1 if len(left) < len(right) else (0 if len(left) == len(right) else 1)
+    elif isinstance(left, dict) and isinstance(right, dict):
+        left_key_values = sorted(left.items())
+        right_key_values = sorted(right.items())
+        for ix in range(min(len(left_key_values), len(right_key_values))):
+            key_compare = value_compare(left_key_values[ix][0], right_key_values[ix][0])
+            if key_compare != 0:
+                return key_compare
+            val_compare = value_compare(left_key_values[ix][1], right_key_values[ix][1])
+            if val_compare != 0:
+                return val_compare
+        return -1 if len(left_key_values) < len(right_key_values) else (0 if len(left_key_values) == len(right_key_values) else 1)
 
     # Invalid comparison - compare by type name
     type1 = value_type(left) or 'unknown'

{bare_script-3.1.1 → bare_script-3.2.0/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bare-script
-Version: 3.1.1
+Version: 3.2.0
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -21,6 +21,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: schema-markdown>=1.2.0
+Dynamic: license-file
 
 # bare-script