[qpid-python] 04/06: QPID-8631: fallback import for `cStringIO.StringIO` or `io.StringIO`

[jd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-python.git

commit 045e90408b4d3416e1ae4af893c4b4426d9e98a5
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Sat Apr 8 17:40:19 2023 +0200

    QPID-8631: fallback import for `cStringIO.StringIO` or `io.StringIO`
---
 mllib/__init__.py    | 5 ++++-
 mllib/transforms.py  | 5 ++++-
 qpid/codec.py        | 5 ++++-
 qpid/connection08.py | 5 ++++-
 qpid/management.py   | 5 ++++-
 qpid/peer.py         | 5 ++++-
 qpid/tests/codec.py  | 5 ++++-
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/mllib/__init__.py b/mllib/__init__.py
index 7d0ba99..f41ebe6 100644
--- a/mllib/__init__.py
+++ b/mllib/__init__.py
@@ -26,7 +26,10 @@ import os, dom, transforms, parsers, sys
 import xml.sax, types
 from xml.sax.handler import ErrorHandler
 from xml.sax.xmlreader import InputSource
-from cStringIO import StringIO
+try:
+  from cStringIO import StringIO
+except ImportError:
+  from io import StringIO
 
 def transform(node, *args):
   result = node
diff --git a/mllib/transforms.py b/mllib/transforms.py
index dc258cc..397e25c 100644
--- a/mllib/transforms.py
+++ b/mllib/transforms.py
@@ -22,7 +22,10 @@ Useful transforms for dom objects.
 """
 
 import mllib.dom
-from cStringIO import StringIO
+try:
+  from cStringIO import StringIO
+except ImportError:
+  from io import StringIO
 
 class Visitor:
 
diff --git a/qpid/codec.py b/qpid/codec.py
index 8f9d374..78ea0d0 100644
--- a/qpid/codec.py
+++ b/qpid/codec.py
@@ -27,7 +27,10 @@ The unit test for this module is located in tests/codec.py
 """
 
 import re, qpid, spec08, os
-from cStringIO import StringIO
+try:
+  from cStringIO import StringIO
+except ImportError:
+  from io import StringIO
 from struct import *
 from reference import ReferenceId
 from logging import getLogger
diff --git a/qpid/connection08.py b/qpid/connection08.py
index 23f75a2..d0faa00 100644
--- a/qpid/connection08.py
+++ b/qpid/connection08.py
@@ -24,7 +24,10 @@ server, or even a proxy implementation.
 """
 
 import socket, codec, errno, qpid
-from cStringIO import StringIO
+try:
+  from cStringIO import StringIO
+except ImportError:
+  from io import StringIO
 from codec import EOF
 from compat import SHUT_RDWR
 from exceptions import VersionError
diff --git a/qpid/management.py b/qpid/management.py
index 2e76436..cd8e6b5 100644
--- a/qpid/management.py
+++ b/qpid/management.py
@@ -31,7 +31,10 @@ import socket
 from threading    import Thread
 from datatypes    import Message, RangedSet
 from time         import time
-from cStringIO    import StringIO
+try:
+  from cStringIO    import StringIO
+except ImportError:
+  from io import StringIO
 from codec010     import StringCodec as Codec
 from threading    import Lock, Condition
 
diff --git a/qpid/peer.py b/qpid/peer.py
index fddddfd..b6de3ce 100644
--- a/qpid/peer.py
+++ b/qpid/peer.py
@@ -29,7 +29,10 @@ from connection08 import EOF, Method, Header, Body, Request, Response, VersionEr
 from message import Message
 from queue import Queue, Closed as QueueClosed
 from content import Content
-from cStringIO import StringIO
+try:
+  from cStringIO import StringIO
+except ImportError:
+  from io import StringIO
 from time import time
 from exceptions import Closed, Timeout, ContentError
 from logging import getLogger
diff --git a/qpid/tests/codec.py b/qpid/tests/codec.py
index 1c68cfe..e18b01b 100644
--- a/qpid/tests/codec.py
+++ b/qpid/tests/codec.py
@@ -22,7 +22,10 @@ from __future__ import print_function
 import unittest
 from qpid.codec import Codec
 from qpid.spec08 import load
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
 from qpid.reference import ReferenceId
 
 __doc__ = """


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org