Revert BaseTools: PYTHON3 migration

[mirror_edk2.git] / BaseTools / Source / Python / Common / Expression.py

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 5e4e66a10e7ba05c01e379c6a11055ea5a5cc32f..ff9271031b0e3351e441fdd4ff195212e1b64dd2 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -12,6 +12,8 @@
 \r
 ## Import Modules\r
 #\r
+from __future__ import print_function\r
+from __future__ import absolute_import\r
 from Common.GlobalData import *\r
 from CommonDataClass.Exceptions import BadExpression\r
 from CommonDataClass.Exceptions import WrnExpression\r
@@ -204,7 +206,7 @@ SupportedInMacroList = ['TARGET', 'TOOL_CHAIN_TAG', 'ARCH', 'FAMILY']
 \r
 class BaseExpression(object):\r
     def __init__(self, *args, **kwargs):\r
-        super().__init__()\r
+        super(BaseExpression, self).__init__()\r
 \r
     # Check if current token matches the operators given from parameter\r
     def _IsOperator(self, OpSet):\r
@@ -324,7 +326,7 @@ class ValueExpression(BaseExpression):
         return Val\r
 \r
     def __init__(self, Expression, SymbolTable={}):\r
-        super().__init__(self, Expression, SymbolTable)\r
+        super(ValueExpression, self).__init__(self, Expression, SymbolTable)\r
         self._NoProcess = False\r
         if not isinstance(Expression, type('')):\r
             self._Expr = Expression\r
@@ -425,13 +427,6 @@ class ValueExpression(BaseExpression):
                 else:\r
                     Val = Val3\r
                 continue\r
-            #\r
-            # PEP 238 -- Changing the Division Operator\r
-            # x/y to return a reasonable approximation of the mathematical result of the division ("true division")\r
-            # x//y to return the floor ("floor division")\r
-            #\r
-            if Op == '/':\r
-                Op = '//'\r
             try:\r
                 Val = self.Eval(Op, Val, EvalFunc())\r
             except WrnExpression as Warn:\r
@@ -905,7 +900,7 @@ class ValueExpressionEx(ValueExpression):
                     if TmpValue.bit_length() == 0:\r
                         PcdValue = '{0x00}'\r
                     else:\r
-                        for I in range((TmpValue.bit_length() + 7) // 8):\r
+                        for I in range((TmpValue.bit_length() + 7) / 8):\r
                             TmpList.append('0x%02x' % ((TmpValue >> I * 8) & 0xff))\r
                         PcdValue = '{' + ', '.join(TmpList) + '}'\r
                 except:\r
@@ -1033,7 +1028,7 @@ class ValueExpressionEx(ValueExpression):
 if __name__ == '__main__':\r
     pass\r
     while True:\r
-        input = input('Input expr: ')\r
+        input = raw_input('Input expr: ')\r
         if input in 'qQ':\r
             break\r
         try:\r