py2/py3: import cStringIO from six.moves.

bt5/erp5_access_token/TestTemplateItem/portal_components/test.erp5.testERP5AccessToken.py

@@ -34,7 +34,7 @@ from DateTime import DateTime
 import urllib
 import httplib
 import base64
-import StringIO
+from six.moves import cStringIO as StringIO
 import mock
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Security.ERP5DumbHTTPExtractionPlugin import ERP5DumbHTTPExtractionPlugin
@@ -438,7 +438,7 @@ class TestERP5DumbHTTPExtractionPlugin(AccessTokenTestCase):
     env['GATEWAY_INTERFACE']='CGI/1.1 '
     env['SCRIPT_NAME']='Main'
     env.update(headers)
-    return HTTPRequest(StringIO.StringIO(), env, HTTPResponse())
+    return HTTPRequest(StringIO(), env, HTTPResponse())
 
   def test_working_authentication(self):
     request = self.do_fake_request("GET", {"HTTP_AUTHORIZATION": "Basic " + base64.b64encode("login:password")})

bt5/erp5_accounting/TestTemplateItem/portal_components/test.erp5.testAccounting.py

@@ -30,7 +30,7 @@
 
 """
 
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 import lxml
 
 from DateTime import DateTime

bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_aggregateFrenchAccountingTransactionFile.py

 # coding: utf-8
 import unicodedata
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 import zipfile
 from Products.ERP5Type.Message import translateString
 

bt5/erp5_accounting_l10n_fr/TestTemplateItem/portal_components/test.erp5.testAccounting_l10n_fr.py

@@ -34,7 +34,7 @@ import unittest
 import zipfile
 import email
 import os.path
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from DateTime import DateTime
 
 from lxml import etree

bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_profileContext.py

@@ -20,7 +20,7 @@ zipfile (bool)
   When true, the result is a zip file containing profiling result along with the python code (and, when not possible, the disassembled bytecode) of all files which appear in the profiling result.
   When false, the result is a bare profiling result (cachegrind file format).
 """
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 portal = context.getPortalObject()
 if statistic:
   profiler, retriever = portal.ERP5Site_getStatisticalProfilerAndThread(single=True)

bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_profileProcess.py

@@ -18,7 +18,7 @@ zipfile (bool)
   When false, the result is a bare profiling result (cachegrind file format).
 """
 from time import sleep
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 profiler, thread = context.ERP5Site_getStatisticalProfilerAndThread(single=False)
 with thread:
   sleep(duration)

bt5/erp5_authentication_policy/TestTemplateItem/portal_components/test.erp5.testAuthenticationPolicy.py

@@ -30,9 +30,8 @@
 
 from functools import partial
 import unittest
-import urllib
-import urlparse
-from StringIO import StringIO
+import six.moves.urllib.parse
+from six.moves import cStringIO as StringIO
 import time
 import httplib
 import mock

bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Image.py

@@ -32,7 +32,7 @@
 
 import os
 import subprocess
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base

bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.OOoDocument.py

@@ -27,7 +27,8 @@
 #
 ##############################################################################
 
-import re, zipfile, cStringIO
+import re, zipfile
+from six.moves import cStringIO as StringIO
 from warnings import warn
 from AccessControl import ClassSecurityInfo
 from OFS.Image import Pdata

bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.py

@@ -22,7 +22,7 @@ def generateBarcodeImage(self, barcode_type, data, REQUEST=None):
     output = encoder.get_imagedata()
   elif barcode_type == 'qrcode':
     import qrcode
-    from cStringIO import StringIO
+    from six.moves import cStringIO as StringIO
     fp = StringIO()
     img = qrcode.make(data)
     img.save(fp, 'png')

bt5/erp5_big_file/DocumentTemplateItem/portal_components/document.erp5.BigFile.py

@@ -14,7 +14,7 @@
 #
 ##############################################################################
 
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Base import removeIContentishInterface

bt5/erp5_big_file/TestTemplateItem/portal_components/test.erp5.testBigFile.py

@@ -24,7 +24,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 
 from ZPublisher.HTTPRequest import HTTPRequest
 from ZPublisher.HTTPResponse import HTTPResponse

bt5/erp5_configurator/DocumentTemplateItem/portal_components/document.erp5.CategoriesSpreadsheetConfiguratorItem.py

@@ -27,7 +27,7 @@
 ##############################################################################
 
 import zope.interface
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet

bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.py

@@ -30,17 +30,17 @@
 # This extension should be replaced by a clever parser provided by
 # ERP5OOo or probably by CloudOOo itself.
 
-import StringIO
+from io import BytesIO
 
 def read(self, filename, data):
   """
