From 8ce9877a5dd016f0fd072dd4084dd25dafee6f80 Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 11 Oct 2016 00:29:05 +0530 Subject: [PATCH 1/5] fixing problem of not seeing images on python3 --- vlogging/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vlogging/__init__.py b/vlogging/__init__.py index 4818e68..6b85385 100644 --- a/vlogging/__init__.py +++ b/vlogging/__init__.py @@ -3,9 +3,11 @@ from io import BytesIO as StringIO from string import Template import base64 +import sys __version__ = "0.2" renderers = [] +__is_python_3__ = (sys.version_info[0] >= 3) try: import cv2 @@ -77,6 +79,12 @@ def __init__(self, title="", imgs=None, footnotes="", fmt="png"): self.footnotes = footnotes + def getEncodedString(self, data): + ret = str(base64.b64encode(data)) + if __is_python_3__: + ret = ret[2:-1] + return ret + def render_images(self): rendered = [] @@ -93,7 +101,7 @@ def render_images(self): return "".join( Template('').substitute({ - "data": base64.b64encode(data).decode(), + "data": self.getEncodedString(data), "mime": mime }) for data, mime in rendered) From 3ae47878dcfa49e4e8931fa8ae353c9b42cfea54 Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 11 Oct 2016 16:27:00 +0530 Subject: [PATCH 2/5] travis test 01 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eba2d87..3a8cea6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,8 @@ before_install: python: - "2.7" - # - "3.4" - # - "3.3" + - "3.4" + - "3.3" install: - pip install -r devrequirements.txt From 435de37c61dc66c868dd879ac1583e032fb31e22 Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 11 Oct 2016 16:45:00 +0530 Subject: [PATCH 3/5] travis test 02 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a8cea6..9406af6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ cache: apt: true directories: - /home/travis/virtualenv/python2.7/lib/python2.7/site-packages + - /home/travis/virtualenv/python3.4/lib/python3.4/site-packages before_install: - sudo apt-get update @@ -31,7 +32,7 @@ before_install: python: - "2.7" - "3.4" - - "3.3" +# - "3.3" install: - pip install -r devrequirements.txt From b2ba882d471c6c8626fa8c6644117d04cfd5f138 Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 11 Oct 2016 16:53:20 +0530 Subject: [PATCH 4/5] travis test 03 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9406af6..9703509 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: python: - "2.7" - - "3.4" + - "3.2" # - "3.3" install: From 772c45fcf833e06c6674e6dab3d4fafafd205c73 Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 11 Oct 2016 16:55:08 +0530 Subject: [PATCH 5/5] travis test 03 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9703509..d5d7f85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ cache: apt: true directories: - /home/travis/virtualenv/python2.7/lib/python2.7/site-packages - - /home/travis/virtualenv/python3.4/lib/python3.4/site-packages + - /home/travis/virtualenv/python3.2/lib/python3.2/site-packages before_install: - sudo apt-get update