commentaire

[tools/eficas.git] / Noyau / N_types.py

diff --git a/Noyau/N_types.py b/Noyau/N_types.py
index 42626f158a8ddecf27896c175fda50642e1b9725..db686f81c35e43c57a36bc15e9c594f04e583168 100644 (file)
--- a/Noyau/N_types.py
+++ b/Noyau/N_types.py
@@ -22,6 +22,8 @@
 """
 
 # eficas sentinel
+from __future__ import absolute_import
+import six
 try:
     import numpy as NP
     _np_arr = NP.ndarray
@@ -33,7 +35,7 @@ except ImportError:
 
 
 def is_int(obj):
-    return isinstance(obj, int) or type(obj) is long
+    return isinstance(obj, int) or type(obj) is int
 
 
 def is_float(obj):
@@ -55,7 +57,7 @@ def is_number(obj):
 
 
 def is_str(obj):
-    return isinstance(obj, (str, unicode))
+    return isinstance(obj, (str, six.text_type))
 
 
 def is_list(obj):
@@ -77,7 +79,7 @@ def is_sequence(obj):
 
 
 def is_assd(obj):
-    from N_ASSD import ASSD
+    from .N_ASSD import ASSD
     return isinstance(obj, ASSD)