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

Removed another unicode/string nonsense

Browse Source
This commit is contained in:
gryf
2020-04-23 19:51:25 +02:00
parent de4f8a444b
commit 16d169d0d6
13 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ebook_converter/utils/config.py
View File

@@ -14,12 +14,6 @@ from ebook_converter.utils.config_base import (
tweaks, from_json, to_json
)
from ebook_converter.utils.lock import ExclusiveFile
from ebook_converter.polyglot.builtins import native_string_type
__license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
# optparse uses gettext.gettext instead of _ from builtins, so we
@@ -164,11 +158,11 @@ class OptionParser(optparse.OptionParser):
def options_iter(self):
for opt in self.option_list:
if native_string_type(opt).strip():
if str(opt).strip():
yield opt
for gr in self.option_groups:
for opt in gr.option_list:
if native_string_type(opt).strip():
if str(opt).strip():
yield opt
def option_by_dest(self, dest):
@@ -193,7 +187,6 @@ class OptionParser(optparse.OptionParser):
def add_option_group(self, *args, **kwargs):
if isinstance(args[0], (str, bytes)):
args = list(args)
args[0] = native_string_type(args[0])
return optparse.OptionParser.add_option_group(self, *args, **kwargs)