From 5bbe25d95e2f30191ca27908c2d3cadbbf6cef8a Mon Sep 17 00:00:00 2001 From: rathcke Date: Thu, 27 Oct 2022 16:36:02 +0200 Subject: [PATCH 1/2] Relative imports --- iconmaker/converter.py | 6 +++--- iconmaker/utils.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iconmaker/converter.py b/iconmaker/converter.py index 501b2a2..f9c6724 100644 --- a/iconmaker/converter.py +++ b/iconmaker/converter.py @@ -5,9 +5,9 @@ except: from StringIO import StringIO -from utils import check_and_get_image_sizes, which, image_mode_to_bit_depth -from logger import logging -from exceptions import ConversionError, ImageError +from .utils import check_and_get_image_sizes, which, image_mode_to_bit_depth +from .logger import logging +from .exceptions import ConversionError, ImageError from PIL import Image FORMAT_PNG = 'png' diff --git a/iconmaker/utils.py b/iconmaker/utils.py index 6546da3..c81666d 100644 --- a/iconmaker/utils.py +++ b/iconmaker/utils.py @@ -1,6 +1,6 @@ import os from PIL import Image -from exceptions import ImageError +from .exceptions import ImageError def check_and_get_image_sizes(image_list): From accd54bbac28100bfb2d185f965de803559fb919 Mon Sep 17 00:00:00 2001 From: rathcke Date: Thu, 27 Oct 2022 16:54:04 +0200 Subject: [PATCH 2/2] python3 changes --- iconmaker/converter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iconmaker/converter.py b/iconmaker/converter.py index f9c6724..eda9515 100644 --- a/iconmaker/converter.py +++ b/iconmaker/converter.py @@ -1,9 +1,9 @@ import subprocess, os, tempfile, requests, struct try: - from cStringIO import StringIO + from io import StringIO except: - from StringIO import StringIO + from io import StringIO from .utils import check_and_get_image_sizes, which, image_mode_to_bit_depth from .logger import logging @@ -452,7 +452,7 @@ def convert(self, image_list = [] resized_images = {} - for (image_size, image_path) in image_dict.iteritems(): + for (image_size, image_path) in image_dict.items(): (image_width, image_height) = image_size if not is_size_convertible_to_icon(image_width,