summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMario Melara <maamelara@gmail.com>2016-05-30 13:07:20 -0700
committerMario Melara <maamelara@gmail.com>2016-05-30 13:07:20 -0700
commit08a9d80ebcd239790d28904787ea5f6a9bf5fa5d (patch)
treecd1ff6fee30b11374fde0a63b07e559781ca987a /lib
parentf96c97902452761cbf2bff64d3efa1240df70771 (diff)
downloadspack-08a9d80ebcd239790d28904787ea5f6a9bf5fa5d.tar.gz
spack-08a9d80ebcd239790d28904787ea5f6a9bf5fa5d.tar.bz2
spack-08a9d80ebcd239790d28904787ea5f6a9bf5fa5d.tar.xz
spack-08a9d80ebcd239790d28904787ea5f6a9bf5fa5d.zip
Changed platform to py_platform to avoid name collisions. The naming collisions resulted in an error on linux machines
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/test/architecture.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/spack/spack/test/architecture.py b/lib/spack/spack/test/architecture.py
index f5b1068435..3d08269dee 100644
--- a/lib/spack/spack/test/architecture.py
+++ b/lib/spack/spack/test/architecture.py
@@ -3,7 +3,7 @@
"""
import unittest
import os
-import platform
+import platform as py_platform
import spack
from spack.architecture import *
from spack.spec import *
@@ -61,9 +61,9 @@ class ArchitectureTest(MockPackagesTest):
my_platform_class = CrayXc()
elif os.path.exists('/bgsys'):
my_platform_class = Bgq()
- elif 'Linux' in platform.system():
+ elif 'Linux' in py_platform.system():
my_platform_class = Linux()
- elif 'Darwin' in platform.system():
+ elif 'Darwin' in py_platform.system():
my_platform_class = Darwin()
self.assertEqual(str(output_platform_class), str(my_platform_class))