Merge pull request #5 from davidcl/fix-with-python3

Fix with python 3.9
opencollab · Jun 14, 2024 · cfcafa8 · cfcafa8
2 parents f476b7b + 5d32b65
commit cfcafa8
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 24 deletions.
diff --git a/classRepresentation/methodGiws.py b/classRepresentation/methodGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from parameterGiws import parameterGiws
+from classRepresentation.parameterGiws import parameterGiws
 from JNIFrameWork import JNIFrameWork
 from datatypes.dataGiws import dataGiws
 from datatypes.stringDataGiws import stringDataGiws
@@ -54,7 +54,7 @@ def __init__(self, name, returns, detachThread, modifier=None):
         if isinstance(returns, dataGiws):
             self.__returns = returns
         else:
-            raise Exception("The type must be a dataGiws object")
+            raise Exception("The return type must be a dataGiws object")
         self.__parameters = []
         if detachThread:
             self.__detachThread = "\njvm_->DetachCurrentThread();\n"
@@ -63,6 +63,8 @@ def __init__(self, name, returns, detachThread, modifier=None):
     def addParameter(self, parameter):
         if isinstance(parameter, parameterGiws):
             self.__parameters.append(parameter)
+        else:
+            raise Exception("The parameter type must be a parameterGiws object")
 
     def getName(self):
         return self.__name

diff --git a/classRepresentation/objectGiws.py b/classRepresentation/objectGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from methodGiws import methodGiws
+from classRepresentation.methodGiws import methodGiws
 from JNIFrameWork import JNIFrameWork
 from datatypes.stringDataGiws import stringDataGiws
 from configGiws import configGiws
@@ -59,6 +59,8 @@ def __init__(self, name, extends):
     def addMethod(self, method):
         if isinstance(method, methodGiws):
             self.__methods.append(method)
+        else:
+            raise Exception("The method must be a methodGiws object")
 
     def getName(self):
         return self.__name

diff --git a/classRepresentation/packageGiws.py b/classRepresentation/packageGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from objectGiws import objectGiws
+from classRepresentation.objectGiws import objectGiws
 
 
 class packageGiws:
@@ -60,6 +60,9 @@ def getObjects(self):
     def addObject(self, object):
         if isinstance(object, objectGiws):
             self.__objects.append(object)
+        else:
+            raise Exception("cannot add a non GIWS object")
+
 
     def getObject(self, name):
         for object in self.__objects:

diff --git a/datatypes/ByteBufferDataGiws.py b/datatypes/ByteBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/CharBufferDataGiws.py b/datatypes/CharBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/DoubleBufferDataGiws.py b/datatypes/DoubleBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/FloatBufferDataGiws.py b/datatypes/FloatBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/IntBufferDataGiws.py b/datatypes/IntBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/LongBufferDataGiws.py b/datatypes/LongBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/ShortBufferDataGiws.py b/datatypes/ShortBufferDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataBufferGiws import dataBufferGiws
+from datatypes.dataBufferGiws import dataBufferGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/booleanDataGiws.py b/datatypes/booleanDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 from JNIFrameWork import JNIFrameWork
 from configGiws import configGiws
 

diff --git a/datatypes/byteDataGiws.py b/datatypes/byteDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class byteDataGiws(dataGiws):

diff --git a/datatypes/charDataGiws.py b/datatypes/charDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class charDataGiws(dataGiws):

diff --git a/datatypes/dataBufferGiws.py b/datatypes/dataBufferGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/dataFactoryGiws.py b/datatypes/dataFactoryGiws.py
@@ -52,7 +52,6 @@
 from datatypes.IntBufferDataGiws import IntBufferDataGiws
 from datatypes.ShortBufferDataGiws import ShortBufferDataGiws
 import datatypes
-import new
 
 """ Factory which create the different data types """
 

diff --git a/datatypes/doubleDataGiws.py b/datatypes/doubleDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class doubleDataGiws(dataGiws):

diff --git a/datatypes/floatDataGiws.py b/datatypes/floatDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class floatDataGiws(dataGiws):

diff --git a/datatypes/intDataGiws.py b/datatypes/intDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class intDataGiws(dataGiws):

diff --git a/datatypes/longDataGiws.py b/datatypes/longDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class longDataGiws(dataGiws):

diff --git a/datatypes/shortDataGiws.py b/datatypes/shortDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class shortDataGiws(dataGiws):

diff --git a/datatypes/stringDataGiws.py b/datatypes/stringDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 from configGiws import configGiws
 from JNIFrameWork import JNIFrameWork
 

diff --git a/datatypes/voidDataGiws.py b/datatypes/voidDataGiws.py
@@ -34,7 +34,7 @@
 #
 # For more information, see the file COPYING
 
-from dataGiws import dataGiws
+from datatypes.dataGiws import dataGiws
 
 
 class voidDataGiws(dataGiws):

diff --git a/giws b/giws
@@ -49,7 +49,7 @@ class giws:
 	templateObj = None
 	def __init__(self, argv=sys.argv):
 		self.argv = argv
-                self.config.setFullCommandLine(argv[1:])
+		self.config.setFullCommandLine(argv[1:])
 
 		try:
 			self.__parse_cmdline()