Py3k-compatible imports for StringIO, ConfigParser.

tseaver · Dec 28, 2012 · 984db7a · 984db7a
1 parent 0f4d77a
commit 984db7a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 31 deletions.
diff --git a/compoze/compozer.py b/compoze/compozer.py
@@ -3,12 +3,13 @@
 Register sub-commands by querying :mod:`setuptools` entry points for the
 group ``compoze_commands``.
 """
-from ConfigParser import ConfigParser
 import optparse
 import pkg_resources
 import textwrap
 import sys
 
+from compoze._compat import ConfigParser
+
 class InvalidCommandLine(ValueError):
     pass
 

diff --git a/compoze/fetcher.py b/compoze/fetcher.py
@@ -4,9 +4,10 @@
 import shutil
 import sys
 import tempfile
-import StringIO
+
 
 from compoze.index import CompozePackageIndex
+from compoze._compat import StringIO
 
 
 class Fetcher:
@@ -130,7 +131,7 @@ def download_distributions(self):
         # XXX ignore same-name problem for now
 
         if len(self.requirements) == 0:
-            msg = StringIO.StringIO()
+            msg = StringIO()
             msg.write('fetch: Either specify requirements, or else '
                                     '--fetch-site-packages .\n\n')
             msg.write(self.usage)
@@ -140,7 +141,7 @@ def download_distributions(self):
             os.makedirs(self.path)
 
         if not os.path.isdir(self.path):
-            msg = StringIO.StringIO()
+            msg = StringIO()
             msg.write('Not a directory: %s\n\n' % self.path)
             msg.write(self.usage)
             raise ValueError(msg.getvalue())

diff --git a/compoze/indexer.py b/compoze/indexer.py
@@ -7,7 +7,8 @@
 import tarfile
 import tempfile
 import zipfile
-import StringIO
+
+from compoze._compat import StringIO
 
 
 class TarArchive:
@@ -147,7 +148,7 @@ def make_index(self, path=None):
             path = self.path
 
         if not os.path.isdir(path):
-            msg = StringIO.StringIO()
+            msg = StringIO()
             msg.write('Not a directory: %s\n\n' % path)
             msg.write(self.usage)
             raise ValueError(msg.getvalue())

diff --git a/compoze/informer.py b/compoze/informer.py
@@ -1,9 +1,9 @@
 import optparse
 import pkg_resources
 import sys
-import StringIO
 
 from compoze.index import CompozePackageIndex
+from compoze._compat import StringIO
 
 class Informer:
     index_factory = CompozePackageIndex # allow shimming for testing
@@ -105,7 +105,7 @@ def show_distributions(self):
         """ Show available distributions for each index.
         """
         if len(self.requirements) == 0:
-            msg = StringIO.StringIO()
+            msg = StringIO()
             msg.write('show: Either specify requirements, or else'
                                     '--fetch-site-packages .\n\n')
             msg.write(self.usage)

diff --git a/compoze/pooler.py b/compoze/pooler.py
@@ -1,9 +1,10 @@
 import optparse
 import os
 import shutil
-import StringIO
 import sys
 
+from compoze._compat import StringIO
+
 ARCHIVE_EXTS = ('tar.gz', 'tgz', 'zip', 'tar.bz2', 'tbz')
 
 
@@ -79,7 +80,7 @@ def move_to_pool(self):
         Ignore any archives which are already symlinks.
         """
         if self.pool_dir is None:
-            msg = StringIO.StringIO()
+            msg = StringIO()
             msg.write('No pool_dir!\n\n')
             msg.write(self.usage)
             raise ValueError(msg.getvalue())

diff --git a/compoze/tests/test_indexer.py b/compoze/tests/test_indexer.py
@@ -302,12 +302,12 @@ def test_make_index_only_non_distributions_raises(self):
 
     def test_make_index_w_distribution(self):
         import os
-        import StringIO
         import tarfile
