Skip to content

Commit 2c0fa0f

Browse files
dhalbertdhalbert
committed
initial merge from v1.20.0; just satisifying conflicts
2 parents 841ce09 + 294baf5 commit 2c0fa0f

File tree

567 files changed

+11976
-8426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

567 files changed

+11976
-8426
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
#all: Reformat remaining C code that doesn't have a space after a comma.
1+
# top: Update Python formatting to black "2023 stable style".
2+
8b2748269244304854b3462cb8902952b4dcb892
3+
4+
# all: Reformat remaining C code that doesn't have a space after a comma.
25
5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
36

47
# ports: Reformat more C and Python source code.

‎LICENSE‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
MIT License
1+
The MIT License (MIT)
22

3-
Copyright (c) 2013-2022 Damien P. George and others
3+
Copyright (c) 2013-2023 Damien P. George
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -9,8 +9,8 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99
copies of the Software, and to permit persons to whom the Software is
1010
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

‎devices/ble_hci/common-hal/_bleio/att.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "shared-bindings/_bleio/Service.h"
4545
#include "shared-bindings/_bleio/UUID.h"
4646
#include "supervisor/shared/tick.h"
47-
#include "supervisor/shared/translate/translate.h"
4847

4948
STATIC uint16_t max_mtu = BT_ATT_DEFAULT_LE_MTU; // 23
5049
STATIC unsigned long timeout = 5000;

‎docs/library/array.rst‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,55 @@ Classes
2727

2828
Append new elements as contained in `iterable` to the end of
2929
array, growing it.
30+
31+
.. method:: __getitem__(index)
32+
33+
Indexed read of the array, called as ``a[index]`` (where ``a`` is an ``array``).
34+
Returns a value if *index* is an ``int`` and an ``array`` if *index* is a slice.
35+
Negative indices count from the end and ``IndexError`` is thrown if the index is
36+
out of range.
37+
38+
**Note:** ``__getitem__`` cannot be called directly (``a.__getitem__(index)`` fails) and
39+
is not present in ``__dict__``, however ``a[index]`` does work.
40+
41+
.. method:: __setitem__(index, value)
42+
43+
Indexed write into the array, called as ``a[index] = value`` (where ``a`` is an ``array``).
44+
``value`` is a single value if *index* is an ``int`` and an ``array`` if *index* is a slice.
45+
Negative indices count from the end and ``IndexError`` is thrown if the index is out of range.
46+
47+
**Note:** ``__setitem__`` cannot be called directly (``a.__setitem__(index, value)`` fails) and
48+
is not present in ``__dict__``, however ``a[index] = value`` does work.
49+
50+
.. method:: __len__()
51+
52+
Returns the number of items in the array, called as ``len(a)`` (where ``a`` is an ``array``).
53+
54+
**Note:** ``__len__`` cannot be called directly (``a.__len__()`` fails) and the
55+
method is not present in ``__dict__``, however ``len(a)`` does work.
56+
57+
.. method:: __add__(other)
58+
59+
Return a new ``array`` that is the concatenation of the array with *other*, called as
60+
``a + other`` (where ``a`` and *other* are both ``arrays``).
61+
62+
**Note:** ``__add__`` cannot be called directly (``a.__add__(other)`` fails) and
63+
is not present in ``__dict__``, however ``a + other`` does work.
64+
65+
.. method:: __iadd__(other)
66+
67+
Concatenates the array with *other* in-place, called as ``a += other`` (where ``a`` and *other*
68+
are both ``arrays``). Equivalent to ``extend(other)``.
69+
70+
**Note:** ``__iadd__`` cannot be called directly (``a.__iadd__(other)`` fails) and
71+
is not present in ``__dict__``, however ``a += other`` does work.
72+
73+
.. method:: __repr__()
74+
75+
Returns the string representation of the array, called as ``str(a)`` or ``repr(a)```
76+
(where ``a`` is an ``array``). Returns the string ``"array(<type>, [<elements>])"``,
77+
where ``<type>`` is the type code letter for the array and ``<elements>`` is a comma
78+
seperated list of the elements of the array.
79+
80+
**Note:** ``__repr__`` cannot be called directly (``a.__repr__()`` fails) and
81+
is not present in ``__dict__``, however ``str(a)`` and ``repr(a)`` both work.

‎docs/reference/glossary.rst‎

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)