diff --git a/mclevelbase.py b/mclevelbase.py index 2910a1d..7a27e20 100644 --- a/mclevelbase.py +++ b/mclevelbase.py @@ -6,7 +6,7 @@ Created on Jul 22, 2011 import os import traceback from datetime import datetime -from StringIO import StringIO +from cStringIO import StringIO from copy import deepcopy import itertools from contextlib import closing, contextmanager diff --git a/nbt.py b/nbt.py index 290b551..ea679a4 100644 --- a/nbt.py +++ b/nbt.py @@ -22,7 +22,7 @@ import collections import itertools import struct import gzip -import StringIO; +from cStringIO import StringIO; import os; from contextlib import closing from numpy import array, zeros, uint8, fromstring @@ -98,7 +98,7 @@ class TAG_Value(object): self.write_value(buf) def saveGzipped(self, filename, compresslevel=1): - sio = StringIO.StringIO(); + sio = StringIO(); #atomic write try: os.rename(filename, filename + ".old"); except Exception, e: @@ -489,10 +489,8 @@ def gunzip(data): return zlib.decompress(data[10:], -zlib.MAX_WBITS) def loadFile(filename): - #sio = StringIO.StringIO(); with file(filename, "rb") as f: inputdata = f.read() - #inputGz = gzip.GzipFile(filename, mode="rb") data = inputdata try: data = gunzip(inputdata) @@ -535,6 +533,6 @@ def load(filename="", buf=None): -__all__ = [a.__name__ for a in tag_classes.itervalues()] + ["loadFile", "gunzip"] +__all__ = [a.__name__ for a in tag_classes.itervalues()] + ["load", "loadFile", "gunzip"] diff --git a/yaml/__init__.py b/yaml/__init__.py index 4c555c7..c4b948d 100644 --- a/yaml/__init__.py +++ b/yaml/__init__.py @@ -129,7 +129,7 @@ def emit(events, stream=None, Dumper=Dumper, """ getvalue = None if stream is None: - from StringIO import StringIO + from cStringIO import StringIO stream = StringIO() getvalue = stream.getvalue dumper = Dumper(stream, canonical=canonical, indent=indent, width=width, @@ -154,7 +154,7 @@ def serialize_all(nodes, stream=None, Dumper=Dumper, getvalue = None if stream is None: if encoding is None: - from StringIO import StringIO + from cStringIO import StringIO else: from cStringIO import StringIO stream = StringIO() @@ -193,7 +193,7 @@ def dump_all(documents, stream=None, Dumper=Dumper, getvalue = None if stream is None: if encoding is None: - from StringIO import StringIO + from cStringIO import StringIO else: from cStringIO import StringIO stream = StringIO()