[python-debian/master 14/36] Use io.StringIO if StringIO.StringIO is absent (as in Python 3).

[Colin Watson]

---
 lib/debian/deb822.py |   11 +++++++----
 tests/test_deb822.py |    5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
index e2a277f..13efa32 100644
--- a/lib/debian/deb822.py
+++ b/lib/debian/deb822.py
@@ -41,7 +41,10 @@ import subprocess
 import sys
 import warnings
 
-import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 import UserDict
 
 
@@ -429,7 +432,7 @@ class Deb822(Deb822Dict):
         """
 
         if fd is None:
-            fd = StringIO.StringIO()
+            fd = StringIO()
             return_string = True
         else:
             return_string = False
@@ -999,7 +1002,7 @@ class _multivalued(Deb822):
     def get_as_string(self, key):
         keyl = key.lower()
         if keyl in self._multivalued_fields:
-            fd = StringIO.StringIO()
+            fd = StringIO()
             if hasattr(self[key], 'keys'): # single-line
                 array = [ self[key] ]
             else: # multi-line
@@ -1063,7 +1066,7 @@ class _gpg_multivalued(_multivalued):
                     # Empty input
                     gpg_pre_lines = lines = gpg_post_lines = []
                 if gpg_pre_lines and gpg_post_lines:
-                    raw_text = StringIO.StringIO()
+                    raw_text = StringIO()
                     raw_text.write("\n".join(gpg_pre_lines))
                     raw_text.write("\n\n")
                     raw_text.write("\n".join(lines))
diff --git a/tests/test_deb822.py b/tests/test_deb822.py
index 0ed2213..60ca13f 100755
--- a/tests/test_deb822.py
+++ b/tests/test_deb822.py
@@ -25,7 +25,10 @@ import sys
 import tempfile
 import unittest
 import warnings
-from StringIO import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 sys.path.insert(0, '../lib/')
 
-- 
1.7.2.5