From 137456fbf3061877f9d6dca2c3a5ddb353128a82 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Wed, 20 Jun 2018 10:45:41 -0500
Subject: [PATCH] externals: move spack.util.ordereddict to
 external/ordereddict_backport

---
 lib/spack/external/_pytest/fixtures.py                       | 5 +----
 .../util/ordereddict.py => external/ordereddict_backport.py} | 0
 lib/spack/spack/config.py                                    | 2 +-
 lib/spack/spack/test/conftest.py                             | 4 ++--
 lib/spack/spack/util/spack_yaml.py                           | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename lib/spack/{spack/util/ordereddict.py => external/ordereddict_backport.py} (100%)

diff --git a/lib/spack/external/_pytest/fixtures.py b/lib/spack/external/_pytest/fixtures.py
index b76ad503399..98317a48890 100644
--- a/lib/spack/external/_pytest/fixtures.py
+++ b/lib/spack/external/_pytest/fixtures.py
@@ -21,10 +21,7 @@
 from _pytest.outcomes import fail, TEST_OUTCOME
 
 
-if sys.version_info[:2] == (2, 6):
-    from ordereddict import OrderedDict
-else:
-    from collections import OrderedDict  # nopyqver
+from ordereddict_backport import OrderedDict
 
 
 def pytest_sessionstart(session):
diff --git a/lib/spack/spack/util/ordereddict.py b/lib/spack/external/ordereddict_backport.py
similarity index 100%
rename from lib/spack/spack/util/ordereddict.py
rename to lib/spack/external/ordereddict_backport.py
diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py
index 73738c9ed30..d54dd74d5a3 100644
--- a/lib/spack/spack/config.py
+++ b/lib/spack/spack/config.py
@@ -57,6 +57,7 @@
 from contextlib import contextmanager
 from six import string_types
 from six import iteritems
+from ordereddict_backport import OrderedDict
 
 import yaml
 from yaml.error import MarkedYAMLError
@@ -69,7 +70,6 @@
 import spack.architecture
 import spack.schema
 from spack.error import SpackError
-from spack.util.ordereddict import OrderedDict
 
 # Hacked yaml for configuration files preserves line numbers.
 import spack.util.spack_yaml as syaml
diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py
index 1072513c3c9..d1f96451d4b 100644
--- a/lib/spack/spack/test/conftest.py
+++ b/lib/spack/spack/test/conftest.py
@@ -28,6 +28,7 @@
 import shutil
 import re
 
+import ordereddict_backport
 import py
 import pytest
 
@@ -42,7 +43,6 @@
 import spack.platforms.test
 import spack.repo
 import spack.stage
-import spack.util.ordereddict
 import spack.util.executable
 import spack.util.pattern
 from spack.dependency import Dependency
@@ -603,7 +603,7 @@ def __init__(self, name, dependencies, dependency_types, conditions=None,
                  versions=None):
         self.name = name
         self.spec = None
-        self.dependencies = spack.util.ordereddict.OrderedDict()
+        self.dependencies = ordereddict_backport.OrderedDict()
 
         assert len(dependencies) == len(dependency_types)
         for dep, dtype in zip(dependencies, dependency_types):
diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py
index f7adadb9808..c02f6c9d040 100644
--- a/lib/spack/spack/util/spack_yaml.py
+++ b/lib/spack/spack/util/spack_yaml.py
@@ -31,6 +31,7 @@
   default unorderd dict.
 
 """
+from ordereddict_backport import OrderedDict
 from six import string_types, StringIO
 
 import yaml
@@ -41,7 +42,6 @@
 from llnl.util.tty.color import colorize, clen, cextra
 
 import spack.error
-from spack.util.ordereddict import OrderedDict
 
 # Only export load and dump
 __all__ = ['load', 'dump', 'SpackYAMLError']