From d852d0f04328fb348eb74a64d8fd2f7389b8f828 Mon Sep 17 00:00:00 2001 From: Craig Forbes Date: Fri, 14 Jun 2019 15:29:47 -0500 Subject: [PATCH 1/5] Explicitly set the locale when sorting translation files. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a4cf609f6..b9c489fd40 100644 --- a/Makefile +++ b/Makefile @@ -204,7 +204,7 @@ pseudoxml: all-source: locale/circuitpython.pot: all-source - find $(TRANSLATE_SOURCES) -iname "*.c" -print0 | sort -z | xargs -0 xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale + find $(TRANSLATE_SOURCES) -iname "*.c" -print0 | (LC_ALL=C sort -z) | xargs -0 xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale translate: locale/circuitpython.pot for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done From db74b92e77757caab7c5f2bb1d6ae09f5be3ed97 Mon Sep 17 00:00:00 2001 From: Craig Forbes Date: Fri, 14 Jun 2019 15:30:38 -0500 Subject: [PATCH 2/5] Fix displayio.Display docstring type for display_bus. Add docs for group parameter for Display.show. --- shared-bindings/displayio/Display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index 84302a1752..1a36872a6e 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -78,7 +78,8 @@ //| The initialization sequence should always leave the display memory access inline with the scan //| of the display to minimize tearing artifacts. //| -//| :param displayio.FourWire or displayio.ParallelBus display_bus: The bus that the display is connected to +//| :param display_bus: The bus that the display is connected to +//| :type display_bus: displayio.FourWire or displayio.ParallelBus //| :param buffer init_sequence: Byte-packed initialization sequence. //| :param int width: Width in pixels //| :param int height: Height in pixels @@ -182,6 +183,7 @@ static displayio_display_obj_t* native_display(mp_obj_t display_obj) { //| Switches to displaying the given group of layers. When group is None, the default //| CircuitPython terminal will be shown. //| +//| :param Group group: The group to show. STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in) { displayio_display_obj_t *self = native_display(self_in); displayio_group_t* group = NULL; From 0bb92d4fc33a1cf28418dadca87dce4b4d9758e2 Mon Sep 17 00:00:00 2001 From: Craig Forbes Date: Mon, 17 Jun 2019 10:01:23 -0500 Subject: [PATCH 3/5] Fix references to cpython in builtins documentation. --- docs/library/builtins.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst index 0061a8cea0..6cbf95d53c 100644 --- a/docs/library/builtins.rst +++ b/docs/library/builtins.rst @@ -182,7 +182,7 @@ Exceptions .. exception:: OSError - |see_cpython| `OSError`. CircuitPython doesn't implement the ``errno`` + |see_cpython| :py:class:`cpython:OSError`. CircuitPython doesn't implement the ``errno`` attribute, instead use the standard way to access exception arguments: ``exc.args[0]``. @@ -198,11 +198,11 @@ Exceptions .. exception:: SystemExit - |see_cpython| :py:class:`python:SystemExit`. + |see_cpython| :py:class:`cpython:SystemExit`. .. exception:: TypeError - |see_cpython| :py:class:`python:TypeError`. + |see_cpython| :py:class:`cpython:TypeError`. .. exception:: ValueError From e442efbdecf35066412efc155e20ee280c5449f3 Mon Sep 17 00:00:00 2001 From: Craig Forbes Date: Mon, 17 Jun 2019 11:58:05 -0500 Subject: [PATCH 4/5] Fix docs in digitalio. --- shared-bindings/digitalio/DigitalInOut.c | 4 ++-- shared-bindings/digitalio/Direction.c | 2 +- shared-bindings/digitalio/DriveMode.c | 2 +- shared-bindings/digitalio/Pull.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c index 6587ee7ea1..16472c12c1 100644 --- a/shared-bindings/digitalio/DigitalInOut.c +++ b/shared-bindings/digitalio/DigitalInOut.c @@ -49,8 +49,8 @@ //| ========================================================= //| //| A DigitalInOut is used to digitally control I/O pins. For analog control of -//| a pin, see the :py:class:`~digitalio.AnalogIn` and -//| :py:class:`~digitalio.AnalogOut` classes. +//| a pin, see the :py:class:`analogio.AnalogIn` and +//| :py:class:`analogio.AnalogOut` classes. //| //| .. class:: DigitalInOut(pin) diff --git a/shared-bindings/digitalio/Direction.c b/shared-bindings/digitalio/Direction.c index a3433d4b07..c8188fc899 100644 --- a/shared-bindings/digitalio/Direction.c +++ b/shared-bindings/digitalio/Direction.c @@ -43,7 +43,7 @@ //| :class:`Direction` -- defines the direction of a digital pin //| ============================================================= //| -//| .. class:: digitalio.DigitalInOut.Direction +//| .. class:: Direction //| //| Enum-like class to define which direction the digital values are //| going. diff --git a/shared-bindings/digitalio/DriveMode.c b/shared-bindings/digitalio/DriveMode.c index 477cd904c4..51e1e2ee50 100644 --- a/shared-bindings/digitalio/DriveMode.c +++ b/shared-bindings/digitalio/DriveMode.c @@ -31,7 +31,7 @@ //| :class:`DriveMode` -- defines the drive mode of a digital pin //| ============================================================= //| -//| .. class:: digitalio.DriveMode +//| .. class:: DriveMode //| //| Enum-like class to define the drive mode used when outputting //| digital values. diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c index 8d03f6c051..813268db78 100644 --- a/shared-bindings/digitalio/Pull.c +++ b/shared-bindings/digitalio/Pull.c @@ -31,7 +31,7 @@ //| :class:`Pull` -- defines the pull of a digital input pin //| ============================================================= //| -//| .. class:: digitalio.Pull +//| .. class:: Pull //| //| Enum-like class to define the pull value, if any, used while reading //| digital values in. From 09e7f4db00c13dd7fcea0fac3ced5ce9749ba331 Mon Sep 17 00:00:00 2001 From: Craig Forbes Date: Tue, 18 Jun 2019 18:44:50 -0500 Subject: [PATCH 5/5] Fix reference to Bitmap in fontio.Glyph docs. --- shared-bindings/fontio/Glyph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/fontio/Glyph.c b/shared-bindings/fontio/Glyph.c index 80298fd16f..a232841521 100644 --- a/shared-bindings/fontio/Glyph.c +++ b/shared-bindings/fontio/Glyph.c @@ -37,7 +37,7 @@ //| //| Named tuple used to capture a single glyph and its attributes. //| -//| :param fontio.Bitmap bitmap: the bitmap including the glyph +//| :param displayio.Bitmap bitmap: the bitmap including the glyph //| :param int tile_index: the tile index within the bitmap //| :param int width: the width of the glyph's bitmap //| :param int height: the height of the glyph's bitmap