From c25c14024fdc6400576b8bb1424d157352ee3f94 Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 5 Jul 2020 17:43:42 +0200 Subject: [PATCH] Removed useless cmp function from icu and polyglot --- ebook_converter/polyglot/builtins.py | 4 ---- ebook_converter/utils/icu.py | 19 +++++++------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ebook_converter/polyglot/builtins.py b/ebook_converter/polyglot/builtins.py index 66d3204..39f229a 100644 --- a/ebook_converter/polyglot/builtins.py +++ b/ebook_converter/polyglot/builtins.py @@ -11,7 +11,3 @@ def as_bytes(x, encoding='utf-8'): if isinstance(x, memoryview): return x.tobytes() return str(x).encode(encoding) - - -def cmp(a, b): - return (a > b) - (a < b) diff --git a/ebook_converter/utils/icu.py b/ebook_converter/utils/icu.py index bc4dc84..9a6d99c 100644 --- a/ebook_converter/utils/icu.py +++ b/ebook_converter/utils/icu.py @@ -1,16 +1,12 @@ import sys # Setup code {{{ -from ebook_converter.polyglot.builtins import cmp from ebook_converter.utils import config_base is_narrow_build = sys.maxunicode < 0x10ffff _locale = _collator = _primary_collator = _sort_collator = _numeric_collator = _case_sensitive_collator = None -cmp -_none = u'' -_none2 = b'' _cmap = {} _icu, err = 1, None # plugins['icu'] @@ -20,6 +16,7 @@ del err def collator(): + __import__('pdb').set_trace() global _collator, _locale if _collator is None: if _locale is None: @@ -36,13 +33,8 @@ def collator(): return _collator -def change_locale(locale=None): - global _locale, _collator, _primary_collator, _sort_collator, _numeric_collator, _case_sensitive_collator - _collator = _primary_collator = _sort_collator = _numeric_collator = _case_sensitive_collator = None - _locale = locale - - def primary_collator(): + __import__('pdb').set_trace() 'Ignores case differences and accented characters' global _primary_collator if _primary_collator is None: @@ -52,6 +44,7 @@ def primary_collator(): def sort_collator(): + __import__('pdb').set_trace() 'Ignores case differences and recognizes numbers in strings (if the tweak is set)' global _sort_collator if _sort_collator is None: @@ -62,6 +55,7 @@ def sort_collator(): def numeric_collator(): + __import__('pdb').set_trace() 'Uses natural sorting for numbers inside strings so something2 will sort before something10' global _numeric_collator if _numeric_collator is None: @@ -72,6 +66,7 @@ def numeric_collator(): def case_sensitive_collator(): + __import__('pdb').set_trace() 'Always sorts upper case letter before lower case' global _case_sensitive_collator if _case_sensitive_collator is None: @@ -116,14 +111,14 @@ def {name}(a, b): try: a = a.decode(sys.getdefaultencoding()) except ValueError: - return cmp(a, b) + return (a > b) - (a < b) elif a is None: a = u'' if isinstance(b, bytes): try: b = b.decode(sys.getdefaultencoding()) except ValueError: - return cmp(a, b) + return (a > b) - (a < b) elif b is None: b = u'' return {collator}.{func}(a, b)