Skip to content

Commit

Permalink
Merge pull request #3266 from Starbuck5/typo-fixes2
Browse files Browse the repository at this point in the history
Typo fixes
  • Loading branch information
damusss authored Dec 16, 2024
2 parents a99c8e0 + 86d3086 commit 5d83e1a
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion buildconfig/stubs/stubcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def stubs_check():
continue

cmd = " ".join(stubtest)
print(f"Using stubtest invokation: `{cmd}` (version: {version})")
print(f"Using stubtest invocation: `{cmd}` (version: {version})")
prev_dir = os.getcwd()
try:
os.chdir(STUBS_BASE_DIR)
Expand Down
4 changes: 2 additions & 2 deletions docs/reST/ref/draw.rst
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ object around the draw calls (see :func:`pygame.Surface.lock` and

.. versionchangedold:: 2.0.0 Added support for keyword arguments.
.. versionchanged:: 2.4.0 Removed deprecated 'blend' argument
.. versionchanged:: 2.5.0 ``blend`` argument readded for backcompat, but will always raise a deprecation exception when used
.. versionchanged:: 2.5.0 ``blend`` argument re-added for backcompat, but will always raise a deprecation exception when used
.. versionchanged:: 2.5.3 Added line width

.. ## pygame.draw.aaline ##
Expand Down Expand Up @@ -533,7 +533,7 @@ object around the draw calls (see :func:`pygame.Surface.lock` and

.. versionchangedold:: 2.0.0 Added support for keyword arguments.
.. versionchanged:: 2.4.0 Removed deprecated ``blend`` argument
.. versionchanged:: 2.5.0 ``blend`` argument readded for backcompat, but will always raise a deprecation exception when used
.. versionchanged:: 2.5.0 ``blend`` argument re-added for backcompat, but will always raise a deprecation exception when used

.. ## pygame.draw.aalines ##
Expand Down
2 changes: 1 addition & 1 deletion docs/reST/ref/window.rst
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@

.. attribute:: utility

| :sl:`Get if the windos is an utility window (**read-only**)`
| :sl:`Get if the window is an utility window (**read-only**)`
| :sg:`utility -> bool`
``True`` if the window doesn't appear in the task bar, ``False`` otherwise.
Expand Down
2 changes: 1 addition & 1 deletion examples/ninepatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def ninepatch_scale(
) # when alpha is False the flags become 0

# aliases
ret_w, ret_h = size # non-sequence argument catched by python
ret_w, ret_h = size # non-sequence argument caught by python
src_w, src_h = surface.size
c = corner_size
scale_func = pygame.transform.smoothscale if smooth else pygame.transform.scale
Expand Down
16 changes: 8 additions & 8 deletions src_c/_sdl2/controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ controller_attached(pgControllerObject *self, PyObject *_null)
{
CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

return PyBool_FromLong(SDL_GameControllerGetAttached(self->controller));
Expand All @@ -171,7 +171,7 @@ controller_as_joystick(pgControllerObject *self, PyObject *_null)
CONTROLLER_INIT_CHECK();
JOYSTICK_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

return pgJoystick_New(self->id);
Expand All @@ -188,7 +188,7 @@ controller_get_axis(pgControllerObject *self, PyObject *args, PyObject *kwargs)
}
CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

if (axis < 0 || axis > SDL_CONTROLLER_AXIS_MAX - 1) {
Expand All @@ -210,7 +210,7 @@ controller_get_button(pgControllerObject *self, PyObject *args,
}
CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

if (button < 0 || button > SDL_CONTROLLER_BUTTON_MAX) {
Expand All @@ -230,7 +230,7 @@ controller_get_mapping(pgControllerObject *self, PyObject *_null)

CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

mapping = SDL_GameControllerMapping(self->controller);
Expand Down Expand Up @@ -285,7 +285,7 @@ controller_set_mapping(pgControllerObject *self, PyObject *args,

CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

char guid_str[64];
Expand Down Expand Up @@ -364,7 +364,7 @@ controller_rumble(pgControllerObject *self, PyObject *args, PyObject *kwargs)

CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}

// rumble takes values in range 0 to 0xFFFF (65535)
Expand All @@ -382,7 +382,7 @@ controller_stop_rumble(pgControllerObject *self, PyObject *_null)
{
CONTROLLER_INIT_CHECK();
if (!self->controller) {
return RAISE(pgExc_SDLError, "Controller is not initalized");
return RAISE(pgExc_SDLError, "Controller is not initialized");
}
SDL_GameControllerRumble(self->controller, 0, 0, 1);
Py_RETURN_NONE;
Expand Down
2 changes: 1 addition & 1 deletion src_c/doc/window_doc.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define DOC_WINDOW_POSITION "position -> (int, int) or WINDOWPOS_CENTERED or WINDOWPOS_UNDEFINED\nGet or set the window position in screen coordinates"
#define DOC_WINDOW_OPACITY "opacity -> float\nGet or set the window opacity, between 0.0 (fully transparent) and 1.0 (fully opaque)"
#define DOC_WINDOW_OPENGL "opengl -> bool\nGet if the window supports OpenGL"
#define DOC_WINDOW_UTILITY "utility -> bool\nGet if the windos is an utility window (**read-only**)"
#define DOC_WINDOW_UTILITY "utility -> bool\nGet if the window is an utility window (**read-only**)"
#define DOC_WINDOW_FROMDISPLAYMODULE "from_display_module() -> Window\nCreate a Window object using window data from display module"
#define DOC_WINDOW_GETSURFACE "get_surface() -> Surface\nGet the window surface"
#define DOC_WINDOW_FLIP "flip() -> None\nUpdate the display surface to the window."
Expand Down
2 changes: 1 addition & 1 deletion src_c/simd_transform_avx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ grayscale_avx2(SDL_Surface *src, SDL_Surface *newsurf)
mm256_dst = _mm256_hadd_epi16(mm256_dstA, mm256_dstB);
mm256_dst =
_mm256_add_epi16(mm256_dst, _mm256_srli_epi32(mm256_dst, 16));
// Shuffle the gray value from ther first channel of each pixel
// Shuffle the gray value from the first channel of each pixel
// into every channel of each pixel
mm256_dst = _mm256_shuffle_epi8(mm256_dst, mm256_shuff_mask_gray);

Expand Down
4 changes: 2 additions & 2 deletions src_c/window.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ window_init(pgWindowObject *self, PyObject *args, PyObject *kwargs)
const char *_key_str;
int _value_bool;

// ensure display is init at this point, diplay init automatically calls
// ensure display is init at this point, display init automatically calls
// the window init in this module
if (!pg_mod_autoinit(IMPPREFIX "display"))
return -1;
Expand Down Expand Up @@ -1071,7 +1071,7 @@ window_from_display_module(PyTypeObject *cls, PyObject *_null)
return NULL;
}

// ensure display is init at this point, diplay init automatically calls
// ensure display is init at this point, display init automatically calls
// the window init in this module
if (!pg_mod_autoinit(IMPPREFIX "display"))
return NULL;
Expand Down

0 comments on commit 5d83e1a

Please sign in to comment.