Remove 2.5 compatibility.

It has no purpose since both Pythons we support have 2.7 versions widely
available. We'll probably adopt 2.7 features at some point, but there's no
rush.

README.rst

@@ -84,7 +84,7 @@ Planned Features
 Installing
 ==========
 
-Bravo currently requires Python 2.5 or any newer Python 2.x. It is known to
+Bravo currently requires Python 2.6 or any newer Python 2.x. It is known to
 work on CPython and PyPy. (PyPy support is currently on hiatus and will return
 when numpy support returns to PyPy.)
 

bravo/chunk.py

@@ -1,8 +1,9 @@
+from itertools import product
+
 from numpy import int8, uint8, uint32
 from numpy import cast, empty, where, zeros
 
 from bravo.blocks import blocks, glowing_blocks
-from bravo.compat import product
 from bravo.packets import make_packet
 from bravo.utilities import pack_nibbles
 

bravo/plugins/build_hooks.py

@@ -1,7 +1,6 @@
 from zope.interface import implements
 
 from bravo.blocks import blocks, items
-from bravo.compat import product
 from bravo.entity import Chest, Sign
 from bravo.ibravo import IBuildHook
 from bravo.utilities import split_coords

bravo/plugins/generators.py

@@ -1,11 +1,13 @@
 from __future__ import division
+
+from itertools import product
 from random import randint
+
 from numpy import array, where
 
 from zope.interface import implements
 
 from bravo.blocks import blocks
-from bravo.compat import product
 from bravo.ibravo import ITerrainGenerator
 from bravo.simplex import octaves2, octaves3, reseed
 

bravo/plugins/physics.py

@@ -1,11 +1,10 @@
 from collections import defaultdict
-from itertools import chain
+from itertools import chain, product
 
 from twisted.internet.task import LoopingCall
 from zope.interface import implements
 
 from bravo.blocks import blocks, items
-from bravo.compat import product
 from bravo.ibravo import IBuildHook, IDigHook
 from bravo.spatial import Block2DSpatialDict, Block3DSpatialDict
 

bravo/plugins/seasons.py

@@ -1,7 +1,8 @@
+from itertools import product
+
 from zope.interface import implements
 
 from bravo.blocks import blocks
-from bravo.compat import product
 from bravo.ibravo import ISeason
 
 snow_resistant = set([

bravo/protocols/beta.py

@@ -1,3 +1,5 @@
+from collections import namedtuple
+from itertools import product
 from time import time
 from urlparse import urlunparse
 from math import pi, sin, cos
@@ -12,7 +14,6 @@
 from twisted.web.client import getPage
 
 from bravo.blocks import blocks, items
-from bravo.compat import namedtuple, product
 from bravo.config import configuration
 from bravo.entity import Sign
 from bravo.factories.infini import InfiniClientFactory

bravo/simplex.py

@@ -1,11 +1,9 @@
 from __future__ import division
 
 import math
-from itertools import izip
+from itertools import chain, izip, permutations
 from random import Random
 
-from bravo.compat import chain, permutations
-
 SIZE = 2**10
 
 edges2 = list(

bravo/spatial.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
+from itertools import product
 from UserDict import DictMixin
 
-from bravo.compat import product
 from bravo.utilities import taxicab2
 
 class SpatialDict(object, DictMixin):

bravo/tests/plugins/test_generators.py

@@ -1,5 +1,7 @@
 import unittest
 
+from itertools import product
+
 import bravo.blocks
 import bravo.chunk
 import bravo.ibravo
@@ -22,8 +24,7 @@ def test_boring(self):
         plugin = self.p["boring"]
 
         plugin.populate(self.chunk, 0)
-        for x, y, z in bravo.compat.product(xrange(16), xrange(128),
-            xrange(16)):
+        for x, y, z in product(xrange(16), xrange(128), xrange(16)):
             if y < 64:
                 self.assertEqual(self.chunk.get_block((x, y, z)),
                     bravo.blocks.blocks["stone"].slot)

bravo/tests/test_chunk.py

@@ -5,7 +5,6 @@
 from numpy.testing import assert_array_equal
 
 import bravo.chunk
-import bravo.compat
 
 class TestChunkBlocks(unittest.TestCase):
 

bravo/tests/test_world.py

@@ -3,7 +3,8 @@
 import tempfile
 import unittest
 
-import bravo.compat
+from itertools import product
+
 import bravo.config
 import bravo.world
 
@@ -39,8 +40,7 @@ def test_get_block(self):
             dtype=numpy.uint8)
         chunk.blocks.shape = (16, 16, 128)
 
-        for x, y, z in bravo.compat.product(xrange(16), xrange(128),
-            xrange(16)):
+        for x, y, z in product(xrange(16), xrange(128), xrange(16)):
             # This works because the chunk is at (0, 0) so the coords don't
             # need to be adjusted.
             self.assertEqual(chunk.get_block((x, y, z)),
@@ -54,8 +54,7 @@ def test_get_metadata(self):
             dtype=numpy.uint8)
         chunk.metadata.shape = (16, 16, 128)
 
-        for x, y, z in bravo.compat.product(xrange(16), xrange(128),
-            xrange(16)):
+        for x, y, z in product(xrange(16), xrange(128), xrange(16)):
             # this works because the chunk is at (0, 0) so the coords don't
             # need to be adjusted.
             self.assertEqual(chunk.get_metadata((x, y, z)),
@@ -76,8 +75,7 @@ def test_get_block_readback(self):
         self.w.dirty_chunk_cache.clear()
         chunk = self.w.load_chunk(0, 0)
 
-        for x, y, z in bravo.compat.product(xrange(16), xrange(128),
-            xrange(16)):
+        for x, y, z in product(xrange(16), xrange(128), xrange(16)):
             # This works because the chunk is at (0, 0) so the coords don't
             # need to be adjusted.
             self.assertEqual(chunk.get_block((x, y, z)),
@@ -98,8 +96,7 @@ def test_get_block_readback_negative(self):
         self.w.dirty_chunk_cache.clear()
         chunk = self.w.load_chunk(-1, -1)
 
-        for x, y, z in bravo.compat.product(xrange(16), xrange(128),
-            xrange(16)):
+        for x, y, z in product(xrange(16), xrange(128), xrange(16)):
             self.assertEqual(chunk.get_block((x, y, z)),
                 self.w.get_block((x - 16, y, z - 16)))
 
@@ -118,8 +115,7 @@ def test_get_metadata_readback(self):
         self.w.dirty_chunk_cache.clear()
         chunk = self.w.load_chunk(0, 0)
 
-        for x, y, z in bravo.compat.product(xrange(16), xrange(128),
-            xrange(16)):
+        for x, y, z in product(xrange(16), xrange(128), xrange(16)):
             # this works because the chunk is at (0, 0) so the coords don't
             # need to be adjusted.
             self.assertEqual(chunk.get_metadata((x, y, z)),

bravo/world.py

@@ -1,4 +1,5 @@
 from functools import wraps
+from itertools import product
 import random
 import sys
 import weakref
@@ -12,7 +13,6 @@
 from zope.interface.verify import verifyObject
 
 from bravo.chunk import Chunk
-from bravo.compat import product
 from bravo.config import configuration
 from bravo.entity import Player
 from bravo.ibravo import ISerializer, ISerializerFactory

docs/auxiliary.rst

@@ -6,6 +6,5 @@ Modules which do not contribute directly to the functionality of Bravo.
 
 .. toctree::
 
-   compat
    simplex
    utilities