add from builtins import to all files

add from __future__ import
and move "from" imports to the top

Author: thorade

OMPython/OMParser/__init__.py

@@ -32,9 +32,12 @@
  Version: 1.0
 """
 
-import sys
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from builtins import int, range
 
-from builtins import int
+import sys
 
 result = dict()
 

OMPython/OMTypedParser.py

@@ -35,7 +35,10 @@
 __status__ = "Prototype"
 __maintainer__ = "https://openmodelica.org"
 
-import sys
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from builtins import int, range
 
 from pyparsing import (
     Combine,
@@ -55,6 +58,7 @@
     replaceWith,
 )
 
+import sys
 
 def convertNumbers(s, l, toks):
     n = toks[0]

OMPython/__init__.py

@@ -27,6 +27,38 @@ class which means it will use OMCSessionZMQ by default. If you want to use
 That format is harder to use.
 """
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from builtins import int, range
+from copy import deepcopy
+from distutils import spawn
+
+import abc
+import csv
+import getpass
+import logging
+import os
+import platform
+import subprocess
+import sys
+import tempfile
+import time
+import uuid
+import xml.etree.ElementTree as ET
+
+import numpy as np
+import pyparsing
+
+
+if sys.platform == 'darwin':
+    # On Mac let's assume omc is installed here and there might be a broken omniORB installed in a bad place
+    sys.path.append('/opt/local/lib/python2.7/site-packages/')
+    sys.path.append('/opt/openmodelica/lib/python2.7/site-packages/')
+
+# TODO: replace this with the new parser
+from OMPython import OMTypedParser, OMParser
+
 __license__ = """
  This file is part of OpenModelica.
 
@@ -58,35 +90,6 @@ class which means it will use OMCSessionZMQ by default. If you want to use
  Version: 1.1
 """
 
-from builtins import int, range
-from copy import deepcopy
-from distutils import spawn
-
-import abc
-import csv
-import getpass
-import logging
-import os
-import platform
-import subprocess
-import sys
-import tempfile
-import time
-import uuid
-import xml.etree.ElementTree as ET
-
-import numpy as np
-import pyparsing
-
-
-if sys.platform == 'darwin':
-    # On Mac let's assume omc is installed here and there might be a broken omniORB installed in a bad place
-    sys.path.append('/opt/local/lib/python2.7/site-packages/')
-    sys.path.append('/opt/openmodelica/lib/python2.7/site-packages/')
-
-# TODO: replace this with the new parser
-from OMPython import OMTypedParser, OMParser
-
 # Logger Defined
 logger = logging.getLogger('OMPython')
 logger.setLevel(logging.DEBUG)

tests/test_OMParser.py

@@ -1,9 +1,12 @@
-import unittest
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 from builtins import int
 
 from OMPython import OMParser
 
+import unittest
+
 typeCheck = OMParser.typeCheck