fixed string parsing errors, bumped version

Author: kip-hart

CHANGELOG.rst

@@ -6,10 +6,11 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
-`Unreleased`_
+`1.4.6`_ - 2021-02-07
 --------------------------
 Fixed
 '''''''
+- String parsing errors.
 - Logo example failing on ReadTheDocs.
 - 3D gmsh with variable mesh sizes.
 
@@ -207,8 +208,9 @@ Added
 
 .. LINKS
 
-.. _`Unreleased`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.5...HEAD
-.. _`1.4.5`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.5...v1.4.5
+.. _`Unreleased`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.6...HEAD
+.. _`1.4.6`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.5...v1.4.6
+.. _`1.4.5`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.4...v1.4.5
 .. _`1.4.4`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.3...v1.4.4
 .. _`1.4.3`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.2...v1.4.3
 .. _`1.4.2`: https://github.com/kip-hart/MicroStructPy/compare/v1.4.1...v1.4.2

src/microstructpy/__init__.py

@@ -4,4 +4,4 @@
 import microstructpy.seeding
 import microstructpy.verification
 
-__version__ = '1.4.5'
+__version__ = '1.4.6'

src/microstructpy/_misc.py

@@ -2,6 +2,8 @@
 
 This private module contains miscellaneous functions.
 """
+import ast 
+
 import numpy as np
 
 __author__ = 'Kenneth (Kip) Hart'
@@ -44,61 +46,11 @@ def from_str(string):
         The value in the string.
 
     """
-    beg_delims = ('(', '[', '{', '<')
-    end_delims = (')', ']', '}', '>')
-
-    string = string.strip()
-    has_delims = False
-    for beg, end in zip(beg_delims, end_delims):
-        has_beg = string.startswith(beg)
-        has_end = string.endswith(end)
-        has_delims |= has_beg and has_end
-    if has_delims or ',' in string:
-        val = _list_from_str(string, beg_delims, end_delims)
-    else:
-        val = _single_from_str(string)
-    return val
-
-
-def _list_from_str(string, beg_delims, end_delims):
-    if string[0] in beg_delims:
-        string = string[1:]
-    if string[-1] in end_delims:
-        string = string[:-1]
-    val = []
-    n_beg = 0
-    n_end = 0
-    elem_str = ''
-    for char in string:
-        if char in beg_delims:
-            n_beg += 1
-        elif char in end_delims:
-            n_end += 1
-
-        if (char == ',') and n_beg == n_end:
-            val.append(from_str(elem_str.strip()))
-            elem_str = ''
-        else:
-            elem_str += char
-    if elem_str == string and ',' in string:
-        return _single_from_str(string)
-    val.append(from_str(elem_str.strip()))
-    return val
-
-
-def _single_from_str(string):
+    s = string.strip()
     try:
-        val = int(string)
-    except ValueError:
-        try:
-            val = float(string)
-        except ValueError:
-            if string.lower() in ('true', 'yes'):
-                val = True
-            elif string.lower() in ('false', 'no'):
-                val = False
-            else:
-                val = str(string)
+        val = ast.literal_eval(s)
+    except (ValueError, SyntaxError):
+        val = s
     return val
 
 

src/microstructpy/seeding/seed.py

@@ -211,6 +211,8 @@ def __str__(self):
         str_str += str(self.geometry) + '\n'
         str_str += 'Phase: ' + str(self.phase) + '\n'
         bkdwn_str = ', '.join([str(tuple(b)) for b in self.breakdown])
+        if len(self.breakdown) == 1:
+            bkdwn_str += ','  # breakdowns will be a tuple of length 1
         str_str += 'Breakdown: (' + bkdwn_str + ')\n'
         str_str += 'Position: (' + ', '.join([str(x) for x in self.position])
         str_str += ')'