Merge branch 'master' into bugfix/380061-removing-dependencies

Author: crazyeng

wolframclient/deserializers/wxf/wxfconsumer.py

@@ -154,7 +154,7 @@ def consume_bigint(self, current_token, tokens, **kwargs):
         except ValueError:
             raise WolframParserException("Invalid big integer value: %s" % current_token.data)
 
-    BIGREAL_RE = re.compile(r"([^`]+)(`[0-9.]+){0,1}(\*\^[0-9]+){0,1}")
+    BIGREAL_RE = re.compile(r"([^`]+)(`[0-9.]+){0,1}(\*\^){0,1}(-?[0-9]+){0,1}")
 
     def consume_bigreal(self, current_token, tokens, **kwargs):
         """Parse a WXF big real as a WXF serializable big real.
@@ -169,10 +169,10 @@ def consume_bigreal(self, current_token, tokens, **kwargs):
 
         if match:
 
-            num, prec, exp = match.groups()
+            num, _, _, exp = match.groups()
 
             if exp:
-                return decimal.Decimal("%se%s" % (num, exp[2:]))
+                return decimal.Decimal("%se%s" % (num, exp))
 
             return decimal.Decimal(num)
 

wolframclient/tests/deserializers/wxf_deserialize.py

@@ -147,6 +147,11 @@ def test_bigreal_precision_exponent(self):
         res = binary_deserialize(wxf, consumer=WXFConsumer())
         self.assertEqual(res, decimal.Decimal("9.999999999999996843873323328588479844E+999"))
 
+    def test_bigreal_precision_negexponent(self):
+            wxf = b'8:RC4.590261537982443550699999999999999999999281`19.66183743091127*^-16'
+            res = binary_deserialize(wxf, consumer=WXFConsumer())
+            self.assertEqual(res, decimal.Decimal('4.590261537982443550699999999999999999999281E-16'))
+
     def test_empty_lists(self):
         value = ((), ((),), (1, ()), ())
         self.wxf_assert_roundtrip(value)