Changeset 13618

Timestamp:

Sep 30, 2019 2:31:26 PM (2 months ago)

Author:

randersson

Message:

#5819 Replaced IOError to OSError since it has been merged since python 3.3. Fixed such that self.last is no longer decoded from bytes and is instead the decoding + convert to str is only done on the objects where it is needed (such as when using count, find, split). This enables self.last to be of the type required by the version of xmlparser used, and no longer overridden.

Location:

branches/dev-5819/Python/src/pymodelica

Files:

• compiler_logging.py (modified) (4 diffs)
• compiler_wrappers.py (modified) (4 diffs)

branches/dev-5819/Python/src/pymodelica/compiler_logging.py

@@ -114 +114 @@
             # apparently self.last is of class 'bytes' in py3
             # compared to class 'str' in py2
-            self.last = self.last.decode('utf-8')
-            self.line += self.last.count('\n')
+            self.line += str(self.last.decode('utf-8')).count('\n')
             # Get the two last lines
-            lines = self.last.rsplit('\n', 2)
+            lines = str(self.last.decode('utf-8')).rsplit('\n', 2)
             # Update lastLine and secondLastLine depending on how many
             # rows we got
@@ -145 +144 @@
         dump_file.write(self.last)
         
-        lines = self.last.split('\n')
+        lines = str(self.last.decode('utf-8')).split('\n')
         lines[0] = self.lastLine + lines[0]
         
@@ -157 +156 @@
             dump_file.write(more)
             while localLine + 2 >= len(lines) and more:
-                pos = more.find('\n')
+                pos = str(more.decode('utf-8')).find('\n')
                 if pos == -1:
                     lines[-1] = lines[-1] + more
@@ -191 +190 @@
         
         # Discard remaining data.
-        data = self.stream.read()
-        dump_file.write(data)
-        while data is None or data != '':
+        # Check if not already closed since later versions of xmlreader closes it by itself
+        if not self.stream.closed:
             data = self.stream.read()
             dump_file.write(data)
-        dump_file.close()
+            while data is None or data != '':
+                data = self.stream.read()
+                dump_file.write(data)
+            dump_file.close()
         
         message += "%sDump of the log has been saved in %s" % (os.linesep, dump_file.name)

branches/dev-5819/Python/src/pymodelica/compiler_wrappers.py

@@ -390 +390 @@
             CompilerError if one or more error is found during compilation.
             
-            IOError if the model file is not found, can not be read or any other 
-            IO related error.
+            OSError if the model file is not found, can not be read or any other 
+            OS related error.
             
             Exception if there are general errors related to the parsing of the 
@@ -471 +471 @@
             ModelicaClassNotFoundError if the model class is not found.
             
-            IOError if the model file is not found, can not be read or any 
-            other IO related error.
+            OSError if the model file is not found, can not be read or any 
+            other OS related error.
             
             JError if there was a runtime exception thrown by the underlying 
@@ -502 +502 @@
         Raises::
         
-            IOError if the model file is not found, can not be read or any other 
-            IO related error.
+            OSError if the model file is not found, can not be read or any other 
+            OS related error.
                 
             JError if there was a runtime exception thrown by the underlying 
@@ -566 +566 @@
         
         if _py_handle_exception(ex, jpype.java.io.FileNotFoundException):
-            raise IOError(
+            raise OSError(
                 '\nMessage: '+ex.message().encode('utf-8')+\
                 '\nStacktrace: '+ex.stacktrace().encode('utf-8'))
         
         if _py_handle_exception(ex, jpype.java.io.IOException):
-            raise IOError(
+            raise OSError(
                 '\nMessage: '+str(ex.message().encode('utf-8'))+\
                 '\nStacktrace: '+str(ex.stacktrace().encode('utf-8')))