python: Add Python 3 workarounds for long

Python 3 doesn't have a separate long type. Make long an alias for int
where needed to maintain compatibility.

Change-Id: I4c0861302bc3a2fa5226b3041803ef975d29b2fd
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15988
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>

diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 5a869125e0566032de3e7bbc3f4feda65542cf4b..7f19c0776465a424163b3cb430dd2cb43587be31 100644 (file)
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -45,6 +45,9 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
+import six
+if six.PY3:
+    long = int
 
 import sys
 from types import FunctionType, MethodType, ModuleType

diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index 757a4f2385a135a88676f4fd777347e75277b5c0..ff625e0d6277ecb03b2c446d4dd67d8a6f0ef280 100644 (file)
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -60,6 +60,9 @@
 #####################################################################
 
 from __future__ import print_function
+import six
+if six.PY3:
+    long = int
 
 import copy
 import datetime

diff --git a/src/python/m5/proxy.py b/src/python/m5/proxy.py
index b939bc0596215fc657bca22edabed59927281713..5128156df5d5b18e9ab9b56a83935e5434faca44 100644 (file)
--- a/src/python/m5/proxy.py
+++ b/src/python/m5/proxy.py
@@ -47,6 +47,9 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
+import six
+if six.PY3:
+    long = int
 
 import copy
 

diff --git a/src/python/m5/ticks.py b/src/python/m5/ticks.py
index 22a5738d3864a057ef773b007fbd1b41b0d07e5e..7a740a84a43041430af007fa61da6bba355faf34 100644 (file)
--- a/src/python/m5/ticks.py
+++ b/src/python/m5/ticks.py
@@ -27,6 +27,9 @@
 # Authors: Nathan Binkert
 
 from __future__ import print_function
+import six
+if six.PY3:
+    long = int
 
 import sys
 from m5.util import warn

diff --git a/src/python/m5/util/convert.py b/src/python/m5/util/convert.py
index acd1a2448b05404d82685688b4fbada175ef1311..76ac509dc0102cb3659471c5a06607d080e66bb3 100644 (file)
--- a/src/python/m5/util/convert.py
+++ b/src/python/m5/util/convert.py
@@ -28,6 +28,10 @@
 # Authors: Nathan Binkert
 #          Gabe Black
 
+import six
+if six.PY3:
+    long = int
+
 # metric prefixes
 atto  = 1.0e-18
 femto = 1.0e-15

diff --git a/src/python/m5/util/fdthelper.py b/src/python/m5/util/fdthelper.py
index bd04b41549cef19c68b81a22e475b6ba438ad46f..c8760508c0fbbdefad34d56f3c9be657f896c47d 100644 (file)
--- a/src/python/m5/util/fdthelper.py
+++ b/src/python/m5/util/fdthelper.py
@@ -35,6 +35,10 @@
 #
 # Author: Glenn Bergmans
 
+import six
+if six.PY3:
+    long = int
+
 from m5.ext.pyfdt import pyfdt
 import re
 import os

diff --git a/src/python/m5/util/smartdict.py b/src/python/m5/util/smartdict.py
index 3cfe3294ede99ae24006b2493edfc8550141c5d6..dabc3f86b14ed6bd8ff2db8bd257bdfb1daa8345 100644 (file)
--- a/src/python/m5/util/smartdict.py
+++ b/src/python/m5/util/smartdict.py
@@ -43,6 +43,9 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
+import six
+if six.PY3:
+    long = int
 
 from .convert import *
 from .attrdict import attrdict