diff --git a/kittens/diff/images.py b/kittens/diff/images.py deleted file mode 100644 index 2da6fc13c..000000000 --- a/kittens/diff/images.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# vim:fileencoding=utf-8 -# License: GPL v3 Copyright: 2018, Kovid Goyal - -import warnings - -from ..tui.images import can_display_images - - -class ImageSupportWarning(Warning): - pass - - -def images_supported(): - ans = getattr(images_supported, 'ans', None) - if ans is None: - images_supported.ans = ans = can_display_images() - if not ans: - warnings.warn('ImageMagick not found images cannot be displayed', ImageSupportWarning) - return ans diff --git a/kittens/diff/main.py b/kittens/diff/main.py index 98a223d67..adff6b190 100644 --- a/kittens/diff/main.py +++ b/kittens/diff/main.py @@ -19,9 +19,8 @@ from ..tui.images import ImageManager from ..tui.loop import Loop from .collect import create_collection, data_for_path, set_highlight_data from .config import init_config -from .images import ImageSupportWarning from .patch import Differ, set_diff_command -from .render import LineRef, render_diff +from .render import LineRef, render_diff, ImageSupportWarning try: from .highlight import initialize_highlighter, highlight_collection diff --git a/kittens/diff/render.py b/kittens/diff/render.py index 7f2fb7500..0754b98ad 100644 --- a/kittens/diff/render.py +++ b/kittens/diff/render.py @@ -2,20 +2,33 @@ # vim:fileencoding=utf-8 # License: GPL v3 Copyright: 2018, Kovid Goyal +import warnings from gettext import gettext as _ from itertools import repeat, zip_longest from math import ceil from kitty.fast_data_types import truncate_point_for_length, wcswidth -from ..tui.images import screen_size +from ..tui.images import can_display_images, screen_size from .collect import ( Segment, data_for_path, highlights_for_path, is_image, lines_for_path, path_name_map, sanitize ) from .config import formats from .diff_speedup import split_with_highlights as _split_with_highlights -from .images import images_supported + + +class ImageSupportWarning(Warning): + pass + + +def images_supported(): + ans = getattr(images_supported, 'ans', None) + if ans is None: + images_supported.ans = ans = can_display_images() + if not ans: + warnings.warn('ImageMagick not found images cannot be displayed', ImageSupportWarning) + return ans class Ref: