Make packages Python3 compatible.

This commit is contained in:
Todd Gamblin
2017-03-25 23:23:47 -07:00
parent 7f3f493024
commit b9ee86cac9
6 changed files with 20 additions and 18 deletions

View File

@@ -22,6 +22,8 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from six import string_types
from spack import *
import spack.architecture
@@ -102,14 +104,14 @@ def has_a_default(self):
# Make sure we can switch methods on different target
#
platform = spack.architecture.platform()
targets = platform.targets.values()
targets = list(platform.targets.values())
if len(targets) > 1:
targets = targets[:-1]
for target in targets:
@when('target=' + target.name)
def different_by_target(self):
if isinstance(self.spec.architecture.target, basestring):
if isinstance(self.spec.architecture.target, string_types):
return self.spec.architecture.target
else:
return self.spec.architecture.target.name