Mercurial > p > roundup > code
view roundup/anypy/cmp_.py @ 8543:1ffa1f42e1da
refactor: rework mime type comparison and clean code
rest.py:
accept application/* as match for application/json in non
/binary_context rest path.
allow defining default mime type to return when file/message is
missing mime type. Make it a class variable to it can be changed from
text/plain to text/markdown or whatever.
extract code from determine_output_format() to create
create_valid_content_types() method which returns a list of matching
mime types for a given type/subtype.
Eliminate mostly duplicate return statements by introducing a variable
to specify valid mime types in error message.
rest_common.py:
Fix error messages that now return application/* as valid mime type.
CHANGES.txt upgrading.txt rest.txt:
top level notes and corrections.
Also correct rst syntax on earlier change.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Tue, 24 Mar 2026 21:30:47 -0400 |
| parents | dec7de56f253 |
| children |
line wrap: on
line source
try: # will raise TypeError under python 3 None < 0 # noqa: PLR0133, B015 def NoneAndDictComparable(v): return v except TypeError: # comparator to allow comparisons against None and dict # comparisons (these were allowed in Python 2, but aren't allowed # in Python 3 any more) class NoneAndDictComparable(object): # noqa: PLW1641 def __init__(self, value): self.value = value def __cmp__(self, other): # noqa: PLW3201, PLR0911 if not isinstance(other, self.__class__): raise TypeError('not comparable') if self.value == other.value: return 0 elif self.value is None: return -1 elif other.value is None: return 1 elif type(self.value) is tuple and type(other.value) is tuple: for lhs, rhs in zip(self.value, other.value): lhsCmp = NoneAndDictComparable(lhs) rhsCmp = NoneAndDictComparable(rhs) result = lhsCmp.__cmp__(rhsCmp) if result != 0: return result return len(self.value) - len(other.value) elif type(self.value) is dict and type(other.value) is dict: diff = len(self.value) - len(other.value) if diff == 0: lhsItems = tuple(sorted(self.value.items(), key=NoneAndDictComparable)) rhsItems = tuple(sorted(other.value.items(), key=NoneAndDictComparable)) return -1 if NoneAndDictComparable(lhsItems) < NoneAndDictComparable(rhsItems) else 1 else: return diff elif self.value < other.value: return -1 else: return 1 def __eq__(self, other): return self.__cmp__(other) == 0 def __ne__(self, other): return self.__cmp__(other) != 0 def __lt__(self, other): return self.__cmp__(other) < 0 def __le__(self, other): return self.__cmp__(other) <= 0 def __ge__(self, other): return self.__cmp__(other) >= 0 def __gt__(self, other): return self.__cmp__(other) > 0 def _test(): # ruff: noqa: S101, B011, PLC0415, PLR2004 import sys _py3 = sys.version_info[0] > 2 Comp = NoneAndDictComparable assert Comp(None) < Comp(0) assert Comp(None) < Comp('') assert Comp(None) < Comp({}) assert Comp((0, None)) < Comp((0, 0)) assert not Comp(0) < Comp(None) assert not Comp('') < Comp(None) assert not Comp({}) < Comp(None) assert not Comp((0, 0)) < Comp((0, None)) try: not Comp("") < Comp((0, None)) if _py3: assert False, "Incompatible types are reporting comparable." except TypeError: pass assert Comp((0, 0)) < Comp((0, 0, None)) assert Comp((0, None, None)) < Comp((0, 0, 0)) assert Comp(0) < Comp(1) assert Comp(1) > Comp(0) assert not Comp(1) < Comp(0) assert not Comp(0) > Comp(0) assert Comp(0) <= Comp(1) assert Comp(1) >= Comp(0) assert not Comp(1) <= Comp(0) assert Comp(0) >= Comp(0) assert Comp({0: None}) < Comp({0: 0}) assert Comp({0: 0}) < Comp({0: 1}) assert Comp({0: 0}) == Comp({0: 0}) assert Comp({0: 0}) != Comp({0: 1}) assert Comp({0: 0, 1: 1}) > Comp({0: 1}) assert Comp({0: 0, 1: 1}) < Comp({0: 0, 2: 2}) if __name__ == '__main__': _test()
