Merge pull request #74 from ajoubertza/issue-53-add-pygame-math

Add support for pygame.math.

benchmarks/run_benchmark.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import math
 import sys
 import time

pygame/__init__.py

@@ -28,7 +28,7 @@
 from pygame import (
     display, color, surface, time, event, constants, sprite,
     mouse, locals, image, transform, pkgdata, font, mixer,
-    cursors, key, draw, joystick
+    cursors, key, draw, joystick, math
 )
 from pygame.base import (
     init, quit, HAVE_NEWBUF, get_sdl_version, get_sdl_byteorder,

pygame/compat.py

@@ -114,3 +114,26 @@ def next_(i, *args):
     import itertools.imap as imap_
 except ImportError:
     imap_ = map
+
+
+# The behaviour of the power operator, '**' and built-in pow() function,
+# changed in Python 3.x.  In Python 3.x raising a negative number to a
+# fractional power results in a complex number, while in earlier versions
+# it raised a ValueError.  Matching the behaviour of pygame requires
+# the ValueError instead of a complex result.  The compatibility function
+# defined below is provided for this purpose.
+try:
+    (-2.2) ** 1.1
+
+    def pow_compat(x, y):
+        """Return x ** y, with Python 2.x compatible exceptions."""
+        if x < 0 and not float(y).is_integer():
+            raise ValueError("negative number cannot be raised to a fractional power")
+        else:
+            return x ** y
+
+except ValueError:
+
+    def pow_compat(x, y):
+        """Return x ** y, with Python 2.x compatible exceptions."""
+        return x ** y

pygame/draw.py

@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
+from __future__ import absolute_import
+
 from pygame.surface import locked
 from pygame.color import create_color
 from pygame.compat import xrange_

pygame/mask.py

@@ -18,7 +18,9 @@
 
 # Implement the pygame API for the bitmask functions
 
-from math import atan2, pi
+from __future__ import absolute_import
+
+import math
 
 from pygame._sdl import sdl, ffi
 from pygame.surflock import locked
@@ -65,11 +67,11 @@ def angle(self):
         if tot:
             xc = xs // tot
             yc = ys // tot
-            theta = atan2(2 * (xy / tot - xc * yc),
-                          (xx / tot - xc * xc) - (yy / tot - yc * yc))
+            theta = math.atan2(2 * (xy / tot - xc * yc),
+                               (xx / tot - xc * xc) - (yy / tot - yc * yc))
             # covert from radians
             # We copy this logic from pygame upstream, because reasons
-            theta = -90.0 * theta / pi
+            theta = -90.0 * theta / math.pi
             return theta
         return 0.0