fixed horrendous __del__ method and other regressions

Author: HexDecimal

tdl/__init__.py

@@ -767,7 +767,7 @@ def __init__(self, width, height):
         """
         _MetaConsole.__init__(self)
         if not _rootinitialized:
-            raise TDLError('Can not create Console\'s before tdl.init')
+            raise TDLError('Can not create Console instances before a call to tdl.init')
         self._as_parameter_ = _lib.TCOD_console_new(width, height)
         self.console = self
         self.width = width
@@ -791,15 +791,18 @@ def __del__(self):
         """
         If the main console is garbage collected then the window will be closed as well
         """
-        # If this is the root console the window will close when collected
-        try:
-            if isinstance(self._as_parameter_, ctypes.c_void_p):
-                global _rootinitialized, _rootConsoleRef
+        global _rootinitialized, _rootConsoleRef
+        # check of see if the pointer is to the special root console
+        if isinstance(self._as_parameter_, ctypes.c_void_p):
+            # do we recognise this root console?
+            if(_rootConsoleRef and _rootConsoleRef is self):
                 _rootinitialized = False
                 _rootConsoleRef = None
+                _lib.TCOD_console_delete(self)
+            # if not then assume the console has already been taken care of
+        else:
+            # this is a normal console pointer and can be safely deleted
             _lib.TCOD_console_delete(self)
-        except StandardError:
-            pass # I forget why I put this here but I'm to afraid to delete it
 
     def __copy__(self):
         # make a new class and blit

tdl/__tcod.py

@@ -98,6 +98,12 @@ class SDL_Surface(Structure):
 
 # COLOR
 
+# python 2 to 3 workaround
+if sys.version_info[0] == 2:
+    int_types = (int, long)
+else:
+    int_types = int
+
 class _Color(Structure):
     _fields_ = [('r', c_uint8), ('g', c_uint8), ('b', c_uint8)]
 
@@ -107,7 +113,7 @@ def new(color):
             return color
         if isinstance(color, _Color):
             return color
-        if isinstance(color, int):
+        if isinstance(color, int_types):
             # format a web style color with the format 0xRRGGBB
             return _Color(color >> 16 & 0xff, color >> 8 & 0xff, color & 0xff)
         return _Color(*color)