Merge pull request #583 from tahoe-lafs/3011-six-moves-stringio

replaced StringIO imports with six.moves

integration/test_tor.py

@@ -5,7 +5,7 @@ import time
 import shutil
 from os import mkdir, unlink, listdir
 from os.path import join, exists
-from StringIO import StringIO
+from six.moves import StringIO
 
 from twisted.internet.protocol import ProcessProtocol
 from twisted.internet.error import ProcessExitedAlready, ProcessDone

integration/util.py

@@ -2,7 +2,7 @@ import sys
 import time
 from os import mkdir
 from os.path import exists, join
-from StringIO import StringIO
+from six.moves import StringIO
 from functools import partial
 
 from twisted.internet.defer import Deferred, succeed

misc/coding_tools/graph-deps.py

@@ -22,9 +22,10 @@
 # wheels can be built with py3.
 
 from __future__ import unicode_literals, print_function
-import os, sys, subprocess, json, tempfile, zipfile, io, re, itertools
+import os, sys, subprocess, json, tempfile, zipfile, re, itertools
 import email.parser
 from pprint import pprint
+from six.moves import StringIO
 import click
 
 all_packages = {} # name -> version
@@ -218,7 +219,7 @@ def scan(name, extra=None, path=""):
                  path=path+"->%s[%s]" % (dep_name, dep_extra))
 
 def generate_dot():
-    f = io.StringIO()
+    f = StringIO()
     f.write("digraph {\n")
     for name, extra in extras_to_show.keys():
         version = all_packages[name]

newsfragments/3011.other

@@ -0,0 +1 @@
+Replace StringIO imports with six.moves.

src/allmydata/immutable/literal.py

@@ -1,4 +1,4 @@
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from zope.interface import implementer
 from twisted.internet import defer
 from twisted.internet.interfaces import IPushProducer

src/allmydata/immutable/upload.py

@@ -25,7 +25,7 @@ from allmydata.interfaces import IUploadable, IUploader, IUploadResults, \
 from allmydata.immutable import layout
 from pycryptopp.cipher.aes import AES
 
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from happiness_upload import share_placement, calculate_happiness
 
 

src/allmydata/mutable/publish.py

@@ -1,7 +1,5 @@
-
-
 import os, time
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from itertools import count
 from zope.interface import implementer
 from twisted.internet import defer

src/allmydata/scripts/common_http.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 import os
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 import urlparse, httplib
 import allmydata # for __full_version__
 

src/allmydata/scripts/magic_folder_cli.py

@@ -3,7 +3,7 @@ from __future__ import print_function
 import os
 import urllib
 from types import NoneType
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from datetime import datetime
 import json
 

src/allmydata/scripts/tahoe_cp.py

@@ -4,7 +4,7 @@ import os.path
 import urllib
 import json
 from collections import defaultdict
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.python.failure import Failure
 from allmydata.scripts.common import get_alias, escape_path, \
                                      DefaultAliasMarker, TahoeError

src/allmydata/scripts/tahoe_put.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 import urllib
 
 from allmydata.scripts.common_http import do_http, format_http_success, format_http_error

src/allmydata/test/check_memory.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 import os, shutil, sys, urllib, time, stat, urlparse
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.internet import defer, reactor, protocol, error
 from twisted.application import service, internet
 from twisted.web import client as tw_client

src/allmydata/test/cli/test_backup.py

@@ -1,6 +1,5 @@
-
 import os.path
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from datetime import timedelta
 import re
 

src/allmydata/test/cli/test_check.py

@@ -1,7 +1,7 @@
 import os.path
 import json
 from twisted.trial import unittest
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 
 from allmydata import uri
 from allmydata.util import base32

src/allmydata/test/cli/test_cli.py

@@ -1,6 +1,6 @@
 
 import os.path
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 import urllib, sys
 import re
 from mock import patch

src/allmydata/test/cli/test_create_alias.py

@@ -1,4 +1,4 @@
-from StringIO import StringIO
+from six.moves import StringIO
 import os.path
 from twisted.trial import unittest
 import urllib

src/allmydata/test/cli/test_daemonize.py

@@ -1,7 +1,7 @@
 import os
 from os.path import dirname, join
 from mock import patch, Mock
-from StringIO import StringIO
+from six.moves import StringIO
 from sys import getfilesystemencoding
 from twisted.trial import unittest
 from allmydata.scripts import runner

src/allmydata/test/cli/test_start.py

@@ -4,7 +4,7 @@ import shutil
 import subprocess
 from os.path import join
 from mock import patch
-from StringIO import StringIO
+from six.moves import StringIO
 from functools import partial
 
 from twisted.trial import unittest

src/allmydata/test/cli/test_status.py

@@ -2,7 +2,7 @@ import os
 import mock
 import json
 import tempfile
-from StringIO import StringIO
+from six.moves import StringIO
 from os.path import join
 from UserDict import UserDict
 

src/allmydata/test/mutable/test_filehandle.py

@@ -1,5 +1,5 @@
 import os
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.trial import unittest
 from allmydata.mutable.publish import MutableFileHandle
 

src/allmydata/test/mutable/test_filenode.py

@@ -1,4 +1,4 @@
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.internet import defer, reactor
 from twisted.trial import unittest
 from allmydata import uri, client

src/allmydata/test/mutable/test_roundtrip.py

@@ -1,7 +1,6 @@
 from __future__ import print_function
 
-from cStringIO import StringIO
-
+from six.moves import cStringIO as StringIO
 from twisted.trial import unittest
 from twisted.internet import defer
 

src/allmydata/test/mutable/test_version.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 import os
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.internet import defer
 from twisted.trial import unittest
 from allmydata import uri

src/allmydata/test/mutable/util.py

@@ -1,4 +1,4 @@
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.internet import defer, reactor
 from foolscap.api import eventually, fireEventually
 from allmydata import client

src/allmydata/test/test_backupdb.py

@@ -1,6 +1,6 @@
 
 import os.path, time
-from StringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.trial import unittest
 
 from allmydata.util import fileutil

src/allmydata/test/test_i2p_provider.py

@@ -2,7 +2,7 @@ import os
 from twisted.trial import unittest
 from twisted.internet import defer, error
 from twisted.python.usage import UsageError
-from StringIO import StringIO
+from six.moves import StringIO
 import mock
 from ..util import i2p_provider
 from ..scripts import create_node, runner

src/allmydata/test/test_tor_provider.py

@@ -1,7 +1,7 @@
 import os
 from twisted.trial import unittest
 from twisted.internet import defer, error
-from StringIO import StringIO
+from six.moves import StringIO
 import mock
 from ..util import tor_provider
 from ..scripts import create_node, runner

src/allmydata/test/test_upload.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os, shutil
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
 from twisted.trial import unittest
 from twisted.python.failure import Failure
 from twisted.internet import defer, task

src/allmydata/test/test_util.py

@@ -5,7 +5,7 @@ def foo(): pass # keep the line number constant
 
 import os, time, sys
 import yaml
-from StringIO import StringIO
+from six.moves import StringIO
 from datetime import timedelta
 from twisted.trial import unittest
 from twisted.internet import defer, reactor

src/allmydata/test/web/test_grid.py

@@ -2,7 +2,7 @@ from __future__ import print_function
 
 import os.path, re, urllib
 import json
-from StringIO import StringIO
+from six.moves import StringIO
 from nevow import rend
 from twisted.trial import unittest
 from allmydata import uri, dirnode