Fix formatting

Author: gunthercox

mathparse/mathparse.py

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 """
 Methods for evaluating mathematical equations in strings.
 """
@@ -106,7 +105,7 @@ def replace_word_tokens_simplified_chinese(string):
     return the string with the words replaced with
     an operational equivalent.
     """
-    words = mathwords.word_groups_for_language('SIMPLIFIED_CHINESE')
+    words = mathwords.word_groups_for_language('CHI')
 
     # Replace operator words with numeric operators
     operators = words['binary_operators'].copy()
@@ -124,7 +123,7 @@ def replace_word_tokens_simplified_chinese(string):
 
     # 九千八百万九千八百——> 98009800
     def chinese_string_to_num(str):
-        if str is '':
+        if str == '':
             return 0
 
         if str in digits:
@@ -525,7 +524,7 @@ def parse(
     """
     if language:
 
-        if language == 'SIMPLIFIED_CHINESE':
+        if language == 'CHI':
             string = replace_word_tokens_simplified_chinese(string)
         else:
             string = replace_word_tokens(string, language, stopwords)

mathparse/mathwords.py

@@ -1,8 +1,7 @@
-import math
-
 """
 Utility methods for getting math word terms.
 """
+import math
 
 BINARY_OPERATORS = {
     '^', '*', '/', '+', '-'
@@ -642,7 +641,7 @@
             'ล้านล้าน': 1000000000000
         }
     },
-    'SIMPLIFIED_CHINESE': {
+    'CHI': {
         'unary_operators': {
             '平方': '^ 2',
             '立方': '^ 3',

tests/test_simplified_chinese.py

@@ -5,46 +5,46 @@
 class SimplifiedChineseTestCase(TestCase):
 
     def test_addition_words(self):
-        result = mathparse.parse('四加四',language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('四加四', language='CHI')
 
         self.assertEqual(result, 8)
 
     def test_addition_words_large(self):
-        result = mathparse.parse('四千两百一加五百', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('四千两百一加五百', language='CHI')
 
         self.assertEqual(result, 4701)
 
     def test_subtraction_words(self):
-        result = mathparse.parse('三十减二十',language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('三十减二十', language='CHI')
 
         self.assertEqual(result, 10)
 
     def test_multiplication_words(self):
-        result = mathparse.parse('九乘九', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('九乘九', language='CHI')
 
         self.assertEqual(result, 81)
 
     def test_division_words(self):
-        result = mathparse.parse('十五除以五', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('十五除以五', language='CHI')
 
         self.assertEqual(result, 3)
 
     def test_division_words_large(self):
-        result = mathparse.parse('一千两百四除以一百', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('一千两百四除以一百', language='CHI')
 
         self.assertEqual(str(result), '12.04')
 
     def test_sqrt(self):
-        result = mathparse.parse('四开方', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('四开方', language='CHI')
 
         self.assertEqual(result, 2)
 
     def test_squared(self):
-        result = mathparse.parse('二平方', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('二平方', language='CHI')
 
         self.assertEqual(result, 4)
 
     def test_cubed(self):
-        result = mathparse.parse('二立方', language='SIMPLIFIED_CHINESE')
+        result = mathparse.parse('二立方', language='CHI')
 
-        self.assertEqual(result, 8)
+        self.assertEqual(result, 8)