File 75210ed3-replace-StringIO-with-io.patch of Package virt-manager

Overview Repositories Revisions Requests Users Attributes Meta

File 75210ed3-replace-StringIO-with-io.patch of Package virt-manager (Revision 516fd06e4d919b2c571c0a0961cd0151)

Currently displaying revision 516fd06e4d919b2c571c0a0961cd0151 , Show latest

Subject: Replace StringIO with io.(StringIO or BytesIO)
From: Radostin Stoyanov rstoyanov1@gmail.com Wed Oct 11 12:35:50 2017 +0100
Date: Fri Oct 20 13:18:31 2017 -0400:
Git: 75210ed37c0c5de569de73e04488808a2521a011

StringIO and cStringIO modules no longer exists in Python 3. [1]
Use either io.StringIO [2] for text or io.BytesIO [3] for bytes.

[1] http://docs.python.org/3.0/whatsnew/3.0.html
[2] https://docs.python.org/3/library/io.html#text-i-o
[3] https://docs.python.org/3/library/io.html#binary-i-o

Index: virt-manager-1.4.3/tests/clitest.py
===================================================================
--- virt-manager-1.4.3.orig/tests/clitest.py
+++ virt-manager-1.4.3/tests/clitest.py
@@ -16,6 +16,7 @@
 # MA 02110-1301 USA.
 
 import atexit
+import io
 import logging
 import os
 import shlex
@@ -23,7 +24,6 @@ import shutil
 import sys
 import traceback
 import unittest
-import StringIO
 
 from virtinst import support
 
@@ -144,7 +144,7 @@ class Command(object):
         oldstdin = sys.stdin
         oldargv = sys.argv
         try:
-            out = StringIO.StringIO()
+            out = io.BytesIO()
             sys.stdout = out
             sys.stderr = out
             sys.argv = self.argv
Index: virt-manager-1.4.3/tests/virtconvtest.py
===================================================================
--- virt-manager-1.4.3.orig/tests/virtconvtest.py
+++ virt-manager-1.4.3/tests/virtconvtest.py
@@ -18,8 +18,8 @@
 from __future__ import print_function
 
 import glob
+import io
 import os
-import StringIO
 import unittest
 
 from virtconv import VirtConverter
@@ -32,7 +32,7 @@ out_dir = base_dir + "libvirt_output"
 
 class TestVirtConv(unittest.TestCase):
     def _convert_helper(self, infile, outfile, in_type, disk_format):
-        outbuf = StringIO.StringIO()
+        outbuf = io.BytesIO()
         def print_cb(msg):
             print(msg, file=outbuf)
 
Index: virt-manager-1.4.3/virtManager/create.py
===================================================================
--- virt-manager-1.4.3.orig/virtManager/create.py
+++ virt-manager-1.4.3/virtManager/create.py
@@ -18,10 +18,10 @@
 # MA 02110-1301 USA.
 #
 
+import io
 import logging
 import pkgutil
 import os
-import cStringIO
 import threading
 import time
 
@@ -2633,7 +2633,7 @@ class vmmCreate(vmmGObjectUI):
                 return True
 
         # Use string buffer to store log messages
-        log_stream = cStringIO.StringIO()
+        log_stream = io.StringIO()
 
         # Get virt-bootstrap logger
         vbLogger = logging.getLogger('virtBootstrap')
Index: virt-manager-1.4.3/virtManager/snapshots.py
===================================================================
--- virt-manager-1.4.3.orig/virtManager/snapshots.py
+++ virt-manager-1.4.3/virtManager/snapshots.py
@@ -20,9 +20,9 @@
 
 import datetime
 import glob
+import io
 import logging
 import os
-import StringIO
 
 from gi.repository import Gdk
 from gi.repository import GdkPixbuf
@@ -394,7 +394,7 @@ class vmmSnapshotPage(vmmGObjectUI):
             flags = 0
             mime = self.vm.get_backend().screenshot(stream, screen, flags)
 
-            ret = StringIO.StringIO()
+            ret = io.StringIO()
             def _write_cb(_stream, data, userdata):
                 ignore = stream
                 ignore = userdata
Index: virt-manager-1.4.3/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.4.3.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.3/virtinst/urlfetcher.py
@@ -21,11 +21,11 @@
 
 import ConfigParser
 import ftplib
+import io
 import logging
 import os
 import re
 import stat
-import StringIO
 import subprocess
 import tempfile
 import urllib2
@@ -104,6 +104,8 @@ class _URLFetcher(object):
             buff = urlobj.read(self._block_size)
             if not buff:
                 break
+            if isinstance(fileobj, io.StringIO) and type(buff) is str:
+                buff = unicode(buff)
             fileobj.write(buff)
             total += len(buff)
             self.meter.update(total)
@@ -169,7 +171,7 @@ class _URLFetcher(object):
         """
         Grab the passed filename from self.location and return it as a string
         """
-        fileobj = StringIO.StringIO()
+        fileobj = io.StringIO()
         self._grabURL(filename, fileobj)
         return fileobj.getvalue()

Places

File 75210ed3-replace-StringIO-with-io.patch of Package virt-manager (Revision 516fd06e4d919b2c571c0a0961cd0151)

Places