pyglet 2.1.2__tar.gz → 2.1.4__tar.gz

{pyglet-2.1.2 → pyglet-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyglet
-Version: 2.1.2
+Version: 2.1.4
 Summary: pyglet is a cross-platform games and multimedia package.
 Author-email: Alex Holkner & contributors <Alex.Holkner@gmail.com>
 Requires-Python: >=3.8
@@ -150,12 +150,11 @@ for more information about running and writing tests.
 ## Contact
 
 pyglet is developed by many individual volunteers, and there is no central point of contact. If you have a question
-about developing with pyglet, or you wish to contribute, please join the [mailing list], [discord] server, or [subreddit].
+about developing with pyglet, or you wish to contribute, please join the [discord] server, or [subreddit].
 
 For legal issues, please contact [Alex Holkner](mailto:Alex.Holkner@gmail.com).
 
 [discord]: https://discord.gg/QXyegWe
-[mailing list]: http://groups.google.com/group/pyglet-users
 [subreddit]: https://www.reddit.com/r/pyglet/
 [documentation]: https://pyglet.readthedocs.io
 [wiki]:  https://github.com/pyglet/pyglet/wiki

{pyglet-2.1.2 → pyglet-2.1.4}/README.md

@@ -141,12 +141,11 @@ for more information about running and writing tests.
 ## Contact
 
 pyglet is developed by many individual volunteers, and there is no central point of contact. If you have a question
-about developing with pyglet, or you wish to contribute, please join the [mailing list], [discord] server, or [subreddit].
+about developing with pyglet, or you wish to contribute, please join the [discord] server, or [subreddit].
 
 For legal issues, please contact [Alex Holkner](mailto:Alex.Holkner@gmail.com).
 
 [discord]: https://discord.gg/QXyegWe
-[mailing list]: http://groups.google.com/group/pyglet-users
 [subreddit]: https://www.reddit.com/r/pyglet/
 [documentation]: https://pyglet.readthedocs.io
 [wiki]:  https://github.com/pyglet/pyglet/wiki

{pyglet-2.1.2 → pyglet-2.1.4}/RELEASE_NOTES

@@ -1,3 +1,43 @@
+pyglet 2.1.4
+
+Changes
+-------
+- docs: Add shape guide crossrefs (#1291)
+- Updated the opengl torus example to work with the material updates in 3.1 (#1281)
+- Add homebrew lib search location for Apple Silicon.
+- Bump Qt example to use PySide6 and PyQt6 (#1305)
+
+Bugfixes
+--------
+- shapes.earcut: Fix int casting bug for large polygons (#1282)
+- Linux: Use dotclock instead of rate in xlib vidmoderestore (#1285)
+- tests: Fix many interactive tests, and other test fixes
+- app: Fix run(None) crashing on macOS
+- docs: Correct the docstring for the start_angle of an arc to indicate it is in degrees and not radians (#1290)
+- controller: Fix dpad bias for controller.min > 0 (#1296)
+- controller: Only use 0x1 desktop page axis for controller indexing on macOS (#1297)
+- gui: Fix the position range of the slider knob when repositioning the slider (#1299)
+
+
+pyglet 2.1.3
+
+Changes
+-------
+- window: Change the default znear/zfar to (-8192, 8192).
+- docs: Fix top-left version display and copyright auto-generation (#1264).
+- docs: fixes in the quickstart guide, and lots of other cleanups.
+- clean up legacy super() call syntax around the codebase.
+
+Bugfixes
+--------
+- shapes: disable depth testing by default, due to usability issues.
+- window.xlib: prevent crash if initial configuration notify event has invalid width/height.
+- window.xlib: fix screen mode showing dotclock instead of Hz.
+- model: fix the (undocumented) Sphere and Cube test shapes.
+- examples.model.fpscamera: don't normalize the movement input.
+- window: Fix ImageMouseCursor positioning not adapting to scaling (#1278).
+
+
 pyglet 2.1.2
 
 Bugfixes

{pyglet-2.1.2 → pyglet-2.1.4}/contrib/qt_sprite_preview.py

@@ -1,44 +1,45 @@
 """An example sprite previewer using Qt and pyglet together.
 
 It allows you to edit the fragment and vertex shaders, then compile them
-to get a live view. Errors and success will be printed to the console.
-A brief feature overview is located after the license notes below.
-
+to get a live view. Errors and success will be printed to the console. Users
+running GNOME on Linux may need the --use-qt-file-dialog flag to prevent invisible
+window issues. A brief feature overview is located after the license notes below.
 
 Important license notes:
 
 1. Libraries can use licenses which impose requirements beyond those of
    pyglet's BSD-style style license.
-2. This example defaults to using PySide2 by default, but can also use
-   PyQt5 due to their nearly-identical APIs.
-3. PySide2 uses the LGPL license while PyQt5 uses a GPL / commercial
+2. This example defaults to using PySide6 by default, but can also use
+   PyQt6 due to their nearly-identical APIs.
+3. PySide6 uses the LGPL license while PyQt6 uses a GPL / commercial
    dual-license approach.
 
 To the best knowledge of the contributors, this example and derivatives
 are only obligated to meet the restrictions of the LGPL because it does
-not use any PyQt5-specific features. Please see the following for more
+not use any PyQt6-specific features. Please see the following for more
 information:
 
 * The licenses and documentation for the libraries you plan to use
-* https://www.pythonguis.com/faq/pyqt5-vs-pyside2/
+* This guide for prior versions of PySide and PyQt:
+  thttps://www.pythonguis.com/faq/pyqt5-vs-pyside2/
 
-If you need additional certainty, please consult a legal professional.
+For additional certainty, please consult a legal professional.
 
 
 Example features:
 
 You can choose the current Qt binding in two ways:
 
-1. Add PySide2 or PyQt5 as the first argument after the launch command
+1. Add PySide6 or PyQt6 as the first argument after the launch command
    when running the script in the terminal
-2. Set the PYGLET_QT_BACKEND environment variable to either PySide2 or
-   PyQt5.
+2. Set the PYGLET_QT_BACKEND environment variable to either PySide6 or
+   PyQt6.
 
 The priority order is:
 
 1. positional argument
 2. environment variable
-3. default to PySide2
+3. default to PySide6
 
 To load images, choose File -> Open Image.
 
@@ -65,17 +66,17 @@ from typing import TYPE_CHECKING, Final, Mapping
 # Constants for choosing a Qt backend and summarizing their licensing
 ENV_VARIABLE: Final[str] = 'PYGLET_QT_BACKEND'
 
-PYSIDE2: Final[str] = 'PySide2'
-PYQT5: Final[str] = 'PyQt5'
+PYSIDE6: Final[str] = 'PySide6'
+PYQT6: Final[str] = 'PyQt6'
 
 valid_backends: Final[dict[str, str]] = {
-    PYSIDE2: "LGPL; may allow releasing under non-GPL licenses",
-    PYQT5: "Dual GPL / Commercial license; requires GPL or a fee",
+    PYSIDE6: "LGPL; may allow releasing under non-GPL licenses",
+    PYQT6: "Dual GPL / Commercial license; requires GPL or a fee",
 }
 
-# Default to PySide2 as part of allowing non-GPL licenses
+# Default to PySide6 as part of allowing non-GPL licenses
 # This is necessary but not sufficient to allow this.
-DEFAULT: Final[str] = PYSIDE2
+DEFAULT: Final[str] = PYSIDE6
 
 
 # Argument parser for run-time config as __main__
@@ -83,8 +84,8 @@ parser = argparse.ArgumentParser(
     description=dedent("""\
     A sprite & shader previewer using Qt and pyglet together.
 
-    It defaults to PySide2, but can run on PyQt5. The details of how may
-    be helpful to users who want to avoid spreading PyQt5's GPL license
+    It defaults to PySide6, but can run on PyQt6. The details of how may
+    be helpful to users who want to avoid spreading PyQt6's GPL license
     while using it as a fallback. See the docstrings and comments in the
     source to learn more.
     """),
@@ -138,19 +139,21 @@ print(f"Selected {backend} as the Qt binding from the {reason}'s value.")
 # Perform UI imports according to the detected configuration
 import pyglet
 
-# Use PySide2 for type checking, static analysis, tests, and linting
-# to help avoid infection by PyQt5's GPL license since tools will mark
-# uses of PyQt5-specific features as missing. For example, pyright is
+# Use PySide6 for type checking, static analysis, tests, and linting
+# to help avoid infection by PyQt6's GPL license since tools will mark
+# uses of PyQt6-specific features as missing. For example, pyright is
 # one of the strict type checking and linting tools which can help.
-if TYPE_CHECKING or backend == PYSIDE2:
-    from PySide2 import QtCore, QtWidgets
-    from PySide2.QtGui import QWheelEvent
-    from PySide2.QtWidgets import QFileDialog, QOpenGLWidget
-
-elif backend == PYQT5:
-    from PyQt5 import QtCore, QtWidgets
-    from PyQt5.QtGui import QWheelEvent
-    from PyQt5.QtWidgets import QFileDialog, QOpenGLWidget
+if TYPE_CHECKING or backend == PYSIDE6:
+    from PySide6 import QtCore, QtWidgets, QtGui
+    from PySide6.QtGui import QWheelEvent
+    from PySide6.QtWidgets import QFileDialog
+    from PySide6.QtOpenGLWidgets import QOpenGLWidget
+
+elif backend == PYQT6:
+    from PyQt6 import QtCore, QtWidgets, QtGui
+    from PyQt6.QtGui import QWheelEvent
+    from PyQt6.QtWidgets import QFileDialog
+    from PyQt6.QtOpenGLWidgets import QOpenGLWidget
 
 else:  # Handle import edge cases
     raise ValueError(
@@ -348,7 +351,7 @@ class Ui_MainWindow:
         self.sprite = None
         self.program = None
 
-    def get_file_dialog_options(self) -> QFileDialog.Options:
+    def get_file_dialog_options(self) -> QFileDialog.Option:
         """Convert instance attributes to a file dialog options object.
 
         At the moment, it supports choosing which dialog to use. This is
@@ -358,9 +361,9 @@ class Ui_MainWindow:
         You may want to expand on this in your own application with
         additional options.
         """
-        options = QFileDialog.Options()
+        options = QFileDialog.Option()
         if not self.use_native_file_dialog:
-            options |= QFileDialog.DontUseNativeDialog
+            options |= QFileDialog.Option.DontUseNativeDialog
 
         return options
 
@@ -383,7 +386,10 @@ class Ui_MainWindow:
         self.verticalLayout = QtWidgets.QVBoxLayout()
         self.verticalLayout.setObjectName("verticalLayout")
         self.label = QtWidgets.QLabel(self.centralwidget)
-        self.label.setAlignment(QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
+        self.label.setAlignment(
+            QtCore.Qt.AlignmentFlag.AlignLeading
+            | QtCore.Qt.AlignmentFlag.AlignLeft
+            | QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.label.setObjectName("label")
         self.verticalLayout.addWidget(self.label)
         self.vertex_source_edit = QtWidgets.QTextEdit(self.centralwidget)
@@ -428,23 +434,23 @@ class Ui_MainWindow:
         MainWindow.setStatusBar(self.statusbar)
 
         # Add menu bar menus, entries, and hotkeys
-        self.actionOpen_Image = QtWidgets.QAction(MainWindow)
+        self.actionOpen_Image = QtGui.QAction(MainWindow)
         self.actionOpen_Image.setObjectName("actionOpen_Image")
         self.actionOpen_Image.triggered.connect(self.loadImages)
         self.actionOpen_Image.setShortcut("Ctrl+I")
 
-        self.actionOpen_Shader = QtWidgets.QAction(MainWindow)
+        self.actionOpen_Shader = QtGui.QAction(MainWindow)
         self.actionOpen_Shader.setObjectName("actionOpen_Shader")
         self.actionOpen_Shader.triggered.connect(self.loadShaders)
         self.actionOpen_Shader.setShortcut("Ctrl+O")
 
-        self.actionSave_Shader = QtWidgets.QAction(MainWindow)
+        self.actionSave_Shader = QtGui.QAction(MainWindow)
         self.actionSave_Shader.setObjectName("actionSave_Shader")
         self.actionSave_Shader.triggered.connect(self.saveShaders)
         self.actionSave_Shader.setStatusTip('Saves both Shader Files')
         self.actionSave_Shader.setShortcut("Ctrl+S")
 
-        self.actionExit = QtWidgets.QAction(MainWindow)
+        self.actionExit = QtGui.QAction(MainWindow)
         self.actionExit.triggered.connect(self.closeProgram)
         self.actionExit.setObjectName("actionExit")
         self.menuFile.addAction(self.actionOpen_Image)
@@ -457,7 +463,7 @@ class Ui_MainWindow:
 
         self.imageMenu = QtWidgets.QMenu(self.menubar)
         self.imageMenu.setObjectName("imageMenu")
-        self.noImageAction = QtWidgets.QAction(MainWindow)
+        self.noImageAction = QtGui.QAction(MainWindow)
         self.noImageAction.setDisabled(True)
         self.imageMenu.addAction(self.noImageAction)
 
@@ -518,7 +524,7 @@ class Ui_MainWindow:
             if not self.images:
                 self.imageMenu.removeAction(self.noImageAction)
 
-            action = QtWidgets.QAction(self._window)
+            action = QtGui.QAction(self._window)
             shader_name = f"sprite_texture{len(self.images)}"
             action.setText(f"{os.path.basename(fileName)} ({shader_name})")
             action.fileName = fileName
@@ -565,7 +571,7 @@ class Ui_MainWindow:
             vert_filename.write_text(self.vertex_source_edit.toPlainText())
             frag_filename.write_text(self.fragSourceEdit.toPlainText())
 
-    def removeImage(self, actionWidget: QtWidgets.QAction) -> None:
+    def removeImage(self, actionWidget: QtGui.QAction) -> None:
         if self.imageMenu:
             self.imageMenu.removeAction(actionWidget)
 
@@ -775,4 +781,4 @@ if __name__ == "__main__":
     sys.excepthook = excepthook
 
     # Start the application and return its exit code
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

{pyglet-2.1.2 → pyglet-2.1.4}/doc/conf.py

@@ -211,14 +211,17 @@ master_doc = "index"
 
 # General information about the project.
 project = "pyglet"
-copyright = "2006-2008, Alex Holkner. 2008-2023 pyglet contributors"
+copyright = f"2006-2008, Alex Holkner. 2008-{now.year} pyglet contributors"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "2.0"
+if pyglet.version.count(".") == 1:
+    version = pyglet.version
+else:
+    version = pyglet.version.rsplit('.', 1)[0]
 # The full version, including alpha/beta/rc tags.
 release = pyglet.version
 

{pyglet-2.1.2 → pyglet-2.1.4}/doc/index.rst

@@ -1,13 +1,9 @@
 pyglet Documentation
 ====================
 
-.. ATTENTION::
-   This documentation is for the pyglet 2.1 series, which has a few small API
-   changes from the 2.0 series. Previous documentation can be found at:
-   `2.0 maintenance <https://pyglet.readthedocs.io/en/pyglet-2.0-maintenance/>`_.
-   Documentation for the 1.5 series, which is the last to support legacy OpenGL,
-   can be found here:
-   `1.5 maintenance <https://pyglet.readthedocs.io/en/pyglet-1.5-maintenance/>`_.
+.. note::
+   This is the documentation for pyglet version |version|.
+   If you need a different one use the docs version selector.
 
 **pyglet** is a cross-platform windowing and multimedia library for Python,
 intended for developing games and other visually rich applications. It supports
@@ -30,10 +26,9 @@ Some of the features of pyglet are:
   use it for both commercial and other open-source projects with very little
   restriction.
 
-Please join our `Discord`_ server, or join us on the `mailing list`_!
+Please join the conversation on our `Discord server <https://discord.gg/QXyegWe>`_.!
 
 .. _Discord: https://discord.gg/QXyegWe
-.. _mailing list: http://groups.google.com/group/pyglet-users
 
 If this is your first time reading about pyglet, we suggest you start at
 :doc:`programming_guide/quickstart`.

{pyglet-2.1.2 → pyglet-2.1.4}/doc/internal/contributing.rst

@@ -6,19 +6,14 @@ Contributing
 Communication
 -------------
 
-pyglet communication occurs mostly in our
-`discord server <https://discord.gg/QXyegWe>`_,
-and
-`mailing list <http://groups.google.com/group/pyglet-users>`_.
+pyglet communication occurs mostly in our `Discord server <https://discord.gg/QXyegWe>`_.
 
 Issue Tracker
 -------------
 
 You can use the `issue tracker <https://github.com/pyglet/pyglet/issues>`_
-to report any bug or compatibility issue.
-
-We prefer the tracker to address discussions on specific bugs, and address
-broader topics of pyglet in the mailing list.
+to report any bug or compatibility issue. If your issue is more complex than what can be
+covered in a ticket, also consider joining the `Discord server <https://discord.gg/QXyegWe>`_.
 
 Getting the latest development version
 --------------------------------------
@@ -68,10 +63,8 @@ Contact
 
 pyglet is developed by many individual volunteers, and there is no central
 point of contact. If you have a question about developing with pyglet, or you
-wish to contribute, please join the
-`discord server <https://discord.gg/QXyegWe>`_,
-or the
-`mailing list <http://groups.google.com/group/pyglet-users>`_.
+wish to contribute, please join the `Discord server <https://discord.gg/QXyegWe>`_.
+
 
 For legal issues, please contact
 `Alex Holkner <mailto:Alex.Holkner@gmail.com>`_.

{pyglet-2.1.2 → pyglet-2.1.4}/doc/modules/gui.rst

@@ -7,6 +7,7 @@ Classes
 -------
 
 .. autoclass:: WidgetBase
+  :show-inheritance:
 
   .. rubric:: Attributes
 

{pyglet-2.1.2 → pyglet-2.1.4}/doc/programming_guide/examplegame.rst

@@ -526,7 +526,7 @@ same behavior as a PhysicalObject plus a little extra, so we’ll need to call
 PhysicalObject's `update()` method and then respond to input::
 
     def update(self, dt):
-        super(Player, self).update(dt)
+        super().update(dt)
 
         if self.keys['left']:
             self.rotation -= self.rotate_speed * dt
@@ -699,7 +699,7 @@ gracefully, we must write a simple but slightly enhanced `delete()` method::
 
     def delete(self):
         self.engine_sprite.delete()
-        super(Player, self).delete()
+        super().delete()
 
 The Player class is now cleaned up and ready to go.
 
@@ -890,7 +890,7 @@ subclass of PhysicalObject::
         """Bullets fired by the player"""
 
         def __init__(self, *args, **kwargs):
-            super(Bullet, self).__init__(
+            super().__init__(
                 resources.bullet_image, *args, **kwargs)
 
 To get bullets to disappear after a time, we could keep track of our own
@@ -906,7 +906,7 @@ We can do this as soon as the object is initialized by adding a call to
 :meth:`pyglet.clock.schedule_once` to the constructor::
 
     def __init__(self, *args, **kwargs):
-        super(Bullet, self).__init__(resources.bullet_image, *args, **kwargs)
+        super().__init__(resources.bullet_image, *args, **kwargs)
         pyglet.clock.schedule_once(self.die, 0.5)
 
 There’s still more work to be done on the Bullet class, but before we
@@ -924,7 +924,7 @@ to its constructor::
 
     class Player(physicalobject.PhysicalObject):
         def __init__(self, *args, **kwargs):
-            super(Player, self).__init__(img=resources.player_image, *args, **kwargs)
+            super().__init__(img=resources.player_image, *args, **kwargs)
             ...
             self.bullet_speed = 700.0
 
@@ -1065,7 +1065,7 @@ to pass a specific image to the superclass, passing along any other parameters::
 
     class Asteroid(physicalobject.PhysicalObject):
         def __init__(self, *args, **kwargs):
-            super(Asteroid, self).__init__(resources.asteroid_image, *args, **kwargs)
+            super().__init__(resources.asteroid_image, *args, **kwargs)
 
 Now we need to write a new `handle_collision_with()` method.  It should create
 a random number of new, smaller asteroids with random velocities.  However,
@@ -1077,7 +1077,7 @@ We want to keep the old behavior of ignoring other asteroids, so start the
 method with a call to the superclass’s method::
 
     def handle_collision_with(self, other_object):
-        super(Asteroid, self).handle_collision_with(other_object)
+        super().handle_collision_with(other_object)
 
 Now we can say that if it’s supposed to die, and it’s big enough, then we
 should create two or three new asteroids with random rotations and velocities.
@@ -1088,7 +1088,7 @@ like they come from the same object::
 
     class Asteroid:
         def handle_collision_with(self, other_object):
-            super(Asteroid, self).handle_collision_with(other_object)
+            super().handle_collision_with(other_object)
             if self.dead and self.scale > 0.25:
                 num_asteroids = random.randint(2, 3)
                 for i in range(num_asteroids):
@@ -1107,13 +1107,13 @@ rotation every frame.
 Add the attribute in the constructor::
 
     def __init__(self, *args, **kwargs):
-        super(Asteroid, self).__init__(resources.asteroid_image, *args, **kwargs)
+        super().__init__(resources.asteroid_image, *args, **kwargs)
         self.rotate_speed = random.random() * 100.0 - 50.0
 
 Then write the update() method::
 
     def update(self, dt):
-        super(Asteroid, self).update(dt)
+        super().update(dt)
         self.rotation += self.rotate_speed * dt
 
 The last thing we need to do is go over to load.py and have the asteroid()
@@ -1146,12 +1146,4 @@ I’m going to leave it as an exercise for you to do the following::
 
 Good luck!  With a little effort, you should be able to figure out most of
 these things on your own. If you have trouble, join us on the pyglet
-mailing list.
-
-Also, in addition to this example game, there is yet *another* Asteroids clone
-available in the `/examples/astraea/` folder in the pyglet source directory.
-In comparison to this example game excercise we've just completed,
-Astraea is a complete game with a proper menu, score system, and additional
-graphical effects.  No step-by-step documentation is available for Astraea,
-but the code itself should be easy to understand and illustrates some nice
-techniques.
+`Discord server <https://discord.gg/QXyegWe>`_.

{pyglet-2.1.2 → pyglet-2.1.4}/doc/programming_guide/gui.rst

@@ -20,7 +20,7 @@ through the :ref:`guide_events` section of the documentation. Widgets are by nat
 very tightly associated with input events, so this is necessary to fully grasp their
 usage.
 
-Example code can be found in 'examples/gui/widgets.py' in the pyglet source repository.
+Example code can be found in ``examples/gui/widgets.py`` in the pyglet source repository.
 
 
 Creating a Widget
@@ -30,13 +30,16 @@ Included Widgets are :py:class:`~pyglet.gui.widgets.PushButton`,
 and :py:class:`~pyglet.gui.widgets.TextEntry`. They each have different arguments,
 which will be shown in the API documentation. For our example, we will create a
 'PushButton' widget, which requires you to provide at least two images. These two
-images will visually represent the "pressed" and "depressed" states of the button.
+images will visually represent the "pressed" and "unpressed" states of the button.
 This widget can also take an optional image for 'hover', but we'll skip that for now::
 
     pressed_img = pyglet.resource.image("button_pressed.png")
-    depressed_img = pyglet.resource.image("button_depressed.png")
+    unpressed_img = pyglet.resource.image("button_unpressed.png")
 
-    pushbutton = pyglet.gui.PushButton(x=100, y=300, pressed=pressed_img, depressed=depressed_img, batch=batch)
+    pushbutton = pyglet.gui.PushButton(
+        x=100, y=300, pressed=pressed_img,
+        unpressed=unpressed_img, batch=batch,
+    )
 
 We now have a PushButton widget, but it won't yet do anything. It will be drawn on
 screen, however, if included as part of a :py:class:`~pyglet.graphics.Batch` as shown
@@ -46,18 +49,18 @@ events dispatched by the Window::
     my_window.push_handlers(pushbutton)
 
 The widget should now change appearance when you click on it. It will switch between
-the provided images (pressed and depressed states). You can try adding the 'hover'
+the provided images (pressed and unpressed states). You can try adding the 'hover'
 image as well, for more visual feedback.
 
 Now that our widget is receiving events, we can now take of the events that are
-produced _by_ the widget. In this case, the PushButton widget dispatches two
-events: 'on_pressed' and 'on_released'. To wire these up, we simply set handlers
+produced *by* the widget. In this case, the PushButton widget dispatches two
+events: 'on_press' and 'on_release'. To wire these up, we simply set handlers
 for them::
 
-    def my_on_press_handler():
+    def my_on_press_handler(widget):
         print("Button Pressed!")
 
-    def my_on_release_handler():
+    def my_on_release_handler(widget):
         print("Button Released...")
 
     pushbutton.set_handler('on_press', my_on_press_handler)
@@ -112,7 +115,7 @@ Custom widgets
 --------------
 For users who are interested in creating their own custom Widgets, the
 :py:class:`~pyglet.gui.widgets.WidgetBase` base class is available for
-subclassing. This base class has most of the relavent Window events
+subclassing. This base class has most of the relevant Window events
 pre-defined, and is ready to be pushed as a handler. Custom subclasses
 can then override whichever mouse or keyboard events they need, depending
 on the application. Some additional helper properties are also provided.

{pyglet-2.1.2 → pyglet-2.1.4}/doc/programming_guide/image.rst

@@ -69,7 +69,7 @@ sprites might share the same bullet image.
 A Sprite is constructed given an image or animation, and can be directly
 drawn with the :py:meth:`~pyglet.sprite.Sprite.draw` method::
 
-    sprite = pyglet.sprite.Sprite(img=image)
+    sprite = pyglet.sprite.Sprite(img=image, x=100, y=50)
 
     @window.event
     def on_draw():
@@ -106,12 +106,12 @@ When sprites are collected into a batch, no guarantee is made about the order
 in which they will be drawn.  If you need to ensure some sprites are drawn
 before others (for example, landscape tiles might be drawn before character
 sprites, which might be drawn before some particle effect sprites), use two
-or more :py:class:`~pyglet.graphics.OrderedGroup` objects to specify the
+or more :py:class:`~pyglet.graphics.Group` objects to specify the
 draw order::
 
     batch = pyglet.graphics.Batch()
-    background = pyglet.graphics.OrderedGroup(0)
-    foreground = pyglet.graphics.OrderedGroup(1)
+    background = pyglet.graphics.Group(order=0)
+    foreground = pyglet.graphics.Group(order=1)
 
     sprites = [pyglet.sprite.Sprite(image, batch=batch, group=background),
                pyglet.sprite.Sprite(image, batch=batch, group=background),
@@ -158,9 +158,8 @@ image.  For example, to center the image at ``(x, y)``::
 
 You can also specify an optional `z` component to the
 :py:meth:`~pyglet.image.AbstractImage.blit` method.
-This has no effect unless you have changed the default projection
-or enabled depth testing.  In the following example, the second
-image is drawn *behind* the first, even though it is drawn after it::
+This has no effect unless you have enabled depth testing.  In the following example,
+the second image is drawn *behind* the first, even though it is drawn after it::
 
     from pyglet.gl import *
     glEnable(GL_DEPTH_TEST)
@@ -168,9 +167,10 @@ image is drawn *behind* the first, even though it is drawn after it::
     kitten.blit(x, y, 0)
     kitten.blit(x, y, -0.5)
 
-The default pyglet projection has a depth range of (-1, 1) -- images drawn
+The default pyglet projection has a depth range of (-8192, 8192) -- images drawn
 with a z value outside this range will not be visible, regardless of whether
-depth testing is enabled or not.
+depth testing is enabled or not. (You can create your own Window projection matrix
+if you have specific needs).
 
 Images with an alpha channel can be blended with the existing framebuffer.  To
 do this you need to supply OpenGL with a blend equation.  The following code
@@ -582,8 +582,8 @@ Image grids
 ^^^^^^^^^^^
 
 An "image grid" is a single image which is divided into several smaller images
-by drawing an imaginary grid over it.  The following image shows an image used
-for the explosion animation in the *Astraea* example.
+by drawing an imaginary grid over it.  The following image shows an image that
+can be used for an asteroid explosion animation.
 
 .. figure:: img/explosion.png
 

{pyglet-2.1.2 → pyglet-2.1.4}/doc/programming_guide/installation.rst

@@ -1,10 +1,8 @@
 Installation
 ============
 
-.. note:: These instructions apply to pyglet |version|.
-
 pyglet is a pure Python library, with no hard dependencies on other modules.
-No special steps or complitation are required for installation. You can install
+No special steps or compilation are required for installation. You can install
 from `on PyPI <https://pypi.python.org/pypi/pyglet>`_ via **pip**. For example:
 
 .. code-block:: sh

{pyglet-2.1.2 → pyglet-2.1.4}/doc/programming_guide/keyboard.rst

@@ -402,7 +402,7 @@ Before adding a new motion, please do the following:
 #. Discuss the addition and any remaining questions with maintainers by either:
 
    * `Filing a GitHub Issue <https://github.com/pyglet/pyglet/issues>`_
-   * `Discord or the mailing list <https://github.com/pyglet/pyglet#contact>`_
+   * `Joining the Discord server <https://github.com/pyglet/pyglet#contact>`_
 
 Then, once you're ready: