X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Noyau%2FN_types.py;h=db686f81c35e43c57a36bc15e9c594f04e583168;hb=9f4ff7ed9afd87c96e11d61e442e39e5511f60d1;hp=377dddffb3c000e1ebfef88b7d6cdaf4ed971e09;hpb=16d5922e798b1254eb558678612711d72ed38b32;p=tools%2Feficas.git

diff --git a/Noyau/N_types.py b/Noyau/N_types.py
index 377dddff..db686f81 100644
--- a/Noyau/N_types.py
+++ b/Noyau/N_types.py
@@ -1,29 +1,29 @@
-#@ MODIF N_types Noyau  DATE 28/01/2013   AUTEUR COURTOIS M.COURTOIS 
-# -*- coding: iso-8859-1 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2013  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY  
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY  
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR     
-# (AT YOUR OPTION) ANY LATER VERSION.                                                  
-#                                                                       
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT   
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF            
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU      
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.                              
-#                                                                       
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE     
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,         
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.        
-# ======================================================================
-# RESPONSABLE COURTOIS M.COURTOIS
+# coding=utf-8
+# Copyright (C) 2007-2013   EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 """
    Ce module contient des fonctions utilitaires pour tester les types
 """
 
 # eficas sentinel
+from __future__ import absolute_import
+import six
 try:
     import numpy as NP
     _np_arr = NP.ndarray
@@ -32,41 +32,54 @@ except ImportError:
 
 # use isinstance() instead of type() because objects returned from numpy arrays
 # inherit from python scalars but are numpy.float64 or numpy.int32...
+
+
 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):
     return isinstance(obj, float)
 
+
 def is_complex(obj):
     return isinstance(obj, complex)
 
 from decimal import Decimal
+
+
 def is_float_or_int(obj):
     return is_float(obj) or is_int(obj) or isinstance(obj, Decimal)
 
+
 def is_number(obj):
     return is_float_or_int(obj) or is_complex(obj)
 
+
 def is_str(obj):
-    return isinstance(obj, (str, unicode))
+    return isinstance(obj, (str, six.text_type))
+
 
 def is_list(obj):
     return type(obj) is list
 
+
 def is_tuple(obj):
     return type(obj) is tuple
 
+
 def is_array(obj):
     """a numpy array ?"""
     return type(obj) is _np_arr
 
+
 def is_sequence(obj):
     """a sequence (allow iteration, not a string) ?"""
     return is_list(obj) or is_tuple(obj) or is_array(obj)
 
+
 def is_assd(obj):
-    from N_ASSD import ASSD
+    from .N_ASSD import ASSD
     return isinstance(obj, ASSD)
 
 
@@ -75,15 +88,18 @@ def force_list(obj):
     sinon retourne [obj,] (en tant que list).
     """
     if not is_sequence(obj):
-        obj = [obj,]
+        obj = [obj, ]
     return list(obj)
 
+
 def force_tuple(obj):
     """Return `obj` as a tuple."""
     return tuple(force_list(obj))
 
 # backward compatibility
 from warnings import warn
+
+
 def is_enum(obj):
     """same as is_sequence"""
     warn("'is_enum' is deprecated, use 'is_sequence'",