-  Return a OOCalc as a StringIO
+  Return a OOCalc as a BytesIO
   """
   if data is None:
     oo_template_file = getattr(self, filename)
-    fp = StringIO.StringIO(oo_template_file)
+    fp = BytesIO(oo_template_file)
   else:
-    fp = StringIO.StringIO(data)
+    fp = BytesIO(data)
   fp.filename = filename
   return fp
 

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testAutoLogout.py

@@ -29,7 +29,7 @@
 ##############################################################################
 
 from functools import partial
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 import unittest
 import urllib
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCookieCrumbler.py

@@ -12,7 +12,7 @@
 ##############################################################################
 
 import base64
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 import unittest
 import urllib
 

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testRestrictedPythonSecurity.py

@@ -448,6 +448,8 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
     )
 
   def test_StringIO(self):
+    if six.PY3:
+      return # Python 3's StringIO is cStringIO, thus we just test in test_cStringIO.
     self.createAndRunScript('''
         import StringIO
         s = StringIO.StringIO()
@@ -465,16 +467,16 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
 
   def test_cStringIO(self):
     self.createAndRunScript('''
-        import cStringIO
-        s = cStringIO.StringIO()
+        from six.moves import cStringIO as StringIO
+        s = StringIO()
         s.write("ok")
         return s.getvalue()
         ''',
         expected="ok"
     )
     self.createAndRunScript('''
-        import cStringIO
-        return cStringIO.StringIO("ok").getvalue()
+        from six.moves import cStringIO as StringIO
+        return StringIO("ok").getvalue()
         ''',
         expected="ok"
     )
@@ -696,7 +698,7 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
     for pandas_read_function in ("read_json", "read_csv", "read_fwf"):
       for preparation, prohibited_input in (
         ('', 100),
-        ('from StringIO import StringIO', 'StringIO("[1, 2, 3]")'),
+        ('from six.moves import cStringIO as StringIO', 'StringIO("[1, 2, 3]")'),
       ):
         self.assertRaises(
           ZopeGuardsUnauthorized,

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testXMLPickle.py

@@ -30,7 +30,7 @@ import unittest
 import pickle
 import re
 import xml.sax
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 
 from Products.ERP5Type.XMLExportImport import ppml
 

bt5/erp5_data_notebook/ExtensionTemplateItem/portal_components/extension.erp5.JupyterCompile.py

@@ -2,7 +2,7 @@
 from matplotlib.figure import Figure
 from IPython.core.display import DisplayObject
 from IPython.lib.display import IFrame
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from erp5.portal_type import Image
 from types import ModuleType
 from ZODB.serialize import ObjectWriter

bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testDms.py

@@ -47,7 +47,7 @@
 
 import unittest
 import time
-import StringIO
+from six.moves import cStringIO as StringIO
 from subprocess import Popen, PIPE
 from unittest import expectedFailure
 
@@ -1769,7 +1769,7 @@ class TestDocument(TestDocumentMixin):
     # as it is done in reality
 
     # Mimic the behaviour of a FileUpload from WebPage_view
-    file_like = StringIO.StringIO()
+    file_like = StringIO()
     file_like.write(html_content)
     setattr(file_like, 'filename', 'something.htm')
     web_page.edit(file=file_like)
@@ -2058,7 +2058,7 @@ document.write('<sc'+'ript type="text/javascript" src="http://somosite.bg/utb.ph
     self.assertEqual(document.asText(), 'ERP5 is a free software.')
 
   def test_broken_pdf_asText(self):
-    class StringIOWithFilename(StringIO.StringIO):
+    class StringIOWithFilename(StringIO):
       filename = 'broken.pdf'
     document = self.portal.document_module.newContent(
         portal_type='PDF',
@@ -2071,7 +2071,7 @@ document.write('<sc'+'ript type="text/javascript" src="http://somosite.bg/utb.ph
     pdf_writer = PyPDF2.PdfFileWriter()
     pdf_writer.addPage(pdf_reader.getPage(0))
     pdf_writer.encrypt('secret')
-    encrypted_pdf_stream = StringIO.StringIO()
+    encrypted_pdf_stream = StringIO()
     pdf_writer.write(encrypted_pdf_stream)
     document = self.portal.document_module.newContent(
         portal_type='PDF',

bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testERP5WebWithDms.py

@@ -32,7 +32,7 @@ import os
 import quopri
 import functools
 import requests
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from lxml import etree
 from base64 import b64decode, b64encode
 from email.parser import Parser as EmailParser

bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testWebDavSupport.py

@@ -34,8 +34,8 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.utils import FileUpload
 from unittest import expectedFailure
 
-import httplib
-from StringIO import StringIO
+import six.moves.http_client
+from six.moves import cStringIO as StringIO
 from DateTime import DateTime
 
 from lxml import etree

bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/Base_uploadDocumentFromCamera.py

-from StringIO import StringIO
+from io import BytesIO
 
-class StringIOWithFileName(StringIO):
+class BytesIOWithFileName(BytesIO):
   filename =  "{}.pdf".format(
     kw.get("title") or DateTime().strftime('%d-%m-%Y_%Hh%M'))
 
@@ -9,7 +9,7 @@ active_process = portal.restrictedTraverse(str(active_process_url))
 
 pdf_data_list = context.Base_getTempImageList(active_process, image_list)
 pdf_data = context.ERP5Site_mergePDFList(pdf_data_list=pdf_data_list)
-file_object = StringIOWithFileName(pdf_data)
+file_object = BytesIOWithFileName(pdf_data)
 
 context.Base_contribute(
     file=file_object,

bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.py

@@ -53,7 +53,7 @@ def getActionTitleListFromAllActionProvider(portal):
   return result
 
 
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from zope.tal.htmltalparser import HTMLTALParser
 from zope.tal.talparser import TALParser
 from zope.tal.talgenerator import TALGenerator

bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalJsonStyle.py

@@ -12,7 +12,7 @@ from ZPublisher.HTTPResponse import HTTPResponse
 
 import base64
 import DateTime
-import StringIO
+from six.moves import cStringIO as StringIO
 import json
 import re
 from six.moves.urllib.parse import quote, quote_plus
@@ -118,7 +118,7 @@ def do_fake_request(request_method, headers=None, data=()):
   env['GATEWAY_INTERFACE']='CGI/1.1 '
   env['SCRIPT_NAME']='Main'
   env.update(headers)
-  body_stream = StringIO.StringIO()
+  body_stream = StringIO()
 
   # for some mysterious reason QUERY_STRING does not get parsed into data fields
   if data and request_method.upper() == 'GET':

bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_submitSoftwarePublication.py

@@ -60,7 +60,7 @@ if not zip_file:
   rejectSoftwarePublication(software_publication)
   return
 
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 import zipfile
 from zipfile import BadZipfile
 

bt5/erp5_officejs_support_request_ui_test/TestTemplateItem/portal_components/test.erp5.testSupportRequest.py

@@ -25,9 +25,9 @@
 #
 ##############################################################################
 import json
-from StringIO import StringIO
-import urlparse
-import httplib
+from six.moves import cStringIO as StringIO
+import six.moves.urllib.parse
+import six.moves.http_client
 
 import feedparser
 from DateTime import DateTime

bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.py

@@ -35,7 +35,7 @@ def mergePDFList(self, pdf_data_list, start_on_recto=False):
   to have each PDF as the recto page. This is useful if you have to print the
   merged pdf in recto/verso mode.
   """
