4 files changed, 10 insertions, 57 deletions
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 6b053ad7e..0939910dc 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -284,7 +284,7 @@ const mp_obj_type_t busio_uart_type = {
     { &mp_type_type },
     .name = MP_QSTR_UART,
     .make_new = busio_uart_make_new,
-    .getiter = mp_identity,
+    .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
     .protocol = &uart_stream_p,
     .locals_dict = (mp_obj_dict_t*)&busio_uart_locals_dict,
diff --git a/shared-bindings/help.c b/shared-bindings/help.c
index 1230fb04f..a3ae94797 100644
--- a/shared-bindings/help.c
+++ b/shared-bindings/help.c
@@ -24,25 +24,12 @@
  * THE SOFTWARE.
  */
 
-#include "lib/utils/pyhelp.h"
-#include "shared-bindings/help.h"
+#include "genhdr/mpversion.h"
 
-//| :func:`help` - Built-in method to provide helpful information
-//| ==============================================================
-//|
-//| .. method:: help(object=None)
-//|
-//|   Prints a help method about the given object. When ``object`` is none,
-//|   prints general port information.
-//|
-STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
-    if (n_args == 0) {
-        shared_module_help();
-    } else {
-        // try to print something sensible about the given object
-        pyhelp_print_obj(args[0]);
-    }
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help);
+const char *circuitpython_help_text =
+    "Welcome to Adafruit CircuitPython " MICROPY_GIT_TAG "!\r\n"
+    "\r\n"
+    "Please visit learn.adafruit.com/category/circuitpython for project guides.\r\n"
+    "\r\n"
+    "To list built-in modules please do `help(\"modules\")`.\r\n";
+;
diff --git a/shared-bindings/help.h b/shared-bindings/help.h
deleted file mode 100644
index db62f96f9..000000000
--- a/shared-bindings/help.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_HELP_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_HELP_H__
-
-#include "py/obj.h"
-
-extern void shared_module_help(void);
-
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_HELP_H__
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index 9ad631a63..a224f9026 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -116,7 +116,7 @@ const mp_obj_namedtuple_type_t struct_time_type_obj = {
         .attr = namedtuple_attr,
         .subscr = mp_obj_tuple_subscr,
         .getiter = mp_obj_tuple_getiter,
-        .bases_tuple = (mp_obj_tuple_t*)(mp_rom_obj_tuple_t*)&namedtuple_base_tuple,
+        .parent = &mp_type_tuple,
     },
     .n_fields = 9,
     .fields = {