diff --git a/.travis.yml b/.travis.yml index eba2d87..d5d7f85 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.2/lib/python3.2/site-packages before_install: - sudo apt-get update @@ -30,8 +31,8 @@ before_install: python: - "2.7" - # - "3.4" - # - "3.3" + - "3.2" +# - "3.3" install: - pip install -r devrequirements.txt 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)