From b43a5498a159c634ca88341d3010bc1c98197e24 Mon Sep 17 00:00:00 2001
From: Mario Melara <maamelara@gmail.com>
Date: Thu, 25 Feb 2016 10:36:47 -0800
Subject: [PATCH] Changed import path to operating_systems

---
 lib/spack/spack/platforms/bgq.py     | 1 -
 lib/spack/spack/platforms/cray_xc.py | 4 ++--
 lib/spack/spack/platforms/darwin.py  | 2 +-
 lib/spack/spack/platforms/linux.py   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/spack/spack/platforms/bgq.py b/lib/spack/spack/platforms/bgq.py
index 6e872d2e72..b550f1d5cb 100644
--- a/lib/spack/spack/platforms/bgq.py
+++ b/lib/spack/spack/platforms/bgq.py
@@ -1,5 +1,4 @@
 import os
-
 from spack.architecture import Platform, Target
 
 class Bgq(Platform):
diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index da90726fef..ea3ae0e477 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -1,7 +1,7 @@
 import os
 from spack.architecture import Platform, Target
-from spack.operating_system.linux_distro import LinuxDistro
-from spack.operating_system.cnl import Cnl
+from spack.operating_systems.linux_distro import LinuxDistro
+from spack.operating_systems.cnl import Cnl
 
 class CrayXc(Platform):
     priority    = 20
diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py
index 4512857371..c48f7d17d2 100644
--- a/lib/spack/spack/platforms/darwin.py
+++ b/lib/spack/spack/platforms/darwin.py
@@ -1,6 +1,6 @@
 import subprocess
 from spack.architecture import Platform, Target
-from spack.operating_system.mac_osx import MacOsx
+from spack.operating_systems.mac_osx import MacOsx
 
 class Darwin(Platform):
     priority    = 89
diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py
index 220f1bbaf4..1b22b69048 100644
--- a/lib/spack/spack/platforms/linux.py
+++ b/lib/spack/spack/platforms/linux.py
@@ -1,6 +1,6 @@
 import subprocess
 from spack.architecture import Platform, Target
-from spack.operating_system.linux_distro import LinuxDistro
+from spack.operating_systems.linux_distro import LinuxDistro
 
 class Linux(Platform):
     priority    = 90