gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-30 17:03:31 +02:00
Code Issues Projects Releases Wiki Activity

Removed polyglots unicode_type usage

Browse Source
This commit is contained in:
gryf
2020-04-20 19:25:28 +02:00
parent ef7e2b10be
commit 128705f258
130 changed files with 657 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ebook_converter/utils/formatter.py
View File

@@ -8,7 +8,7 @@ import re, string, traceback, numbers
from ebook_converter import prints
from ebook_converter.constants import DEBUG
from ebook_converter.utils.formatter_functions import formatter_functions
from ebook_converter.polyglot.builtins import unicode_type, error_message
from ebook_converter.polyglot.builtins import error_message
__license__ = 'GPL v3'
@@ -214,7 +214,7 @@ class TemplateFormatter(string.Formatter):
except:
raise ValueError(
_('format: type {0} requires a decimal (float) value, got {1}').format(typ, val))
return unicode_type(('{0:'+fmt+'}').format(val))
return str(('{0:'+fmt+'}').format(val))
def _explode_format_string(self, fmt):
try:
@@ -273,7 +273,7 @@ class TemplateFormatter(string.Formatter):
# ensure we are dealing with a string.
if isinstance(val, numbers.Number):
if val:
val = unicode_type(val)
val = str(val)
else:
val = ''
# Handle conditional text