From 863a5bc4fa7d6b880769192e4fcb7a461a6a0063 Mon Sep 17 00:00:00 2001
From: Mario Melara <maamelara@gmail.com>
Date: Thu, 25 Feb 2016 10:34:55 -0800
Subject: Fix for 'Parent module spack.operating_systems not found while
 handling absolute import'

---
 lib/spack/spack/architecture.py | 42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index e76e411ae0..5827427003 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -67,26 +67,26 @@ class Target(object):
     def set_platform(self, platform):
         self.platform_name = platform.name
 
-    def to_dict(self):
-        d = {}
-        d['name'] = self.name
-        d['compiler_strategy'] = self.compiler_strategy
-        d['module_name'] = self.module_name
-        if self.platform_name:
-            d['platform'] = self.platform_name
-        return d
-
-    @staticmethod
-    def from_dict(d):
-        if d is None:
-            return None
-        target = Target.__new__(Target)
-        target.name = d['name']
-        target.compiler_strategy = d['compiler_strategy']
-        target.module_name = d['module_name']
-        if 'platform' in d:
-            target.platform_name = d['platform']
-        return target
+    #def to_dict(self):
+    #    d = {}
+    #    d['name'] = self.name
+    #    d['compiler_strategy'] = self.compiler_strategy
+    #    d['module_name'] = self.module_name
+    #    if self.platform_name:
+    #        d['platform'] = self.platform_name
+    #    return d
+
+    #@staticmethod
+    #def from_dict(d):
+    #    if d is None:
+    #        return None
+    #    target = Target.__new__(Target)
+    #    target.name = d['name']
+    #    target.compiler_strategy = d['compiler_strategy']
+    #    target.module_name = d['module_name']
+    #    if 'platform' in d:
+    #        target.platform_name = d['platform']
+    #    return target
 
     def _cmp_key(self):
         return (self.name, self.module_name)
@@ -326,7 +326,7 @@ def all_platforms(operating_system=False):
     
     if operating_system:
         mod_path = spack.operating_system_path
-        mod_string = "spack.operating_system."
+        mod_string = "spack.operating_systems"
     else:
         mod_path = spack.platform_path
         mod_string = "spack.platformss"
-- 
cgit v1.2.3-70-g09d2