Don't use Expr.__str__ for general use #139

lcapy/expr.py

@@ -59,13 +59,16 @@ def _pexpr(self):
         if not hasattr(self, 'expr'):
             return self
 
-        if state.show_units:
-            if state.canonical_units:
-                return self.expr_with_canonical_units
-            else:
-                return self.expr_with_units
-        else:
-            return self.expr
+        try:
+            if state.show_units:
+                if state.canonical_units:
+                    return self.expr_with_canonical_units
+                else:
+                    return self.expr_with_units
+        except AttributeError:
+            pass
+
+        return self.expr
 
     def __repr__(self):
         """This is called by repr(expr).  It is used, e.g., when printing

lcapy/mnacpts.py

@@ -185,6 +185,13 @@ def _expand(self):
     def _arg_format(self, value):
         """Place value string inside curly braces if it contains a delimiter."""
 
+        # Don't use Expr.__str__ since this will add units
+        # if show_units enabled.
+        try:
+            value = value.sympy
+        except AttributeError:
+            pass
+
         string = str(value)
 
         if string.startswith('{'):