|
 |
ce0f553 |
commit 40a3c3c80c78a1086c376b71e1e4c352f9a1d244
|
|
|
ce0f553 |
Author: rpm-build <rpm-build>
|
|
|
ce0f553 |
Date: Sat Mar 30 20:56:58 2019 -0600
|
|
 |
da2616f |
|
|
|
ce0f553 |
[PATCH] Adjust ruamel.yaml imports
|
|
|
ce0f553 |
|
|
|
ce0f553 |
This is how it's called in Fedora.
|
|
|
da2616f |
|
|
|
da2616f |
diff --git a/conda/common/configuration.py b/conda/common/configuration.py
|
|
|
ce0f553 |
index 87c36ef..cda042f 100644
|
|
|
da2616f |
--- a/conda/common/configuration.py
|
|
|
da2616f |
+++ b/conda/common/configuration.py
|
|
|
da2616f |
@@ -47,9 +47,9 @@ from .._vendor.boltons.setutils import IndexedSet
|
|
|
da2616f |
from .._vendor.toolz import concat, concatv, excepts, merge, unique
|
|
|
da2616f |
|
|
|
da2616f |
try: # pragma: no cover
|
|
|
da2616f |
- from ruamel_yaml.comments import CommentedSeq, CommentedMap
|
|
|
da2616f |
- from ruamel_yaml.reader import ReaderError
|
|
|
da2616f |
- from ruamel_yaml.scanner import ScannerError
|
|
|
da2616f |
+ from ruamel.yaml.comments import CommentedSeq, CommentedMap
|
|
|
da2616f |
+ from ruamel.yaml.reader import ReaderError
|
|
|
da2616f |
+ from ruamel.yaml.scanner import ScannerError
|
|
|
da2616f |
except ImportError: # pragma: no cover
|
|
|
da2616f |
from ruamel.yaml.comments import CommentedSeq, CommentedMap # pragma: no cover
|
|
|
da2616f |
from ruamel.yaml.reader import ReaderError
|
|
|
da2616f |
diff --git a/conda/common/serialize.py b/conda/common/serialize.py
|
|
|
ce0f553 |
index 479521e..6411c6c 100644
|
|
|
da2616f |
--- a/conda/common/serialize.py
|
|
|
da2616f |
+++ b/conda/common/serialize.py
|
|
|
da2616f |
@@ -16,7 +16,7 @@ log = getLogger(__name__)
|
|
|
da2616f |
@memoize
|
|
|
da2616f |
def get_yaml():
|
|
|
da2616f |
try:
|
|
|
da2616f |
- import ruamel_yaml as yaml
|
|
|
da2616f |
+ import ruamel.yaml as yaml
|
|
|
da2616f |
except ImportError: # pragma: no cover
|
|
|
da2616f |
try:
|
|
|
da2616f |
import ruamel.yaml as yaml
|