Skip to content

适配:python3.6.5 #16

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.

Sign up for GitHub

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

Open
liguobao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

适配:python3.6.5 #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions img2html/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
RenderItem = namedtuple('RenderItem', ['color', 'char'])
RenderGroup = list
HTMLImage = list
try:
xrange
except NameError:
xrange = range

TEMPLATE = '''
<html>
Expand Down Expand Up @@ -53,7 +57,10 @@ def _progress_callback(percent):
lca = getattr(_progress_callback, '_last_call_at', 0)
if time.time() - lca > 0.1:
_progress_callback._last_call_at = time.time()
sys.stdout.write('\r{} progress: {:.2f}%'.format(_c.next(), percent))
try:
sys.stdout.write('\r{} progress: {:.2f}%'.format(_c.next(), percent))
except:
sys.stdout.write('\r{} progress: {:.2f}%'.format(next(_c), percent))
sys.stdout.flush()


Expand All @@ -70,7 +77,10 @@ def __init__(self,
self.title = title
self.font_family = font_family
if isinstance(char, str):
char = char.decode('utf-8')
try:
char = char.decode('utf-8')
except:
char = char.encode('utf-8').decode("utf-8")
self.char = cycle(char)
self._prg_cb = progress_callback or _progress_callback

Expand All @@ -97,7 +107,10 @@ def convert(self, source):
pixels.append(Pixel(*image.getpixel(point)[:3]))
average = self.get_average(pixels=pixels)
color = self.rgb2hex(average)
render_item = RenderItem(color=color, char=self.char.next())
try:
render_item = RenderItem(color=color, char=self.char.next())
except:
render_item = RenderItem(color=color, char=next(self.char))
render_group.append(render_item)

progress += step
Expand Down