From 34d1928766bcae11d8f679a6bf361d9210b6429e Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 9 Aug 2007 01:03:29 +0000 Subject: SF patch# 1770008 by Christian Heimes (plus some extras). Completely get rid of StringIO.py and cStringIO.c. I had to fix a few tests and modules beyond what Christian did, and invent a few conventions. E.g. in elementtree, I chose to write/return Unicode strings whe no encoding is given, but bytes when an explicit encoding is given. Also mimetools was made to always assume binary files. --- Lib/email/generator.py | 2 +- Lib/email/iterators.py | 2 +- Lib/email/message.py | 2 +- Lib/email/mime/audio.py | 2 +- Lib/email/parser.py | 2 +- Lib/email/test/test_email.py | 2 +- Lib/email/test/test_email_renamed.py | 2 +- Lib/email/test/test_email_torture.py | 2 +- Lib/email/utils.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Lib/email') diff --git a/Lib/email/generator.py b/Lib/email/generator.py index c480229e15..fb03c9f4dd 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -12,7 +12,7 @@ import time import random import warnings -from cStringIO import StringIO +from io import StringIO from email.header import Header UNDERSCORE = '_' diff --git a/Lib/email/iterators.py b/Lib/email/iterators.py index 155e19eace..e4476e3bd2 100644 --- a/Lib/email/iterators.py +++ b/Lib/email/iterators.py @@ -12,7 +12,7 @@ __all__ = [ ] import sys -from cStringIO import StringIO +from io import StringIO diff --git a/Lib/email/message.py b/Lib/email/message.py index 1767bfb622..78e7d82c3e 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -10,7 +10,7 @@ import re import uu import binascii import warnings -from cStringIO import StringIO +from io import StringIO # Intrapackage imports import email.charset diff --git a/Lib/email/mime/audio.py b/Lib/email/mime/audio.py index c7290c4b1c..f40bcbdd4f 100644 --- a/Lib/email/mime/audio.py +++ b/Lib/email/mime/audio.py @@ -8,7 +8,7 @@ __all__ = ['MIMEAudio'] import sndhdr -from cStringIO import StringIO +from io import StringIO from email import encoders from email.mime.nonmultipart import MIMENonMultipart diff --git a/Lib/email/parser.py b/Lib/email/parser.py index 2fcaf25456..782b985c07 100644 --- a/Lib/email/parser.py +++ b/Lib/email/parser.py @@ -7,7 +7,7 @@ __all__ = ['Parser', 'HeaderParser'] import warnings -from cStringIO import StringIO +from io import StringIO from email.feedparser import FeedParser from email.message import Message diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index c7c61efeee..5e8d652db7 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -9,7 +9,7 @@ import base64 import difflib import unittest import warnings -from cStringIO import StringIO +from io import StringIO import email diff --git a/Lib/email/test/test_email_renamed.py b/Lib/email/test/test_email_renamed.py index 4688a1b5a0..ea5b1a13e3 100644 --- a/Lib/email/test/test_email_renamed.py +++ b/Lib/email/test/test_email_renamed.py @@ -9,7 +9,7 @@ import base64 import difflib import unittest import warnings -from cStringIO import StringIO +from io import StringIO import email diff --git a/Lib/email/test/test_email_torture.py b/Lib/email/test/test_email_torture.py index d708b74f9a..67f106acf3 100644 --- a/Lib/email/test/test_email_torture.py +++ b/Lib/email/test/test_email_torture.py @@ -9,7 +9,7 @@ import sys import os import unittest -from cStringIO import StringIO +from io import StringIO from types import ListType from email.test.test_email import TestEmailBase diff --git a/Lib/email/utils.py b/Lib/email/utils.py index de9fbf87a5..ce4b31305e 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -27,7 +27,7 @@ import random import socket import urllib import warnings -from cStringIO import StringIO +from io import StringIO from email._parseaddr import quote from email._parseaddr import AddressList as _AddressList -- cgit v1.2.1