AstralTransRocketries/pymclevel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to cStringIO, clean up nbt.loadFile, add nbt.load to __all__

Browse Source
This commit is contained in:
David Vierra 2011-11-25 15:48:56 -10:00
parent 7933473be3
commit c48adf501a
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mclevelbase.py
View File

@ -6,7 +6,7 @@ Created on Jul 22, 2011
import os import os
import traceback import traceback
from datetime import datetime from datetime import datetime
from StringIO import StringIO from cStringIO import StringIO
from copy import deepcopy from copy import deepcopy
import itertools import itertools
from contextlib import closing, contextmanager from contextlib import closing, contextmanager

8
nbt.py
View File

@ -22,7 +22,7 @@ import collections
import itertools import itertools
import struct import struct
import gzip import gzip
import StringIO; from cStringIO import StringIO;
import os; import os;
from contextlib import closing from contextlib import closing
from numpy import array, zeros, uint8, fromstring from numpy import array, zeros, uint8, fromstring
@ -98,7 +98,7 @@ class TAG_Value(object):
self.write_value(buf) self.write_value(buf)
def saveGzipped(self, filename, compresslevel=1): def saveGzipped(self, filename, compresslevel=1):
sio = StringIO.StringIO(); sio = StringIO();
#atomic write #atomic write
try: os.rename(filename, filename + ".old"); try: os.rename(filename, filename + ".old");
except Exception, e: except Exception, e:
@ -489,10 +489,8 @@ def gunzip(data):
return zlib.decompress(data[10:], -zlib.MAX_WBITS) return zlib.decompress(data[10:], -zlib.MAX_WBITS)
def loadFile(filename): def loadFile(filename):
#sio = StringIO.StringIO();
with file(filename, "rb") as f: with file(filename, "rb") as f:
inputdata = f.read() inputdata = f.read()
#inputGz = gzip.GzipFile(filename, mode="rb")
data = inputdata data = inputdata
try: try:
data = gunzip(inputdata) 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"]

6
yaml/__init__.py
View File

@ -129,7 +129,7 @@ def emit(events, stream=None, Dumper=Dumper,
""" """
getvalue = None getvalue = None
if stream is None: if stream is None:
from StringIO import StringIO from cStringIO import StringIO
stream = StringIO() stream = StringIO()
getvalue = stream.getvalue getvalue = stream.getvalue
dumper = Dumper(stream, canonical=canonical, indent=indent, width=width, dumper = Dumper(stream, canonical=canonical, indent=indent, width=width,
@ -154,7 +154,7 @@ def serialize_all(nodes, stream=None, Dumper=Dumper,
getvalue = None getvalue = None
if stream is None: if stream is None:
if encoding is None: if encoding is None:
from StringIO import StringIO from cStringIO import StringIO
else: else:
from cStringIO import StringIO from cStringIO import StringIO
stream = StringIO() stream = StringIO()
@ -193,7 +193,7 @@ def dump_all(documents, stream=None, Dumper=Dumper,
getvalue = None getvalue = None
if stream is None: if stream is None:
if encoding is None: if encoding is None:
from StringIO import StringIO from cStringIO import StringIO
else: else:
from cStringIO import StringIO from cStringIO import StringIO
stream = StringIO() stream = StringIO()