1
0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-11 12:05:45 +01:00

Cleanup get_image_path usage.

This commit is contained in:
2020-04-12 19:32:51 +02:00
parent 5aa0b1a0eb
commit ea19d47ad1
6 changed files with 237 additions and 291 deletions

View File

@@ -635,9 +635,8 @@ def read_custom_tweaks():
def default_tweaks_raw():
with open(pkg_resources.resource_filename('ebook_converter',
'data/default_tweaks.py')) as f:
return f.read().encode()
return pkg_resources.resource_filename('ebook_converter',
'data/default_tweaks.py')
def read_tweaks():

View File

@@ -626,10 +626,12 @@ def encode_jpeg(file_path, quality=80):
def test(): # {{{
# TODO(gryf): move this test to separate file.
from ebook_converter.ptempfile import TemporaryDirectory
from ebook_converter import CurrentDir
from glob import glob
img = image_from_data(I('lt.png', data=True, allow_user_override=False))
# TODO(gryf): make the sample image out of pillow or smth
# img = image_from_data(I('lt.png', data=True, allow_user_override=False))
with TemporaryDirectory() as tdir, CurrentDir(tdir):
save_image(img, 'test.jpg')
ret = optimize_jpeg('test.jpg')
@@ -638,7 +640,9 @@ def test(): # {{{
ret = encode_jpeg('test.jpg')
if ret is not None:
raise SystemExit('encode_jpeg failed: %s' % ret)
shutil.copyfile(I('lt.png'), 'test.png')
# TODO(gryf): make the sample image out of pillow or smth. for sure
# tempfile would be better idea.
#shutil.copyfile(I('lt.png'), 'test.png')
ret = optimize_png('test.png')
if ret is not None:
raise SystemExit('optimize_png failed: %s' % ret)

View File

@@ -98,7 +98,3 @@ def get_image_path(path, data=False, allow_user_override=True):
def set_data(path, data=None):
return _resolver.set_data(path, data)
builtins.__dict__['P'] = get_path
builtins.__dict__['I'] = get_image_path