Commits

Anonymous committed 8282057

Fixed sdlext.PixelArray method bindings for Python 3.x.
Minor documentation fixes.
Fixed msys build for Python 3.x.

  • Participants
  • Parent commits 41eb248
  • Branches pgreloaded

Comments (0)

Files changed (17)

 	$(top_srcdir)/test/c_api \
 	$(top_srcdir)/test/util \
 	$(top_srcdir)/lib \
+	$(top_srcdir)/lib/freetype \
 	$(top_srcdir)/lib/sdl \
 	$(top_srcdir)/lib/sdlext \
 	$(top_srcdir)/lib/sdlgfx \
 	$(top_srcdir)/lib/threads \
 	$(top_srcdir)/src \
 	$(top_srcdir)/src/base \
+	$(top_srcdir)/src/freetype \
 	$(top_srcdir)/src/mask \
 	$(top_srcdir)/src/physics \
 	$(top_srcdir)/src/sdl \
 
 This describes the latest changes between the Pygame2 releases.
 
-2.0.0 2009-XX-XX
-================
+2.0.0
+=====
+Released on 2009-XX-XX.
 
 * Initial Release
+
+Test releases:
+
+* alpha1 (rev. 21)

config/libconfig.py

 
 def run_command (cmd):
     try:
+        retcode, output = 0, None
         if msys.is_msys():
-            return msys_obj.run_shell_command (cmd)
+            retcode, output = msys_obj.run_shell_command (cmd)
         else:
             p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             output = p.communicate()[0]
-            if helpers.getversion()[0] >= 3:
-                output = str (output, "ascii")
-            return p.returncode, output
+            retcode = p.returncode
+        if helpers.getversion()[0] >= 3:
+            output = str (output, "ascii")
+        return retcode, output
     except OSError:
         return -1, None
 

config/pkgconfig.py

 
 def run_command (cmd):
     try:
+        retcode, output = 0, None
         if msys.is_msys():
-            return msys_obj.run_shell_command (cmd)
+            retcode, output = msys_obj.run_shell_command (cmd)
         else:
             p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
             output = p.communicate()[0]
-            if helpers.getversion()[0] >= 3:
-                output = str (output, "ascii")
-            return p.returncode, output
+            retcode = p.returncode
+        if helpers.getversion()[0] >= 3:
+            output = str (output, "ascii")
+        return retcode, output
     except OSError:
         return -1, None
 
 ============
 Before a new release takes place, the following steps have to be made:
 
-* increase version number (see :ref:`Postprocessing`) in ::
+* Increase version number (see :ref:`Postprocessing`) in ::
   
     setup.py
     doc/conf.py
     lib/__init__.py
     
