Updates to better support Python 2.7

arcade/application.py

@@ -17,7 +17,10 @@ class Window(pyglet.window.Window):
     >>> window.close()
     """
     def __init__(self, width, height, title='Arcade Window'):
-        super().__init__(width=width, height=height, caption=title)
+        # This is nicer, but Python 3.x only
+        # super().__init__(width=width, height=height, caption=title)
+        pyglet.window.Window.__init__(self, width=width, height=height, caption=title)
+
         self.set_update_rate(1/80)
         # set_viewport(0, self.width, 0, self.height)
 

arcade/draw_commands.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import sys
 import math
 import ctypes
@@ -7,7 +8,6 @@
 import pyglet.gl as GL
 import pyglet.gl.glu as GLU
 
-
 class Texture():
     """
     Class that represents a texture.
@@ -229,7 +229,6 @@ def trim_image(image):
     """
     Returns an image with extra whitespace cropped out.
 
-    >>> from __future__ import print_function
     >>> name = "doc/source/examples/images/playerShip1_orange.png"
     >>> source_image = PIL.Image.open(name)
     >>> cropped_image = trim_image(source_image)

arcade/geometry.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import math
 
 
@@ -65,8 +66,8 @@ def rotate(x, y, cx, cy, angle):
     Rotate a point around a center.
 
     >>> x, y = rotate(1, 1, 0, 0, 90)
-    >>> print(round(x), round(y))
-    -1 1
+    >>> print("x = {:.1f}, y = {:.1f}".format(x, y))
+    x = -1.0, y = 1.0
     """
     tempX = x - cx
     tempY = y - cy

arcade/sprite.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from .draw_commands import *
 from .geometry import *
 
@@ -356,13 +357,13 @@ def _get_bottom(self):
 
         >>> import arcade
         >>> arcade.open_window("Sprite Example", 800, 600)
-        >>> scale = 1
+        >>> scale = 1.0
         >>> ship_sprite = \
 arcade.Sprite("doc/source/examples/images/playerShip1_orange.png", scale)
-        >>> ship_sprite.center_y = 0
+        >>> ship_sprite.center_y = 0.0
         >>> print(ship_sprite.bottom)
         -37.5
-        >>> ship_sprite.bottom = 1
+        >>> ship_sprite.bottom = 1.0
         >>> print(ship_sprite.bottom)
         1.0
         >>> arcade.quick_run(0.25)
@@ -389,13 +390,13 @@ def _get_top(self):
 
         >>> import arcade
         >>> arcade.open_window("Sprite Example", 800, 600)
-        >>> scale = 1
+        >>> scale = 1.0
         >>> ship_sprite = \
 arcade.Sprite("doc/source/examples/images/playerShip1_orange.png", scale)
-        >>> ship_sprite.center_y = 0
+        >>> ship_sprite.center_y = 0.0
         >>> print(ship_sprite.top)
         37.5
-        >>> ship_sprite.top = 1
+        >>> ship_sprite.top = 1.0
         >>> print(ship_sprite.top)
         1.0
         >>> arcade.quick_run(0.25)
@@ -453,13 +454,13 @@ def _get_left(self):
 
         >>> import arcade
         >>> arcade.open_window("Sprite Example", 800, 600)
-        >>> scale = 1
+        >>> scale = 1.0
         >>> ship_sprite = \
 arcade.Sprite("doc/source/examples/images/playerShip1_orange.png", scale)
-        >>> ship_sprite.center_x = 0
+        >>> ship_sprite.center_x = 0.0
         >>> print(ship_sprite.left)
         -49.5
-        >>> ship_sprite.left = 1
+        >>> ship_sprite.left = 1.0
         >>> print(ship_sprite.left)
         1.0
         >>> arcade.quick_run(0.25)
@@ -487,13 +488,13 @@ def _get_right(self):
 
         >>> import arcade
         >>> arcade.open_window("Sprite Example", 800, 600)
-        >>> scale = 1
+        >>> scale = 1.0
         >>> ship_sprite = \
 arcade.Sprite("doc/source/examples/images/playerShip1_orange.png", scale)
-        >>> ship_sprite.center_x = 0
+        >>> ship_sprite.center_x = 0.0
         >>> print(ship_sprite.right)
         49.5
-        >>> ship_sprite.right = 1
+        >>> ship_sprite.right = 1.0
         >>> print(ship_sprite.right)
         1.0
         >>> arcade.quick_run(0.25)

doc/source/preprocess_files.py

@@ -55,7 +55,7 @@ def list_classes(filename, output_file):
 
 
 def main():
-    output_file = open("quick_index.rst", "w")
+    output_file = open("doc/source/quick_index.rst", "w")
 
     output_file.write(".. _quick-index:\n\n")