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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -60,6 +60,9 @@
|
||||
#####################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
import six
|
||||
if six.PY3:
|
||||
long = int
|
||||
|
||||
import copy
|
||||
import datetime
|
||||
|
||||
@@ -47,6 +47,9 @@
|
||||
|
||||
from __future__ import print_function
|
||||
from __future__ import absolute_import
|
||||
import six
|
||||
if six.PY3:
|
||||
long = int
|
||||
|
||||
import copy
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -35,6 +35,10 @@
|
||||
#
|
||||
# Author: Glenn Bergmans
|
||||
|
||||
import six
|
||||
if six.PY3:
|
||||
long = int
|
||||
|
||||
from m5.ext.pyfdt import pyfdt
|
||||
import re
|
||||
import os
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user