diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2018-01-10 10:04:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 10:04:07 -0600 |
| commit | 2f0dd02c10a27a907f3bcab154ae35637e36b937 (patch) | |
| tree | 2d70b679bc48287f4b4cd446345c0ed80902bf1e /lib | |
| parent | cab34d7d3b2c810dc726e7316b7df2ca8ebfd1ff (diff) | |
| download | spack-2f0dd02c10a27a907f3bcab154ae35637e36b937.tar.gz spack-2f0dd02c10a27a907f3bcab154ae35637e36b937.tar.bz2 spack-2f0dd02c10a27a907f3bcab154ae35637e36b937.tar.xz spack-2f0dd02c10a27a907f3bcab154ae35637e36b937.zip | |
Update to the latest version of six (#6787)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/external/six.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/spack/external/six.py b/lib/spack/external/six.py index 5293325821..6bf4fd3810 100644 --- a/lib/spack/external/six.py +++ b/lib/spack/external/six.py @@ -29,7 +29,7 @@ import sys import types __author__ = "Benjamin Peterson <benjamin@python.org>" -__version__ = "1.10.0" +__version__ = "1.11.0" # Useful for very coarse version differentiation. @@ -241,7 +241,6 @@ _moved_attributes = [ MovedAttribute("map", "itertools", "builtins", "imap", "map"), MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), - MovedAttribute("getstatusoutput", "commands", "subprocess"), MovedAttribute("getoutput", "commands", "subprocess"), MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), @@ -421,6 +420,8 @@ _urllib_request_moved_attributes = [ MovedAttribute("URLopener", "urllib", "urllib.request"), MovedAttribute("FancyURLopener", "urllib", "urllib.request"), MovedAttribute("proxy_bypass", "urllib", "urllib.request"), + MovedAttribute("parse_http_list", "urllib2", "urllib.request"), + MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), ] for attr in _urllib_request_moved_attributes: setattr(Module_six_moves_urllib_request, attr.name, attr) @@ -820,10 +821,14 @@ def with_metaclass(meta, *bases): # This requires a bit of explanation: the basic idea is to make a dummy # metaclass for one level of class instantiation that replaces itself with # the actual metaclass. - class metaclass(meta): + class metaclass(type): def __new__(cls, name, this_bases, d): return meta(name, bases, d) + + @classmethod + def __prepare__(cls, name, this_bases): + return meta.__prepare__(name, bases) return type.__new__(metaclass, 'temporary_class', (), {}) |