gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-27 01:01:28 +02:00
Code Issues Projects Releases Wiki Activity

Removed useless cmp function from icu and polyglot

Browse Source
This commit is contained in:
gryf
2020-07-05 17:43:42 +02:00
parent df26a45a2e
commit c25c14024f
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebook_converter/polyglot/builtins.py
-4
View File
@@ -11,7 +11,3 @@ def as_bytes(x, encoding='utf-8'):
if isinstance(x, memoryview): if isinstance(x, memoryview):
return x.tobytes() return x.tobytes()
return str(x).encode(encoding) return str(x).encode(encoding)
def cmp(a, b):
return (a > b) - (a < b)
ebook_converter/utils/icu.py
+7 -12
View File
@@ -1,16 +1,12 @@
import sys import sys
# Setup code {{{ # Setup code {{{
from ebook_converter.polyglot.builtins import cmp
from ebook_converter.utils import config_base from ebook_converter.utils import config_base
is_narrow_build = sys.maxunicode < 0x10ffff is_narrow_build = sys.maxunicode < 0x10ffff
_locale = _collator = _primary_collator = _sort_collator = _numeric_collator = _case_sensitive_collator = None _locale = _collator = _primary_collator = _sort_collator = _numeric_collator = _case_sensitive_collator = None
cmp
_none = u''
_none2 = b''
_cmap = {} _cmap = {}
_icu, err = 1, None # plugins['icu'] _icu, err = 1, None # plugins['icu']
@@ -20,6 +16,7 @@ del err
def collator(): def collator():
__import__('pdb').set_trace()
global _collator, _locale global _collator, _locale
if _collator is None: if _collator is None:
if _locale is None: if _locale is None:
@@ -36,13 +33,8 @@ def collator():
return _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(): def primary_collator():
__import__('pdb').set_trace()
'Ignores case differences and accented characters' 'Ignores case differences and accented characters'
global _primary_collator global _primary_collator
if _primary_collator is None: if _primary_collator is None:
@@ -52,6 +44,7 @@ def primary_collator():
def sort_collator(): def sort_collator():
__import__('pdb').set_trace()
'Ignores case differences and recognizes numbers in strings (if the tweak is set)' 'Ignores case differences and recognizes numbers in strings (if the tweak is set)'
global _sort_collator global _sort_collator
if _sort_collator is None: if _sort_collator is None:
@@ -62,6 +55,7 @@ def sort_collator():
def numeric_collator(): def numeric_collator():
__import__('pdb').set_trace()
'Uses natural sorting for numbers inside strings so something2 will sort before something10' 'Uses natural sorting for numbers inside strings so something2 will sort before something10'
global _numeric_collator global _numeric_collator
if _numeric_collator is None: if _numeric_collator is None:
@@ -72,6 +66,7 @@ def numeric_collator():
def case_sensitive_collator(): def case_sensitive_collator():
__import__('pdb').set_trace()
'Always sorts upper case letter before lower case' 'Always sorts upper case letter before lower case'
global _case_sensitive_collator global _case_sensitive_collator
if _case_sensitive_collator is None: if _case_sensitive_collator is None:
@@ -116,14 +111,14 @@ def {name}(a, b):
try: try:
a = a.decode(sys.getdefaultencoding()) a = a.decode(sys.getdefaultencoding())
except ValueError: except ValueError:
return cmp(a, b) return (a > b) - (a < b)
elif a is None: elif a is None:
a = u'' a = u''
if isinstance(b, bytes): if isinstance(b, bytes):
try: try:
b = b.decode(sys.getdefaultencoding()) b = b.decode(sys.getdefaultencoding())
except ValueError: except ValueError:
return cmp(a, b) return (a > b) - (a < b)
elif b is None: elif b is None:
b = u'' b = u''
return {collator}.{func}(a, b) return {collator}.{func}(a, b)