-  from StringIO import StringIO
+  from six.moves import cStringIO as StringIO
   from PyPDF2 import PdfFileWriter, PdfFileReader
 
   output = PdfFileWriter()

bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py

@@ -18,7 +18,7 @@
 
 from __future__ import print_function
 import os, sys, shutil, tempfile
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from zLOG import LOG,ERROR,INFO,WARNING
 from OFS.Image import File, Image
 import os, transaction

bt5/erp5_safeimage/SkinTemplateItem/portal_skins/erp5_safeimage/SeleniumSafeImage_uploadFile.py

 #from Products.ERP5.Document.TileImageTransformed import TileImageTransformed
-#from cStringIO import StringIO
+#from six.moves import cStringIO as StringIO
 
 
 portal = context.getPortalObject()

bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testInvoice.py

@@ -563,8 +563,8 @@ class TestInvoice(TestInvoiceMixin):
     invoice.confirm()
     self.tic()
     odt = invoice.Invoice_viewAsODT()
-    import cStringIO
-    output = cStringIO.StringIO()
+    from io import BytesIO
+    output = BytesIO()
     output.write(odt)
     m = OpenDocumentTextFile(output)
     text_content=m.toString().encode('ascii','replace')

bt5/erp5_ui_test/TestTemplateItem/portal_components/test.erp5.testListBox.py

@@ -39,7 +39,7 @@ from Testing import ZopeTestCase
 from Products.ERP5Type.Globals import get_request
 from Products.ERP5Type.tests.utils import createZODBPythonScript
 from ZPublisher.HTTPRequest import FileUpload
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from Products.ERP5Form.Selection import Selection
 from Products.Formulator.TALESField import TALESMethod
 from Products.ERP5Form.ListBox import ListBoxHTMLRenderer

bt5/erp5_ui_test/TestTemplateItem/portal_components/test.erp5.testPlanningBox.py

@@ -30,7 +30,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.ERP5Type.Globals import get_request
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from DateTime import DateTime
 
 class DummyFieldStorage:

bt5/erp5_web/TestTemplateItem/portal_components/test.erp5.testERP5Web.py

@@ -32,8 +32,8 @@ import re
 import requests
 import time
 from unittest import expectedFailure, skip
