Porting to Python 2.6 - add coding page specification for Python scripts

[modules/kernel.git] / bin / NSparam.py

diff --git a/bin/NSparam.py b/bin/NSparam.py
index 652e6da662a62c2c6795b85aaf51ba7657197b1a..bbc4d3c16a30f3fd49dd51555e0ce8facff4f620 100755 (executable)
--- a/bin/NSparam.py
+++ b/bin/NSparam.py
@@ -1,26 +1,27 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# 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
-# 
-
+#! /usr/bin/env python
+#  -*- coding: iso-8859-1 -*-
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  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
+#
 import sys,os
-import string
 
 def getNSparams(info=""):
     """
@@ -32,25 +33,8 @@ def getNSparams(info=""):
     elif info==port print host
     else    print 2 strings on stdout on one line: host port
     """
-    my_port=""
-    my_host=""
-    if os.environ.has_key("OMNIORB_CONFIG"):
-        file = open(os.environ["OMNIORB_CONFIG"], "r")
-        s = file.readline()
-        while len(s):
-            l = string.split(s, ":")
-            if string.split(l[0], " ")[0] == "ORBInitRef" or \
-               string.split(l[0], " ")[0] == "InitRef" :
-                my_port = l[len(l)-1]
-                if my_port[-1] == '\n':
-                    my_port = my_port[:-1]
-                    pass
-                my_host = l[len(l)-2]
-                break;
-                pass
-            s = file.readline()
-            pass
-        pass
+    from salome_utils import getORBcfgInfo
+    my_version, my_host, my_port = getORBcfgInfo()
     if info=='host':
         # keep print, stdout used in shell
         print my_host
@@ -80,9 +64,10 @@ if __name__ == "__main__":
             getNSparams('port')
             pass
         else:
-            getNSparams('')
+            getNSparams()
             pass
         pass
     else:
-        getNSparams('')
+        getNSparams()
         pass
+    pass