From: Cory Benfield <lukasaoz@gmail.com>
Date: Sat, 18 May 2013 10:58:18 +0000 (+0100)
Subject: BytesIO from six.
X-Git-Tag: 2.7~68^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d3b38911a9ee8d4266867081b29d967b071bb9e;p=thirdparty%2Fjinja.git

BytesIO from six.
---

diff --git a/jinja2/bccache.py b/jinja2/bccache.py
index e53783b7..b7b637fc 100644
--- a/jinja2/bccache.py
+++ b/jinja2/bccache.py
@@ -19,6 +19,7 @@ import sys
 import marshal
 import tempfile
 from six.moves import cPickle as pickle
+from six import BytesIO
 import fnmatch
 try:
     from hashlib import sha1
@@ -29,11 +30,9 @@ from jinja2.utils import open_if_exists
 
 # marshal works better on 3.x, one hack less required
 if sys.version_info[0] >= 3:
-    from io import BytesIO
     marshal_dump = marshal.dump
     marshal_load = marshal.load
 else:
-    from cStringIO import StringIO as BytesIO
 
     def marshal_dump(code, f):
         if isinstance(f, file):