commit 40a3c3c80c78a1086c376b71e1e4c352f9a1d244
Author: rpm-build <rpm-build>
Date:   Sat Mar 30 20:56:58 2019 -0600

    [PATCH] Adjust ruamel.yaml imports
    
    This is how it's called in Fedora.

diff --git a/conda/common/configuration.py b/conda/common/configuration.py
index 87c36ef..cda042f 100644
--- a/conda/common/configuration.py
+++ b/conda/common/configuration.py
@@ -47,9 +47,9 @@ from .._vendor.boltons.setutils import IndexedSet
 from .._vendor.toolz import concat, concatv, excepts, merge, unique
 
 try:  # pragma: no cover
-    from ruamel_yaml.comments import CommentedSeq, CommentedMap
-    from ruamel_yaml.reader import ReaderError
-    from ruamel_yaml.scanner import ScannerError
+    from ruamel.yaml.comments import CommentedSeq, CommentedMap
+    from ruamel.yaml.reader import ReaderError
+    from ruamel.yaml.scanner import ScannerError
 except ImportError:  # pragma: no cover
     from ruamel.yaml.comments import CommentedSeq, CommentedMap  # pragma: no cover
     from ruamel.yaml.reader import ReaderError
diff --git a/conda/common/serialize.py b/conda/common/serialize.py
index 479521e..6411c6c 100644
--- a/conda/common/serialize.py
+++ b/conda/common/serialize.py
@@ -16,7 +16,7 @@ log = getLogger(__name__)
 @memoize
 def get_yaml():
     try:
-        import ruamel_yaml as yaml
+        import ruamel.yaml as yaml
     except ImportError:  # pragma: no cover
         try:
             import ruamel.yaml as yaml