Merge pull request adafruit#2780 from AndrewR-L/patch-1

tannewt · web-flow · commit 08375c79307c · 2020-07-13T16:29:58.000-07:00
busio/UART: Correct and clarify readline() return.
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
@@ -199,12 +199,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_
 //|         *New in CircuitPython 4.0:* No length parameter is permitted."""
 //|         ...
 //|
-
 //|     def readline(self, ) -> Any:
-//|         """Read a line, ending in a newline character.
+//|         """Read a line, ending in a newline character, or
+//|            return None if a timeout occurs sooner, or
+//|            return everything readable if no newline is found and timeout=0
 //|
 //|         :return: the line read
-//|         :rtype: int or None"""
+//|         :rtype: bytes or None"""
 //|         ...
 //|
 
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
@@ -102,7 +102,7 @@ mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp
 //|           * ``tm_month``: the month, range [1, 12]
 //|           * ``tm_mday``: the day of the month, range [1, 31]
 //|           * ``tm_hour``: the hour, range [0, 23]
-//|           * ``tm_minute``: the minute, range [0, 59]
+//|           * ``tm_min``: the minute, range [0, 59]
 //|           * ``tm_sec``: the second, range [0, 61]
 //|           * ``tm_wday``: the day of the week, range [0, 6], Monday is 0
 //|           * ``tm_yday``: the day of the year, range [1, 366], -1 indicates not known