-from StringIO import StringIO
-from urllib import urlencode
+from six.moves import cStringIO as StringIO
+from six.moves.urllib.parse import urlencode
 from AccessControl import Unauthorized
 from Testing import ZopeTestCase
 from DateTime import DateTime

bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py

@@ -25,7 +25,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import StringIO
+from six.moves import cStringIO as StringIO
 import textwrap
 import time
 
@@ -332,7 +332,7 @@ class TestRenderUpdateTranslationData(RenderJSUpgradeTestCase):
   def test_WebSite_getTranslationDataTextContent_extract_from_file(self):
     self.portal.portal_skins.custom.manage_addProduct['OFS'].manage_addFile(
         'test_portal_skins_gadget.html',
-        file=StringIO.StringIO(textwrap.dedent('''
+        file=StringIO(textwrap.dedent('''
           <html>
           <!--
            data-i18n=Message from file

erp5/util/benchmark/result.py

@@ -332,7 +332,7 @@ class CSVBenchmarkResult(BenchmarkResult):
       self.logger.error(logged_msg)
       raise RuntimeError(msg)
 
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 
 from six.moves import xmlrpc_client as xmlrpclib
 import datetime

product/ERP5Type/Pandas.py

@@ -37,10 +37,7 @@ from pandas import *
 import six as _six
 from AccessControl.ZopeGuards import Unauthorized as _ZopeGuardsUnauthorized
 
-if _six.PY2:
-  from StringIO import StringIO as _StringIO
-else:
-  from io import StringIO as _StringIO
+from six.moves import cStringIO as _StringIO
 
 
 def _addRestrictedPandasReadFunction(function_name):

product/ERP5Type/patches/urllib_opener.py

@@ -29,9 +29,8 @@
 
 # Install openers
 # -> testTemplateTool.TestTemplateTool.test_getBusinessTemplateUrl
-import urllib
-import urllib2
-import cStringIO
+import six.moves.urllib.request, six.moves.urllib.parse, six.moves.urllib.error
+from six.moves import cStringIO as StringIO
 import socket
 import os
 import dircache
@@ -61,7 +60,7 @@ class DirectoryFileHandler(urllib2.FileHandler):
         size = stats.st_size
         modified = formatdate(stats.st_mtime, usegmt=True)
         mtype = mimetypes.guess_type(file)[0]
-        headers = mimetools.Message(cStringIO.StringIO(
+        headers = mimetools.Message(StringIO(
             'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
             (mtype or 'text/plain', size, modified)))
         if host:
@@ -70,14 +69,14 @@ class DirectoryFileHandler(urllib2.FileHandler):
            (not port and socket.gethostbyname(host) in self.get_names()):
             try:
               file_list = dircache.listdir(localfile)
-              s = cStringIO.StringIO()
+              s = StringIO()
               s.write('<html><head><base href="%s"/></head><body>' % ('file:' + file))
               s.write('<p>Directory Content:</p>')
               for f in file_list:
                 s.write('<p><a href="%s">%s</a></p>\n' % (urllib.quote(f), f))
               s.write('</body></html>')
               s.seek(0)
-              headers = mimetools.Message(cStringIO.StringIO(
+              headers = mimetools.Message(StringIO(
                   'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
                   ('text/html', size, modified)))
               return urllib2.addinfourl(s, headers, 'file:' + file)

product/ERP5Type/tests/ERP5TypeLiveTestCase.py

@@ -256,7 +256,7 @@ class ERP5TypeTestReLoader(ERP5TypeTestLoader):
 
 def runLiveTest(test_list, verbosity=1, stream=None, request_server_url=None, **kw):
   from Products.ERP5Type.tests.runUnitTest import DebugTestResult
-  from StringIO import StringIO
+  from six.moves import StringIO
   # Add path of the TestTemplateItem folder of the instance
   path = kw.get('path', None)
   if path is not None and path not in sys.path:

product/ERP5Type/tests/testUpgradeInstanceWithOldDataFs.py

@@ -27,7 +27,7 @@
 ##############################################################################
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type import WITH_LEGACY_WORKFLOW
-import StringIO
+from six.moves import cStringIO as StringIO
 import unittest
 import urllib
 import httplib
@@ -120,7 +120,7 @@ class TestUpgradeInstanceWithOldDataFs(ERP5TypeTestCase):
     ret = self.publish(
       '%s/portal_alarms/promise_check_upgrade' % self.portal.getPath(),
       basic='%s:current' % self.id(),
-      stdin=StringIO.StringIO(urllib.urlencode({
+      stdin=StringIO(urllib.urlencode({
         'Base_callDialogMethod:method': '',
         'dialog_id': 'Alarm_viewSolveDialog',
         'dialog_method': 'Alarm_solve',