release/0.7.0: Add unicode_literals from __future__

jeroenrook · Dec 9, 2018 · 3fcfe72 · 3fcfe72
1 parent 1daa4b3
commit 3fcfe72
Show file tree

Hide file tree

Showing 27 changed files with 83 additions and 5 deletions.
diff --git a/sklearn_porter/Porter.py b/sklearn_porter/Porter.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import unicode_literals
+from __future__ import absolute_import
 
 import os
 import sys

diff --git a/sklearn_porter/Template.py b/sklearn_porter/Template.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os.path
 
 

diff --git a/sklearn_porter/__init__.py b/sklearn_porter/__init__.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import os.path
 
@@ -11,8 +14,6 @@ def _read_version():
     source_dir = os.path.abspath(os.path.dirname(__file__))
     version_file = os.path.join(source_dir, '__version__.txt')
     version = open(version_file, 'r').readlines().pop()
-    if isinstance(version, bytes):
-        version = version.decode('utf-8')
     version = str(version).strip()
     return version
 

diff --git a/sklearn_porter/cli/__main__.py b/sklearn_porter/cli/__main__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import absolute_import
 
 import sys
 import os

diff --git a/sklearn_porter/estimator/classifier/AdaBoostClassifier/__init__.py b/sklearn_porter/estimator/classifier/AdaBoostClassifier/__init__.py
@@ -1,9 +1,14 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
+
 import sklearn
+
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 
 

diff --git a/sklearn_porter/estimator/classifier/BernoulliNB/__init__.py b/sklearn_porter/estimator/classifier/BernoulliNB/__init__.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
 
 import numpy as np
+
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 
 

diff --git a/sklearn_porter/estimator/classifier/Classifier.py b/sklearn_porter/estimator/classifier/Classifier.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 from sklearn_porter.Template import Template
 
 

diff --git a/sklearn_porter/estimator/classifier/DecisionTreeClassifier/__init__.py b/sklearn_porter/estimator/classifier/DecisionTreeClassifier/__init__.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
+
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 
 

diff --git a/sklearn_porter/estimator/classifier/GaussianNB/__init__.py b/sklearn_porter/estimator/classifier/GaussianNB/__init__.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder

diff --git a/sklearn_porter/estimator/classifier/KNeighborsClassifier/__init__.py b/sklearn_porter/estimator/classifier/KNeighborsClassifier/__init__.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
+
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 
 

diff --git a/sklearn_porter/estimator/classifier/LinearSVC/__init__.py b/sklearn_porter/estimator/classifier/LinearSVC/__init__.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder

diff --git a/sklearn_porter/estimator/classifier/MLPClassifier/__init__.py b/sklearn_porter/estimator/classifier/MLPClassifier/__init__.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
+
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 
 

diff --git a/sklearn_porter/estimator/classifier/RandomForestClassifier/__init__.py b/sklearn_porter/estimator/classifier/RandomForestClassifier/__init__.py
@@ -1,9 +1,14 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
+
 from sklearn.tree.tree import DecisionTreeClassifier
+
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 
 

diff --git a/sklearn_porter/estimator/classifier/SVC/__init__.py b/sklearn_porter/estimator/classifier/SVC/__init__.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 import json
 from json import encoder
-import types
 
 from sklearn_porter.estimator.classifier.Classifier import Classifier
 

diff --git a/sklearn_porter/estimator/regressor/MLPRegressor/__init__.py b/sklearn_porter/estimator/regressor/MLPRegressor/__init__.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+from __future__ import absolute_import
+
 from sklearn_porter.estimator.regressor.Regressor import Regressor
 
 

diff --git a/sklearn_porter/estimator/regressor/Regressor.py b/sklearn_porter/estimator/regressor/Regressor.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 from sklearn_porter.Template import Template
 
 

diff --git a/sklearn_porter/utils/Environment.py b/sklearn_porter/utils/Environment.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+from __future__ import absolute_import
+
 import os
 import sys
 

diff --git a/sklearn_porter/utils/Shell.py b/sklearn_porter/utils/Shell.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+from __future__ import absolute_import
+
 import six
 
 from subprocess import call

diff --git a/tests/PorterTest.py b/tests/PorterTest.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import random
 import unittest
 import filecmp
 import os

diff --git a/tests/language/C.py b/tests/language/C.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 
 from sklearn_porter import Porter

diff --git a/tests/language/Go.py b/tests/language/Go.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 
 from sklearn_porter import Porter

diff --git a/tests/language/Java.py b/tests/language/Java.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 
 from sklearn_porter import Porter

diff --git a/tests/language/JavaScript.py b/tests/language/JavaScript.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 
 from sklearn_porter import Porter

diff --git a/tests/language/PHP.py b/tests/language/PHP.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 
 from sklearn_porter import Porter

diff --git a/tests/language/Ruby.py b/tests/language/Ruby.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 import os
 
 from sklearn_porter import Porter

diff --git a/tests/utils/EnvironmentTest.py b/tests/utils/EnvironmentTest.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 from unittest import TestCase
 
 from sklearn_porter.utils.Environment import Environment

diff --git a/tests/utils/ShellTest.py b/tests/utils/ShellTest.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import absolute_import
+
 from unittest import TestCase
 
 from sklearn_porter.utils.Shell import Shell