Add Python 2.7 functools.total_ordering to external modules.
- removing dependence on 2.7 - added it to pyqver2 ads well
This commit is contained in:
		
							
								
								
									
										30
									
								
								lib/spack/external/functools.py
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								lib/spack/external/functools.py
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,30 @@
 | 
			
		||||
#
 | 
			
		||||
# Backport of Python 2.7's total_ordering.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
def total_ordering(cls):
 | 
			
		||||
    """Class decorator that fills in missing ordering methods"""
 | 
			
		||||
    convert = {
 | 
			
		||||
        '__lt__': [('__gt__', lambda self, other: not (self < other or self == other)),
 | 
			
		||||
                   ('__le__', lambda self, other: self < other or self == other),
 | 
			
		||||
                   ('__ge__', lambda self, other: not self < other)],
 | 
			
		||||
        '__le__': [('__ge__', lambda self, other: not self <= other or self == other),
 | 
			
		||||
                   ('__lt__', lambda self, other: self <= other and not self == other),
 | 
			
		||||
                   ('__gt__', lambda self, other: not self <= other)],
 | 
			
		||||
        '__gt__': [('__lt__', lambda self, other: not (self > other or self == other)),
 | 
			
		||||
                   ('__ge__', lambda self, other: self > other or self == other),
 | 
			
		||||
                   ('__le__', lambda self, other: not self > other)],
 | 
			
		||||
        '__ge__': [('__le__', lambda self, other: (not self >= other) or self == other),
 | 
			
		||||
                   ('__gt__', lambda self, other: self >= other and not self == other),
 | 
			
		||||
                   ('__lt__', lambda self, other: not self >= other)]
 | 
			
		||||
    }
 | 
			
		||||
    roots = set(dir(cls)) & set(convert)
 | 
			
		||||
    if not roots:
 | 
			
		||||
        raise ValueError('must define at least one ordering operation: < > <= >=')
 | 
			
		||||
    root = max(roots)       # prefer __lt__ to __le__ to __gt__ to __ge__
 | 
			
		||||
    for opname, opfunc in convert[root]:
 | 
			
		||||
        if opname not in roots:
 | 
			
		||||
            opfunc.__name__ = opname
 | 
			
		||||
            opfunc.__doc__ = getattr(int, opname).__doc__
 | 
			
		||||
            setattr(cls, opname, opfunc)
 | 
			
		||||
    return cls
 | 
			
		||||
							
								
								
									
										1
									
								
								lib/spack/external/pyqver2.py
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								lib/spack/external/pyqver2.py
									
									
									
									
										vendored
									
									
								
							@@ -114,6 +114,7 @@
 | 
			
		||||
    "collections.Counter":      (2, 7),
 | 
			
		||||
    "collections.defaultdict":  (2, 5),
 | 
			
		||||
    "collections.OrderedDict":  (2, 7),
 | 
			
		||||
    "functools.total_ordering": (2, 7),
 | 
			
		||||
    "enumerate":                (2, 3),
 | 
			
		||||
    "frozenset":                (2, 4),
 | 
			
		||||
    "itertools.compress":       (2, 7),
 | 
			
		||||
 
 | 
			
		||||
@@ -47,7 +47,8 @@
 | 
			
		||||
import sys
 | 
			
		||||
import re
 | 
			
		||||
from bisect import bisect_left
 | 
			
		||||
from functools import total_ordering, wraps
 | 
			
		||||
from functools import wraps
 | 
			
		||||
from external.functools import total_ordering
 | 
			
		||||
 | 
			
		||||
import llnl.util.compare.none_high as none_high
 | 
			
		||||
import llnl.util.compare.none_low as none_low
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user