Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relative imports #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions iconmaker/converter.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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
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'
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion iconmaker/utils.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down