mirror of
https://github.com/python/cpython.git
synced 2025-11-02 03:01:58 +00:00
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.
This commit is contained in:
parent
918f49e645
commit
34d1928766
78 changed files with 312 additions and 657 deletions
|
|
@ -17,7 +17,7 @@ from Carbon import AE
|
|||
from Carbon.AppleEvents import *
|
||||
import MacOS
|
||||
import Carbon.File
|
||||
import StringIO
|
||||
import io
|
||||
import aetypes
|
||||
from aetypes import mkenum, ObjectSpecifier
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import os
|
|||
import string
|
||||
import sys
|
||||
import types
|
||||
import StringIO
|
||||
import io
|
||||
import keyword
|
||||
import macresource
|
||||
import aetools
|
||||
|
|
@ -266,7 +266,7 @@ def dumpaetelist(aetelist, output):
|
|||
|
||||
def decode(data, verbose=None):
|
||||
"""Decode a resource into a python data structure"""
|
||||
f = StringIO.StringIO(data)
|
||||
f = io.StringIO(data)
|
||||
aete = generic(getaete, f)
|
||||
aete = simplify(aete)
|
||||
processed = f.tell()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue