Skip to content
Snippets Groups Projects
Commit b9ee86ca authored by Todd Gamblin's avatar Todd Gamblin
Browse files

Make packages Python3 compatible.

parent 7f3f4930
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -22,7 +22,7 @@
# 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 __future__ import print_function
import os
import shutil
import sys
......@@ -115,7 +115,7 @@ def install(self, spec, prefix):
def check_install(self, spec):
"Build and run a small program to test the installed HDF5 Blosc plugin"
print "Checking HDF5-Blosc plugin..."
print("Checking HDF5-Blosc plugin...")
checkdir = "spack-check"
with working_dir(checkdir, create=True):
source = r"""\
......@@ -188,16 +188,16 @@ def check_install(self, spec):
output = ""
success = output == expected
if not success:
print "Produced output does not match expected output."
print "Expected output:"
print "-" * 80
print expected
print "-" * 80
print "Produced output:"
print "-" * 80
print output
print "-" * 80
print "Environment:"
print("Produced output does not match expected output.")
print("Expected output:")
print("-" * 80)
print(expected)
print("-" * 80)
print("Produced output:")
print("-" * 80)
print(output)
print("-" * 80)
print("Environment:")
env = which("env")
env()
raise RuntimeError("HDF5 Blosc plugin check failed")
......
......@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
from urlparse import urlparse
from six.moves.urllib.parse import urlparse
from os.path import split
......
......@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
from urlparse import urlparse
from six.moves.urllib.parse import urlparse
from os.path import split
......
......@@ -229,6 +229,6 @@ def delete_files(*filenames):
if os.path.exists(filename):
try:
os.remove(filename)
except OSError, e:
except OSError as e:
raise InstallError('Failed to delete file %s: %s' % (
e.filename, e.strerror))
......@@ -68,7 +68,7 @@ class Nwchem(Package):
]
}
# Iterate over patches
for condition, urls in urls_for_patches.iteritems():
for condition, urls in urls_for_patches.items():
for url, md5 in urls:
patch(url, when=condition, level=0, md5=md5)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment