Merge branch 'master' of git@github.com:codewarrior0/pymclevel.git

materials.py

@@ -4,7 +4,7 @@ from materials import classicMaterials, materials
 from numpy import *
 NOTEX = 184
 #wow, punching this map in would have been much easier in hex
-class MCMaterials():
+class MCMaterials(object):
     def materialNamed(self, name):
         return self.names.index(name);
 
@@ -423,4 +423,4 @@ def texCoords(idx):
 materials.blockTextures = array([map(texCoords, faces) for (faces, name) in materials.blockTextures], dtype='uint8')
 classicMaterials.blockTextures = array([map(texCoords, faces) for (faces, name) in classicMaterials.blockTextures], dtype='uint8')
 
-alphaMaterials = materials;
+alphaMaterials = materials;

mclevel.py

@@ -269,7 +269,7 @@ def decompress_first(func):
         return func(self, *args, **kw);
     return dec_first
     
-class MCLevel:
+class MCLevel(object):
     """ MCLevel is an abstract class providing many routines to the different level types, 
     including a common copyEntitiesFrom built on class-specific routines, and
     a dummy getChunk/getPresentChunks for the finite levels.
@@ -1188,7 +1188,7 @@ class PlayerNotFound(Exception): pass
 class ChunkNotPresent(Exception): pass
 class ChunkMalformed(ChunkNotPresent): pass
 
-class ZeroChunk:
+class ZeroChunk(object):
     " a placebo for neighboring-chunk routines "
     def compress(self): pass
     def load(self): pass

nbt.py

@@ -23,7 +23,7 @@ import StringIO;
 from numpy import array, zeros, uint8, fromstring
 TAGfmt = ">b"
 
-class TAG_Value:
+class TAG_Value(object):
   """Simple values. Subclasses override fmt to change the type and size. 
   Subclasses may set dataType instead of overriding setValue for automatic data type coercion"""
   
@@ -141,8 +141,9 @@ class TAG_Byte_Array(TAG_Value):
 
   tag = 7;
   fmt = ">i%ds"
-  def setValue(self, val):
-      _value = numpy.array(val, uint8)
+
+  def dataType(self, value):
+      return array(value, uint8)
       
   def __repr__(self):
     return "<%s: length %d> ( %s )" % (self.__class__, len(self.value), self.name)
@@ -169,8 +170,7 @@ class TAG_String(TAG_Value):
 
   tag = 8;
   fmt = ">h%ds"
-  def setValue(self, val):
-      _value = str(val)
+  dataType = str
   
   def __init__(self, value="", name=None, data=""):
     self.name=name