diff options
| author | dherrada <33632497+dherrada@users.noreply.github.com> | 2020-07-21 16:18:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 16:18:51 -0400 |
| commit | 9e3fa863f1d0dcf8eae54554ffc7016eaa6de157 (patch) | |
| tree | 5130e268b1fad9dec287e93e3505a5a9a61a9249 /shared-bindings | |
| parent | 612c6bb86b8762aa9388566eb69db9bbe4e8bbe4 (diff) | |
| parent | e047ea287f6658f1a1fd10ab31f45f25bce846c1 (diff) | |
Merge branch 'main' into type_hints
Diffstat (limited to 'shared-bindings')
| -rw-r--r-- | shared-bindings/network/__init__.c | 3 | ||||
| -rw-r--r-- | shared-bindings/socket/__init__.c | 3 | ||||
| -rw-r--r-- | shared-bindings/vectorio/Polygon.c | 15 | ||||
| -rw-r--r-- | shared-bindings/wiznet/__init__.c | 7 |
4 files changed, 13 insertions, 15 deletions
diff --git a/shared-bindings/network/__init__.c b/shared-bindings/network/__init__.c index c6cc33bf7..35bbaa510 100644 --- a/shared-bindings/network/__init__.c +++ b/shared-bindings/network/__init__.c @@ -40,6 +40,9 @@ //| """Network Interface Management //| +//| .. warning:: This module is disabled in 6.x and will removed in 7.x. Please use networking +//| libraries instead. +//| //| This module provides a registry of configured NICs. //| It is used by the 'socket' module to look up a suitable //| NIC when a socket is created.""" diff --git a/shared-bindings/socket/__init__.c b/shared-bindings/socket/__init__.c index 413940f6d..a2007edf6 100644 --- a/shared-bindings/socket/__init__.c +++ b/shared-bindings/socket/__init__.c @@ -39,6 +39,9 @@ //| """TCP, UDP and RAW socket support //| +//| .. warning:: This module is disabled in 6.x and will removed in 7.x. Please use networking +//| libraries instead. (Native networking will provide a socket compatible class.) +//| //| Create TCP, UDP and RAW sockets for communicating over the Internet.""" //| diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c index 486619eae..b5c9d1c42 100644 --- a/shared-bindings/vectorio/Polygon.c +++ b/shared-bindings/vectorio/Polygon.c @@ -49,20 +49,7 @@ static mp_obj_t vectorio_polygon_make_new(const mp_obj_type_t *type, size_t n_ar //| STATIC mp_obj_t vectorio_polygon_obj_get_points(mp_obj_t self_in) { vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in); - mp_obj_t list = mp_obj_new_list(0, NULL); - - size_t len = 0; - mp_obj_t *items; - mp_obj_list_get(common_hal_vectorio_polygon_get_points(self), &len, &items); - - for (size_t i = 0; i < len; i += 2) { - mp_obj_t tuple[] = { items[i], items[i+1] }; - mp_obj_list_append( - list, - mp_obj_new_tuple(2, tuple) - ); - } - return list; + return common_hal_vectorio_polygon_get_points(self); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_polygon_get_points_obj, vectorio_polygon_obj_get_points); diff --git a/shared-bindings/wiznet/__init__.c b/shared-bindings/wiznet/__init__.c index bc7ff150f..8df06b546 100644 --- a/shared-bindings/wiznet/__init__.c +++ b/shared-bindings/wiznet/__init__.c @@ -35,7 +35,12 @@ #include "shared-module/network/__init__.h" -//| """Support for WizNet hardware, including the WizNet 5500 Ethernet adaptor.""" +//| """Support for WizNet hardware, including the WizNet 5500 Ethernet adaptor. +//| +//| +//| .. warning:: This module is disabled in 6.x and will removed in 7.x. Please use networking +//| libraries instead. +//| """ //| extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k; |
