Test python 2, include various compatibility fixes

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 
 python:
-#  - "2.7"
+  - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"

quantulum3/classes.py

@@ -4,6 +4,9 @@
 :mod:`Quantulum` classes.
 """
 
+# Python 2 compatibility
+from __future__ import unicode_literals
+
 # Dependencies
 import inflect
 import num2words

quantulum3/classifier.py

@@ -3,7 +3,7 @@
 :mod:`Quantulum` classifier functions.
 """
 
-# Python 2 compatability
+# Python 2 compatibility
 from __future__ import unicode_literals
 
 # Standard library

quantulum3/load.py

@@ -4,20 +4,18 @@
 :mod:`Quantulum` unit and entity loading functions.
 """
 
-# Python 2 compatability
+# Python 2 compatibility
 from __future__ import unicode_literals
 
-from io import open
-
 # Standard library
 import os
 import json
 from collections import defaultdict
 import re
+from io import open
 
 # Dependencies
 import inflect
-from unidecode import unidecode
 
 # Quantulum
 from . import classes as c
@@ -227,7 +225,7 @@ def load_unit(unit, names, unit_symbols, unit_symbols_lower, surfaces, lowers,
                 for num, i in enumerate(split)
             ])
         else:
-            plural = PLURALS.plural(unidecode(surface))
+            plural = PLURALS.plural(surface)
         if plural != surface:
             surfaces[plural].append(obj)
             lowers[plural.lower()].append(obj)

quantulum3/parser.py

@@ -4,6 +4,9 @@
 :mod:`Quantulum` parser.
 """
 
+# Python 2 compatability
+from __future__ import unicode_literals
+
 # Standard library
 import re
 import logging

quantulum3/regex.py

@@ -4,7 +4,7 @@
 :mod:`Quantulum` regex functions.
 """
 
-# Python 2 compatability
+# Python 2 compatibility
 from __future__ import unicode_literals
 
 # Standard library

quantulum3/tests/test_classifier.py

@@ -4,6 +4,9 @@
 :mod:`Quantulum` tests.
 """
 
+# Python 2 compatibility
+from __future__ import unicode_literals
+
 # Standard library
 import os
 import json

quantulum3/tests/test_no_classifier.py

@@ -4,6 +4,9 @@
 :mod:`Quantulum` tests.
 """
 
+# Python 2 compatibility
+from __future__ import unicode_literals
+
 # Standard library
 import os
 import unittest

quantulum3/tests/test_setup.py

@@ -4,11 +4,15 @@
 :mod:`Quantulum` tests.
 """
 
+# Python 2 compatibility
+from __future__ import unicode_literals
+
 # Standard library
 import os
 import re
 import json
 import unittest
+from io import open
 
 # Dependencies
 try:

scripts/build.py

@@ -3,6 +3,7 @@
 
 import os
 import json
+from io import open
 
 from quantulum3 import load
 '''

scripts/train.py

@@ -2,9 +2,6 @@
 # -*- coding: utf-8 -*-
 ''' Train the disambiguator '''
 
-import sys
-import os
-
 from quantulum3.classifier import train_classifier
 
 train_classifier(download=False, store=True)