Ticket #2537: 0001-converting-from-locale-fraction_sep-before-parsing.patch

calculate.py

@@ -48 +48 @@
 from decimal import Decimal
 from rational import Rational
 
+def replace_fraction_seperator(text, fraction_sep):
+    '''
+    Replace the fraction separator with '.'
+    A simple replace won't work, e.g. plot(x*x,x=-1,0..1,0)
+    '''
+
+    if fraction_sep == '.':
+        return text
+
+    new_text = ''
+    parts = text.split(fraction_sep)
+
+    for i in range(len(parts) - 1):
+        new_text += parts[i]
+        if new_text[-1] in string.digits and parts[i + 1][0] in string.digits:
+            new_text += '.'
+        else:
+            new_text += fraction_sep
+
+    return new_text + parts[-1]
+
+
 def findchar(text, chars, ofs=0):
     '''
     Find a character in set <chars> starting from offset ofs.
@@ -454 +476 @@
         s = unicode(self.text_entry.get_text())
         label = unicode(self.label_entry.get_text())
         _logger.debug('process(): parsing %r, label: %r', s, label)
+        s = replace_fraction_seperator(s, self.ml.fraction_sep)
         try:
             tree = self.parser.parse(s)
             res = self.parser.evaluate(tree)