Update app.py

app.py

@@ -164,70 +164,70 @@ def text2int(textnum, numwords={}):
     lastunit = False
     lastscale = False
 
-    def is_numword(x):
-        if is_number(x):
-            return True
-        if word in numwords:
-            return True
-        return False
-
-    def from_numword(x):
-        if is_number(x):
-            scale = 0
-            increment = int(x.replace(',', ''))
-            return scale, increment
-        return numwords[x]
-
-    for word in textnum.split():
-        if word in ordinal_words:
-            scale, increment = (1, ordinal_words[word])
-            current = current * scale + increment
-            if scale > 100:
-                result += current
-                current = 0
-            onnumber = True
+def is_numword(x):
+    if is_number(x):
+        return True
+    if word in numwords:
+        return True
+    return False
+
+def from_numword(x):
+    if is_number(x):
+        scale = 0
+        increment = int(x.replace(',', ''))
+        return scale, increment
+    return numwords[x]
+
+for word in textnum.split():
+    if word in ordinal_words:
+        scale, increment = (1, ordinal_words[word])
+        current = current * scale + increment
+        if scale > 100:
+            result += current
+            current = 0
+        onnumber = True
+        lastunit = False
+        lastscale = False
+    else:
+        for ending, replacement in ordinal_endings:
+            if word.endswith(ending):
+                word = "%s%s" % (word[:-len(ending)], replacement)
+
+        if (not is_numword(word)) or (word == 'and' and not lastscale):
+            if onnumber:
+                curstring += repr(result + current) + " "
+            curstring += word + " "
+            result = current = 0
+            onnumber = False
             lastunit = False
             lastscale = False
         else:
-            for ending, replacement in ordinal_endings:
-                if word.endswith(ending):
-                    word = "%s%s" % (word[:-len(ending)], replacement)
-
-            if (not is_numword(word)) or (word == 'and' and not lastscale):
-                if onnumber:
-                    curstring += repr(result + current) + " "
-                curstring += word + " "
-                result = current = 0
-                onnumber = False
-                lastunit = False
-                lastscale = False
-            else:
-                scale, increment = from_numword(word)
-                onnumber = True
+            scale, increment = from_numword(word)
+            onnumber = True
 
-                if lastunit and (word not in scales):
-                    curstring += repr(result + current)
-                    result = current = 0
+            if lastunit and (word not in scales):
+                curstring += repr(result + current)
+                result = current = 0
 
-                if scale > 1:
-                    current = max(1, current)
+            if scale > 1:
+                current = max(1, current)
 
-                current = current * scale + increment
-                if scale > 100:
-                    result += current
-                    current = 0
+            current = current * scale + increment
+            if scale > 100:
+                result += current
+                current = 0
 
-                lastscale = False
-                lastunit = False
-                if word in scales:
-                    lastscale = True
-                elif word in units:
-                    lastunit = True
+            lastscale = False
+            lastunit = False
+            if word in scales:
+                lastscale = True
+            elif word in units:
+                lastunit = True
 
-    if onnumber:
-        curstring += repr(result + current)
+if onnumber:
+    curstring += repr(result + current)
 
-    return curstring
+return curstring
 
 # Convert sentence to transcript using Soundex
 def sentence_to_transcript(sentence, word_to_code_map):