+        from compoze._compat import StringIO
         tmpdir = self._makeTempdir()
         filename = os.path.join(tmpdir, 'testpackage-3.14.tar.gz')
         archive = tarfile.TarFile(filename, mode='w')
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.writelines(['Metadata-Version: 1.0\n',
                            'Name: testpackage\n',
                            'Version: 3.14\n',
@@ -358,13 +358,13 @@ def test__extractNameVersion_empty_archive(self):
                          (None, None))
 
     def test__extractNameVersion_archive_no_egg_info_or_setup(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.writelines(['README\n',
                           ])
         size = buffer.tell()
@@ -378,13 +378,13 @@ def test__extractNameVersion_archive_no_egg_info_or_setup(self):
                          (None, None))
 
     def test__extractNameVersion_archive_w_pkg_info(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.writelines(['Metadata-Version: 1.0\n',
                            'Name: testpackage\n',
                            'Version: 3.14\n',
@@ -400,13 +400,13 @@ def test__extractNameVersion_archive_w_pkg_info(self):
                          ('testpackage', '3.14'))
 
     def test__extractNameVersion_archive_w_pkg_info_version_first(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.writelines(['Metadata-Version: 1.0\n',
                            'Version: 3.14\n',
                            'Name: testpackage\n',
@@ -422,17 +422,17 @@ def test__extractNameVersion_archive_w_pkg_info_version_first(self):
                          ('testpackage', '3.14'))
 
     def test__extractNameVersion_archive_w_nested_setup(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
         dinfo = tarfile.TarInfo('testpackage')
         dinfo.type = tarfile.DIRTYPE
         dinfo.mode = 0o777
         archive.addfile(dinfo)
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.write(_DUMMY_SETUP)
         size = buffer.tell()
         buffer.seek(0)
@@ -446,9 +446,9 @@ def test__extractNameVersion_archive_w_nested_setup(self):
 
 
     def test__extractNameVersion_archive_w_mulitiple_nested_setups(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
@@ -458,7 +458,7 @@ def add_tar_dir(path):
             dinfo.mode = 0o777
             archive.addfile(dinfo)
         def add_setup(path):
-            buffer = StringIO.StringIO()
+            buffer = StringIO()
             buffer.write(_DUMMY_SETUP.replace('testpackage', path))
             size = buffer.tell()
             buffer.seek(0)
@@ -477,10 +477,10 @@ def add_setup(path):
 
 
 
-    def test__extractNameVersion_archive_w_mulitiple_nested_setup_and_root_setup(self):
-        import StringIO
+    def test__extractNameVersion_archive_w_muli_nested_setup_root_setup(self):
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
@@ -490,7 +490,7 @@ def add_tar_dir(path):
             dinfo.mode = 0o777
             archive.addfile(dinfo)
         def add_setup(path):
-            buffer = StringIO.StringIO()
+            buffer = StringIO()
             buffer.write(_DUMMY_SETUP.replace('testpackage', path))
             size = buffer.tell()
             buffer.seek(0)
@@ -510,17 +510,17 @@ def add_setup(path):
 
 
     def test__extractNameVersion_archive_w_setup_at_root(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
         dinfo = tarfile.TarInfo('testpackage')
         dinfo.type = tarfile.DIRTYPE
         dinfo.mode = 0o777
         archive.addfile(dinfo)
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.write(_DUMMY_SETUP)
         size = buffer.tell()
         buffer.seek(0)
@@ -533,17 +533,17 @@ def test__extractNameVersion_archive_w_setup_at_root(self):
                          ('testpackage', '3.14'))
 
     def test__extractNameVersion_archive_w_erroring_setup(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
         dinfo = tarfile.TarInfo('testpackage')
         dinfo.type = tarfile.DIRTYPE
         dinfo.mode = 0o777
         archive.addfile(dinfo)
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.write(_ERRORING_SETUP)
         size = buffer.tell()
         buffer.seek(0)
@@ -556,17 +556,17 @@ def test__extractNameVersion_archive_w_erroring_setup(self):
                          (None, None))
 
     def test__extractNameVersion_archive_w_noout_setup(self):
-        import StringIO
         import tarfile
         import tempfile
+        from compoze._compat import StringIO
         tested = self._makeOne()
         tfile = tempfile.NamedTemporaryFile(suffix='.tgz')
         archive = tarfile.TarFile(fileobj=tfile, mode='w')
         dinfo = tarfile.TarInfo('testpackage')
         dinfo.type = tarfile.DIRTYPE
         dinfo.mode = 0o777
         archive.addfile(dinfo)
-        buffer = StringIO.StringIO()
+        buffer = StringIO()
         buffer.write(_NOOUT_SETUP)
         size = buffer.tell()
         buffer.seek(0)