-* update NEWS.txt with the changes since the last version (only for final
+* Update NEWS.txt with the changes since the last version (only for final
   release - alpha and rc should contain the information, but not be tagged
   explicitly). See :ref:`Editing News` for more information.
 
-* update README.txt and doc/BuildXXX.txt to point to the latest required
+* Update README.txt and doc/BuildXXX.txt to point to the latest required
   dependency versions.
 
+* Make sure, all tests for all supported Python versions work.
 
 Editing News
 ============
 
 For adding a new release entry, the following layout is used: ::
 
-  VERSION DATE
-  ============
-
+  VERSION
+  =======
+  Released on DATE.
+  
   [Change list]
 
+  Test releases:
+  
+  [Release list with revisions]
 
 Each important change that has any impact on the API (be it bug fixes,
 behaviour changes or whatever else), should be described here. If it was
 location should be given. If it was a fix for some bug tracker entry, the
 tracker id should be added. ::
 
-  2.99.4 2034-12-20
-  =================
-
+  2.99.4
+  ======
+  Released on 2034-12-20.
+  
   * Added foo.morefoo class.
   * Bug: Fixed foo.bar () misbehaviour for string arguments (via mailing list).
   * Added foo.barbaz () method for whatever (thanks to Emily Doe).
   * Bug #1234: Fixed foo.foobar() return value.
 
+  Test releases:
+  
+  * alpha 1 (rev. 73213)
+  * alpha 2 (rev. 73237)
+  * rc 1 (rev. 73244)
+
 Releasing
 =========
-TODO
+Once anything's tested, updated written down, the required packages have to be
+built. TODO
 
 Postprocessing
 ==============
 C API Documentation
 ###################
 
-The following sections cover the internal C API of Pygame2. The C API is useful
+The following sections cover the external C API of Pygame2. The C API is useful
 for implementing your own C extension or if you require some Python to C
 interoperatibility.
 
   <desc>
     Base features for pygame2 that are shared shared and used throughout
     the whole pygame2 package.
+  
+    All classes and functions listed here are incorporated from the
+    :mod:`pygame2.base` module.
   </desc>
 
   <class name="BufferProxy">

doc/src/freetypebase.xml

   <desc>
       This module wraps the FreeType 2 font library to add
       improvent font drawing capabilities to PyGame2, such as
-      new font formats, etc
+      new font formats, etc.
+  
+    All classes and functions listed here are incorporated from the
+    :mod:`pygame2.freetype.base` module.
   </desc>
 
   <func name="get_version">

doc/src/sdlbase.xml

   <func name="get_error">
     <call>get_error () -> pygame2.Error</call>
     <desc>
-      Gets the last :exc:`pygame2.base.Error` occured.
+      Gets the last :exc:`pygame2.Error` occured.
 
       SDL maintains an internal error message. This message will usually
-      be given to you when a :exc:`pygame2.base.Error` is raised.
+      be given to you when a :exc:`pygame2.Error` is raised.
 
       You will rarely need to call this function.
     </desc>
       
         *Never* call :meth:`quit_subsystem()`, if you did not initialise the
         specified subsystem with :meth:`init_subsystem()`. The specialised
-        sdl modules (such as e.g. :mod:`pygame.sdl.video`) register own
+        sdl modules (such as e.g. :mod:`pygame2.sdl.video`) register own
         quit hooks to be called on quittintg the module. Using
         :meth:`quit_subsystem()` however will prevent this and can lead to
         errors.

doc/src/sdlextbase.xml

   <short>basic extensions for SDL modules</short>
   <desc>
     Extension module for the pygame2 SDL wrapper.
+
+    All classes and functions listed here are incorporated from the
+    :mod:`pygame2.sdlext.base` module.
   </desc>
 
   <class name="PixelArray">

doc/src/sdlextfont.xml

 
         Renders a text on the existing surface. The top-left start
         position of the text will be the passed offset and a
-        :class:`pygame2.base.Rect` with the changed area will be
+        :class:`pygame2.Rect` with the changed area will be
         returned.
       </desc>
       <example></example>

doc/src/sdlgfxbase.xml

   <short>basic SDL_gfx wrapper module</short>
   <desc>
     Basic SDL_gfx library wrapper module
+  
+    All classes and functions listed here are incorporated from the
+    :mod:`pygame2.sdlgfx.base` module.
   </desc>
 
   <class name="FPSmanager">

doc/src/sdlimagebase.xml

   <short>basic SDL_image wrapper module</short>
   <desc>
     Basic SDL_image wrapper module
+  
+    All classes and functions listed here are incorporated from the
+    :mod:`pygame2.sdlimage.base` module.
   </desc>
 
   <func name="get_error">
     <call>get_error () -> pygame2.Error</call>
     <desc>
-      Gets the last :exc:`pygame2.base.Error` occured.
+      Gets the last :exc:`pygame2.Error` occured.
 
       SDL_image maintains an internal error message. This message will
-      usually be given to you when a :exc:`pygame2.base.Error` is
+      usually be given to you when a :exc:`pygame2.Error` is
       raised.
 
       You will rarely need to call this function.

doc/src/sdlmixerbase.xml

   <alias>pygame2.sdlmixer</alias>
   <short>basic SDL_mixer wrapper module</short>
   <desc>
+    All classes and functions listed here are incorporated from the
+    :mod:`pygame2.sdlmixer.base` module.
+    
     .. note::
       
       Do not use :mod:`pygame2.sdlmixer` and :mod:`pygame2.sdl.audio` at the
       same time. As they both deal with audio hardware access, this can lead
       to problems and weird behaviour.
+  
   </desc>
 
   <class name="Channel">

doc/src/sdlttfbase.xml

     Basic SDL_ttf wrapper module
 
     All classes and functions listed here are incorporated from the
-    :mod:`pygame2.base` module.
+    :mod:`pygame2.sdlttf.base` module.
   </desc>
 
   <class name="Font">
   <func name="get_error">
     <call>get_error () -> pygame2.Error</call>
     <desc>
-      Gets the last :exc:`pygame2.base.Error` occured.
+      Gets the last :exc:`pygame2.Error` occured.
 
       SDL_ttf maintains an internal error message. This message will usually
-      be given to you when a :exc:`pygame2.base.Error` is raised. You will
+      be given to you when a :exc:`pygame2.Error` is raised. You will
       rarely need to call this function.
     </desc>
   </func>

examples/py2exe_setup.py

 os.environ['PATH'] += ";%s" % pygame2.DLLPATH
 
 # ALWAYS include pygame2.sdl.rwops if you are using some pygame2.sdl or related
-# module that can load or save files or file-like object. Otherwise it might
+# module that can load or save files or file-like objects. Otherwise it might
 # happen that pygame2.sdl.rwops is not included in the final exe/Library.zip,
 # which in turn causes the application to fail badly.
 

src/sdlext/pixelarray.c

 /**
  */
 static PyMethodDef _pixelarray_methods[] = {
-    { "compare", (PyCFunction) _compare, METH_KEYWORDS,
+    { "compare", (PyCFunction) _compare, METH_VARARGS | METH_KEYWORDS,
       DOC_BASE_PIXELARRAY_COMPARE },
-    { "extract", (PyCFunction) _extract_color, METH_KEYWORDS,
+    { "extract", (PyCFunction) _extract_color, METH_VARARGS | METH_KEYWORDS,
       DOC_BASE_PIXELARRAY_EXTRACT },
     { "make_surface", (PyCFunction) _make_surface, METH_NOARGS,
       DOC_BASE_PIXELARRAY_MAKE_SURFACE },
-    { "replace", (PyCFunction) _replace_color, METH_KEYWORDS,
+    { "replace", (PyCFunction) _replace_color, METH_VARARGS | METH_KEYWORDS,
       DOC_BASE_PIXELARRAY_REPLACE },
     { NULL, NULL, 0, NULL }
 };