Replaced StringIO and cStringIO imports with six.StringIO (#3810)

StringIO and cStringIO modules are replaced with io.StringIO in
Python 3. six.StringIO is an alias for StringIO.StringIO in
Python 2 and io.StringIO in Python 3
This commit is contained in:
Aditya Hase 2017-07-31 10:54:17 +05:30 committed by Rushabh Mehta
parent e6e16d112b
commit d3395dfd28
11 changed files with 19 additions and 18 deletions

View file

@ -121,7 +121,7 @@ def get_build_maps():
timestamps = {}
def pack(target, sources, no_compress, verbose):
from cStringIO import StringIO
from six import StringIO
outtype, outtxt = target.split(".")[-1], ''
jsm = JavascriptMinify()

View file

@ -5,11 +5,11 @@ from __future__ import unicode_literals, absolute_import, print_function
import sys
import click
import cProfile
import StringIO
import pstats
import frappe
import frappe.utils
from functools import wraps
from six import StringIO
click.disable_unicode_literals_warning = True
@ -25,7 +25,7 @@ def pass_context(f):
if profile:
pr.disable()
s = StringIO.StringIO()
s = StringIO()
ps = pstats.Stats(pr, stream=s)\
.sort_stats('cumtime', 'tottime', 'ncalls')
ps.print_stats()

View file

@ -15,7 +15,6 @@ import os
import shutil
import requests
import requests.exceptions
import StringIO
import mimetypes, imghdr
from frappe.utils.file_manager import delete_file_data_content, get_content_hash, get_random_filename
@ -23,6 +22,7 @@ from frappe import _
from frappe.utils.nestedset import NestedSet
from frappe.utils import strip, get_files_path
from PIL import Image, ImageOps
from six import StringIO
import zipfile
class FolderNotEmpty(frappe.ValidationError): pass
@ -372,7 +372,7 @@ def get_web_image(file_url):
frappe.msgprint(_("Unable to read file format for {0}").format(file_url))
raise
image = Image.open(StringIO.StringIO(r.content))
image = Image.open(StringIO(r.content))
try:
filename, extn = file_url.rsplit("/", 1)[1].rsplit(".", 1)

View file

@ -53,7 +53,7 @@ def make_csv_output(res, dt):
"""send method response as downloadable CSV file"""
import frappe
from cStringIO import StringIO
from six import StringIO
import csv
f = StringIO()

View file

@ -239,7 +239,7 @@ def runquery_csv():
rows = [[rep_name], out['colnames']] + out['values']
from cStringIO import StringIO
from six import StringIO
import csv
f = StringIO()

View file

@ -145,7 +145,7 @@ def export_query():
# convert to csv
import csv
from cStringIO import StringIO
from six import StringIO
f = StringIO()
writer = csv.writer(f)

View file

@ -10,8 +10,8 @@ import importlib
from frappe.modules import load_doctype_module, get_module_name
from frappe.utils import cstr
import frappe.utils.scheduler
import cProfile, StringIO, pstats
import cProfile, pstats
from six import StringIO
unittest_runner = unittest.TextTestRunner
@ -110,7 +110,7 @@ def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False):
if profile:
pr.disable()
s = StringIO.StringIO()
s = StringIO()
ps = pstats.Stats(pr, stream=s).sort_stats('cumulative')
ps.print_stats()
print(s.getvalue())
@ -167,7 +167,7 @@ def _run_unittest(module, verbose=False, tests=(), profile=False):
if profile:
pr.disable()
s = StringIO.StringIO()
s = StringIO()
ps = pstats.Stats(pr, stream=s).sort_stats('cumulative')
ps.print_stats()
print(s.getvalue())

View file

@ -5,7 +5,8 @@ from __future__ import unicode_literals
import frappe
from frappe import msgprint, _
import json
import csv, cStringIO
import csv
from six import StringIO
from frappe.utils import encode, cstr, cint, flt, comma_or
def read_csv_content_from_uploaded_file(ignore_encoding=False):
@ -97,7 +98,7 @@ def to_csv(data):
class UnicodeWriter:
def __init__(self, encoding="utf-8"):
self.encoding = encoding
self.queue = cStringIO.StringIO()
self.queue = StringIO()
self.writer = csv.writer(self.queue, quoting=csv.QUOTE_NONNUMERIC)
def writerow(self, row):

View file

@ -1,8 +1,8 @@
from PIL import Image, ImageDraw
from hashlib import md5
import base64
import StringIO
import random
from six import StringIO
GRID_SIZE = 5
BORDER_SIZE = 20
@ -98,7 +98,7 @@ class Identicon(object):
bug report: https://github.com/liuzheng712/identicons/issues
'''
self.calculate()
fp = StringIO.StringIO()
fp = StringIO()
self.image.encoderinfo = {}
self.image.encoderconfig = ()

View file

@ -28,7 +28,7 @@
# SOFTWARE.
# */
from StringIO import StringIO
from six import StringIO
def jsmin(js):
ins = StringIO(js)

View file

@ -6,9 +6,9 @@ import frappe
from frappe.utils import encode, cstr, cint, flt, comma_or
import openpyxl
from cStringIO import StringIO
from openpyxl.styles import Font
from openpyxl import load_workbook
from six import StringIO
# return xlsx file object