diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2018-11-04 17:57:38 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-11-09 00:31:24 -0800 |
| commit | 3f68d8c53af0da8d31cf5b922d7c0d50f1600010 (patch) | |
| tree | d88b077f5b91bc99ab52197d764751e9ee0298d2 /lib | |
| parent | 62f8ea1a75e56a2da289e8ffe9651bc62dab4d89 (diff) | |
| download | spack-3f68d8c53af0da8d31cf5b922d7c0d50f1600010.tar.gz spack-3f68d8c53af0da8d31cf5b922d7c0d50f1600010.tar.bz2 spack-3f68d8c53af0da8d31cf5b922d7c0d50f1600010.tar.xz spack-3f68d8c53af0da8d31cf5b922d7c0d50f1600010.zip | |
externals: bugfix in ruamel for ordereddict in Python 2.6
- args weren't being delegated properly from CommentedMap to OrderedDict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/external/ruamel/yaml/comments.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/external/ruamel/yaml/comments.py b/lib/spack/external/ruamel/yaml/comments.py index 4a99931615..b8a5010ad8 100644 --- a/lib/spack/external/ruamel/yaml/comments.py +++ b/lib/spack/external/ruamel/yaml/comments.py @@ -381,9 +381,9 @@ class CommentedMap(ordereddict, CommentedBase): pre_comments = self.ca.comment[1] = [] return pre_comments - def update(self, vals): + def update(self, *vals, **kwds): try: - ordereddict.update(self, vals) + ordereddict.update(self, *vals, **kwds) except TypeError: # probably a dict that is used for x in vals: |