Fixed #35, and some formatting changes

Pipfile

@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 treelib = "*"
 colorful = "*"
+six = "*"
 
 [dev-packages]
 pylint = "*"

ety/__main__.py

@@ -1,6 +1,6 @@
 #!/usr/local/bin/python
 # -*- coding: utf-8 -*-
 
-import ety
+from ety import cli
 
-ety.cli()
+cli()

ety/data.py

@@ -18,17 +18,6 @@ def load_country_codes():
     with io.open(resource, 'r', encoding='utf-8') as f:
         return json.load(f)
 
-    # loaded_langs = []
-    # resource = resource_filename('ety', 'wn/iso-639-3.json')
-    # with io.open(resource, 'r', encoding='utf-8') as f:
-    #     countries_json = json.load(f)
-    # for country in countries_json:
-    #     loaded_langs.append({
-    #         'name': country['name'],
-    #         'iso6393': country['iso6393'],
-    #     })
-    # return loaded_langs
-
 
 etyms = load_relety()
 langs = load_country_codes()

ety/word.py

@@ -7,10 +7,12 @@
 from .language import Language
 from .tree import EtyTree
 
+from six import string_types
+
 
 class Word(object):
     def __init__(self, word, language='eng', is_source=False):
-        if not isinstance(word, ("".__class__, u"".__class__)):
+        if not isinstance(word, string_types):
             raise ValueError('word must be a string')
         self.word = word
         self.language = Language(language)

requirements.txt

@@ -1,3 +1,4 @@
 treelib
 colorful
+six
 

setup.py

@@ -33,7 +33,7 @@
     keywords='etymology origins english language words',
     packages=['ety'],
     install_requires=[
-        "treelib", "colorful",
+        "treelib", "colorful", "six",
     ],
     extras_require={
         'dev': ['flake8'],