From 64b8817c0d0616f84b764a11af0c37d180684caf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Mar 2022 13:30:34 +1100
Subject: [PATCH 001/343] all: Update formatting for new Black version 22.1.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../email.internal/email/_encoded_words.py         |  2 +-
 python-stdlib/timeit/timeit.py                     |  2 +-
 unix-ffi/datetime/datetime.py                      |  2 +-
 unix-ffi/datetime/test_datetime.py                 | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/python-stdlib/email.internal/email/_encoded_words.py b/python-stdlib/email.internal/email/_encoded_words.py
index d4c3380b2..ac982cf0c 100644
--- a/python-stdlib/email.internal/email/_encoded_words.py
+++ b/python-stdlib/email.internal/email/_encoded_words.py
@@ -63,7 +63,7 @@
 
 # regex based decoder.
 _q_byte_subber = functools.partial(
-    re.compile(br"=([a-fA-F0-9]{2})").sub, lambda m: bytes([int(m.group(1), 16)])
+    re.compile(rb"=([a-fA-F0-9]{2})").sub, lambda m: bytes([int(m.group(1), 16)])
 )
 
 
diff --git a/python-stdlib/timeit/timeit.py b/python-stdlib/timeit/timeit.py
index 446394bdf..fabcd51b4 100644
--- a/python-stdlib/timeit/timeit.py
+++ b/python-stdlib/timeit/timeit.py
@@ -316,7 +316,7 @@ def main(args=None, *, _wrap_timer=None):
     if number == 0:
         # determine number so that 0.2 <= total time < 2.0
         for i in range(1, 10):
-            number = 10 ** i
+            number = 10**i
             try:
                 x = t.timeit(number)
             except:
diff --git a/unix-ffi/datetime/datetime.py b/unix-ffi/datetime/datetime.py
index f9eeb90f7..8f3dff0d0 100644
--- a/unix-ffi/datetime/datetime.py
+++ b/unix-ffi/datetime/datetime.py
@@ -476,7 +476,7 @@ def plural(n):
 
     def total_seconds(self):
         """Total seconds in the duration."""
-        return ((self.days * 86400 + self.seconds) * 10 ** 6 + self.microseconds) / 10 ** 6
+        return ((self.days * 86400 + self.seconds) * 10**6 + self.microseconds) / 10**6
 
     # Read-only field accessors
     @property
diff --git a/unix-ffi/datetime/test_datetime.py b/unix-ffi/datetime/test_datetime.py
index 180ad194f..463f2b28a 100644
--- a/unix-ffi/datetime/test_datetime.py
+++ b/unix-ffi/datetime/test_datetime.py
@@ -611,7 +611,7 @@ def test_overflow(self):
         self.assertRaises(OverflowError, lambda: -timedelta.max)
 
         day = timedelta(1)
-        self.assertRaises(OverflowError, day.__mul__, 10 ** 9)
+        self.assertRaises(OverflowError, day.__mul__, 10**9)
         self.assertRaises(OverflowError, day.__mul__, 1e9)
         self.assertRaises(OverflowError, day.__truediv__, 1e-20)
         self.assertRaises(OverflowError, day.__truediv__, 1e-10)
@@ -1692,7 +1692,7 @@ def test_computations(self):
         self.assertRaises(TypeError, lambda: a + a)
 
     def test_pickling(self):
-        args = 6, 7, 23, 20, 59, 1, 64 ** 2
+        args = 6, 7, 23, 20, 59, 1, 64**2
         orig = self.theclass(*args)
         for pickler, unpickler, proto in pickle_choices:
             green = pickler.dumps(orig, proto)
@@ -1709,7 +1709,7 @@ def test_more_pickling(self):
 
     @unittest.skip("Skip pickling for MicroPython")
     def test_pickling_subclass_datetime(self):
-        args = 6, 7, 23, 20, 59, 1, 64 ** 2
+        args = 6, 7, 23, 20, 59, 1, 64**2
         orig = SubclassDatetime(*args)
         for pickler, unpickler, proto in pickle_choices:
             green = pickler.dumps(orig, proto)
@@ -2298,7 +2298,7 @@ def test_resolution_info(self):
         self.assertTrue(self.theclass.max > self.theclass.min)
 
     def test_pickling(self):
-        args = 20, 59, 16, 64 ** 2
+        args = 20, 59, 16, 64**2
         orig = self.theclass(*args)
         for pickler, unpickler, proto in pickle_choices:
             green = pickler.dumps(orig, proto)
@@ -2307,7 +2307,7 @@ def test_pickling(self):
 
     @unittest.skip("Skip pickling for MicroPython")
     def test_pickling_subclass_time(self):
-        args = 20, 59, 16, 64 ** 2
+        args = 20, 59, 16, 64**2
         orig = SubclassTime(*args)
         for pickler, unpickler, proto in pickle_choices:
             green = pickler.dumps(orig, proto)
@@ -2686,7 +2686,7 @@ def test_hash_edge_cases(self):
 
     def test_pickling(self):
         # Try one without a tzinfo.
-        args = 20, 59, 16, 64 ** 2
+        args = 20, 59, 16, 64**2
         orig = self.theclass(*args)
         for pickler, unpickler, proto in pickle_choices:
             green = pickler.dumps(orig, proto)
@@ -2916,7 +2916,7 @@ def utcoffset(self, dt):
 
     def test_pickling(self):
         # Try one without a tzinfo.
-        args = 6, 7, 23, 20, 59, 1, 64 ** 2
+        args = 6, 7, 23, 20, 59, 1, 64**2
         orig = self.theclass(*args)
         for pickler, unpickler, proto in pickle_choices:
             green = pickler.dumps(orig, proto)

From fc86070ffb8aeead50d597532567a76ad3a6a6ea Mon Sep 17 00:00:00 2001
From: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
Date: Sun, 26 Sep 2021 21:57:49 +0200
Subject: [PATCH 002/343] python-stdlib/datetime: Add new implementation of
 datetime module.

This new module is a port of Python datetime providing classes for
manipulating dates, times, and deltas.  It completely replaces the existing
unix-ffi version.

Signed-off-by: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
---
 python-stdlib/datetime/datetime.py      |  879 +++++
 python-stdlib/datetime/localtz.patch    |   84 +
 python-stdlib/datetime/metadata.txt     |    4 +
 python-stdlib/datetime/setup.py         |   24 +
 python-stdlib/datetime/test_datetime.py | 2269 +++++++++++++
 unix-ffi/datetime/datetime.py           | 2276 -------------
 unix-ffi/datetime/metadata.txt          |    3 -
 unix-ffi/datetime/setup.py              |   24 -
 unix-ffi/datetime/test_datetime.py      | 3881 -----------------------
 9 files changed, 3260 insertions(+), 6184 deletions(-)
 create mode 100644 python-stdlib/datetime/datetime.py
 create mode 100644 python-stdlib/datetime/localtz.patch
 create mode 100644 python-stdlib/datetime/metadata.txt
 create mode 100644 python-stdlib/datetime/setup.py
 create mode 100644 python-stdlib/datetime/test_datetime.py
 delete mode 100644 unix-ffi/datetime/datetime.py
 delete mode 100644 unix-ffi/datetime/metadata.txt
 delete mode 100644 unix-ffi/datetime/setup.py
 delete mode 100644 unix-ffi/datetime/test_datetime.py

diff --git a/python-stdlib/datetime/datetime.py b/python-stdlib/datetime/datetime.py
new file mode 100644
index 000000000..b3cd9b94f
--- /dev/null
+++ b/python-stdlib/datetime/datetime.py
@@ -0,0 +1,879 @@
+# datetime.py
+
+import time as _tmod
+
+__version__ = "2.0.0"
+
+_DBM = (0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334)
+_DIM = (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
+_TIME_SPEC = ("auto", "hours", "minutes", "seconds", "milliseconds", "microseconds")
+
+
+def _leap(y):
+    return y % 4 == 0 and (y % 100 != 0 or y % 400 == 0)
+
+
+def _dby(y):
+    # year -> number of days before January 1st of year.
+    Y = y - 1
+    return Y * 365 + Y // 4 - Y // 100 + Y // 400
+
+
+def _dim(y, m):
+    # year, month -> number of days in that month in that year.
+    if m == 2 and _leap(y):
+        return 29
+    return _DIM[m]
+
+
+def _dbm(y, m):
+    # year, month -> number of days in year preceding first day of month.
+    return _DBM[m] + (m > 2 and _leap(y))
+
+
+def _ymd2o(y, m, d):
+    # y, month, day -> ordinal, considering 01-Jan-0001 as day 1.
+    return _dby(y) + _dbm(y, m) + d
+
+
+def _o2ymd(n):
+    # ordinal -> (year, month, day), considering 01-Jan-0001 as day 1.
+    n -= 1
+    n400, n = divmod(n, 146_097)
+    y = n400 * 400 + 1
+    n100, n = divmod(n, 36_524)
+    n4, n = divmod(n, 1_461)
+    n1, n = divmod(n, 365)
+    y += n100 * 100 + n4 * 4 + n1
+    if n1 == 4 or n100 == 4:
+        return y - 1, 12, 31
+    m = (n + 50) >> 5
+    prec = _dbm(y, m)
+    if prec > n:
+        m -= 1
+        prec -= _dim(y, m)
+    n -= prec
+    return y, m, n + 1
+
+
+MINYEAR = 1
+MAXYEAR = 9_999
+
+
+class timedelta:
+    def __init__(
+        self, days=0, seconds=0, microseconds=0, milliseconds=0, minutes=0, hours=0, weeks=0
+    ):
+        s = (((weeks * 7 + days) * 24 + hours) * 60 + minutes) * 60 + seconds
+        self._us = round((s * 1000 + milliseconds) * 1000 + microseconds)
+
+    def __repr__(self):
+        return "datetime.timedelta(microseconds={})".format(self._us)
+
+    def total_seconds(self):
+        return self._us / 1_000_000
+
+    @property
+    def days(self):
+        return self._tuple(2)[0]
+
+    @property
+    def seconds(self):
+        return self._tuple(3)[1]
+
+    @property
+    def microseconds(self):
+        return self._tuple(3)[2]
+
+    def __add__(self, other):
+        if isinstance(other, datetime):
+            return other.__add__(self)
+        else:
+            us = other._us
+        return timedelta(0, 0, self._us + us)
+
+    def __sub__(self, other):
+        return timedelta(0, 0, self._us - other._us)
+
+    def __neg__(self):
+        return timedelta(0, 0, -self._us)
+
+    def __pos__(self):
+        return self
+
+    def __abs__(self):
+        return -self if self._us < 0 else self
+
+    def __mul__(self, other):
+        return timedelta(0, 0, round(other * self._us))
+
+    __rmul__ = __mul__
+
+    def __truediv__(self, other):
+        if isinstance(other, timedelta):
+            return self._us / other._us
+        else:
+            return timedelta(0, 0, round(self._us / other))
+
+    def __floordiv__(self, other):
+        if isinstance(other, timedelta):
+            return self._us // other._us
+        else:
+            return timedelta(0, 0, int(self._us // other))
+
+    def __mod__(self, other):
+        return timedelta(0, 0, self._us % other._us)
+
+    def __divmod__(self, other):
+        q, r = divmod(self._us, other._us)
+        return q, timedelta(0, 0, r)
+
+    def __eq__(self, other):
+        return self._us == other._us
+
+    def __le__(self, other):
+        return self._us <= other._us
+
+    def __lt__(self, other):
+        return self._us < other._us
+
+    def __ge__(self, other):
+        return self._us >= other._us
+
+    def __gt__(self, other):
+        return self._us > other._us
+
+    def __bool__(self):
+        return self._us != 0
+
+    def __str__(self):
+        return self._format(0x40)
+
+    def __hash__(self):
+        if not hasattr(self, "_hash"):
+            self._hash = hash(self._us)
+        return self._hash
+
+    def isoformat(self):
+        return self._format(0)
+
+    def _format(self, spec=0):
+        if self._us >= 0:
+            td = self
+            g = ""
+        else:
+            td = -self
+            g = "-"
+        d, h, m, s, us = td._tuple(5)
+        ms, us = divmod(us, 1000)
+        r = ""
+        if spec & 0x40:
+            spec &= ~0x40
+            hr = str(h)
+        else:
+            hr = f"{h:02d}"
+        if spec & 0x20:
+            spec &= ~0x20
+            spec |= 0x10
+            r += "UTC"
+        if spec & 0x10:
+            spec &= ~0x10
+            if not g:
+                g = "+"
+        if d:
+            p = "s" if d > 1 else ""
+            r += f"{g}{d} day{p}, "
+            g = ""
+        if spec == 0:
+            spec = 5 if (ms or us) else 3
+        if spec >= 1 or h:
+            r += f"{g}{hr}"
+            if spec >= 2 or m:
+                r += f":{m:02d}"
+                if spec >= 3 or s:
+                    r += f":{s:02d}"
+                    if spec >= 4 or ms:
+                        r += f".{ms:03d}"
+                        if spec >= 5 or us:
+                            r += f"{us:03d}"
+        return r
+
+    def tuple(self):
+        return self._tuple(5)
+
+    def _tuple(self, n):
+        d, us = divmod(self._us, 86_400_000_000)
+        if n == 2:
+            return d, us
+        s, us = divmod(us, 1_000_000)
+        if n == 3:
+            return d, s, us
+        h, s = divmod(s, 3600)
+        m, s = divmod(s, 60)
+        return d, h, m, s, us
+
+
+timedelta.min = timedelta(days=-999_999_999)
+timedelta.max = timedelta(days=999_999_999, hours=23, minutes=59, seconds=59, microseconds=999_999)
+timedelta.resolution = timedelta(microseconds=1)
+
+
+class tzinfo:
+    # abstract class
+    def tzname(self, dt):
+        raise NotImplementedError
+
+    def utcoffset(self, dt):
+        raise NotImplementedError
+
+    def dst(self, dt):
+        raise NotImplementedError
+
+    def fromutc(self, dt):
+        if dt._tz is not self:
+            raise ValueError
+
+        # See original datetime.py for an explanation of this algorithm.
+        dtoff = dt.utcoffset()
+        dtdst = dt.dst()
+        delta = dtoff - dtdst
+        if delta:
+            dt += delta
+            dtdst = dt.dst()
+        return dt + dtdst
+
+    def isoformat(self, dt):
+        return self.utcoffset(dt)._format(0x12)
+
+
+class timezone(tzinfo):
+    def __init__(self, offset, name=None):
+        if not (abs(offset._us) < 86_400_000_000):
+            raise ValueError
+        self._offset = offset
+        self._name = name
+
+    def __repr__(self):
+        return "datetime.timezone({}, {})".format(repr(self._offset), repr(self._name))
+
+    def __eq__(self, other):
+        if isinstance(other, timezone):
+            return self._offset == other._offset
+        return NotImplemented
+
+    def __str__(self):
+        return self.tzname(None)
+
+    def __hash__(self):
+        if not hasattr(self, "_hash"):
+            self._hash = hash((self._offset, self._name))
+        return self._hash
+
+    def utcoffset(self, dt):
+        return self._offset
+
+    def dst(self, dt):
+        return None
+
+    def tzname(self, dt):
+        if self._name:
+            return self._name
+        return self._offset._format(0x22)
+
+    def fromutc(self, dt):
+        return dt + self._offset
+
+
+timezone.utc = timezone(timedelta(0))
+
+
+def _date(y, m, d):
+    if MINYEAR <= y <= MAXYEAR and 1 <= m <= 12 and 1 <= d <= _dim(y, m):
+        return _ymd2o(y, m, d)
+    elif y == 0 and m == 0 and 1 <= d <= 3_652_059:
+        return d
+    else:
+        raise ValueError
+
+
+def _iso2d(s):  # ISO -> date
+    if len(s) < 10 or s[4] != "-" or s[7] != "-":
+        raise ValueError
+    return int(s[0:4]), int(s[5:7]), int(s[8:10])
+
+
+def _d2iso(o):  # date -> ISO
+    return "%04d-%02d-%02d" % _o2ymd(o)
+
+
+class date:
+    def __init__(self, year, month, day):
+        self._ord = _date(year, month, day)
+
+    @classmethod
+    def fromtimestamp(cls, ts):
+        return cls(*_tmod.localtime(ts)[:3])
+
+    @classmethod
+    def today(cls):
+        return cls(*_tmod.localtime()[:3])
+
+    @classmethod
+    def fromordinal(cls, n):
+        return cls(0, 0, n)
+
+    @classmethod
+    def fromisoformat(cls, s):
+        return cls(*_iso2d(s))
+
+    @property
+    def year(self):
+        return self.tuple()[0]
+
+    @property
+    def month(self):
+        return self.tuple()[1]
+
+    @property
+    def day(self):
+        return self.tuple()[2]
+
+    def toordinal(self):
+        return self._ord
+
+    def timetuple(self):
+        y, m, d = self.tuple()
+        yday = _dbm(y, m) + d
+        return (y, m, d, 0, 0, 0, self.weekday(), yday, -1)
+
+    def replace(self, year=None, month=None, day=None):
+        year_, month_, day_ = self.tuple()
+        if year is None:
+            year = year_
+        if month is None:
+            month = month_
+        if day is None:
+            day = day_
+        return date(year, month, day)
+
+    def __add__(self, other):
+        return date.fromordinal(self._ord + other.days)
+
+    def __sub__(self, other):
+        if isinstance(other, date):
+            return timedelta(days=self._ord - other._ord)
+        else:
+            return date.fromordinal(self._ord - other.days)
+
+    def __eq__(self, other):
+        if isinstance(other, date):
+            return self._ord == other._ord
+        else:
+            return False
+
+    def __le__(self, other):
+        return self._ord <= other._ord
+
+    def __lt__(self, other):
+        return self._ord < other._ord
+
+    def __ge__(self, other):
+        return self._ord >= other._ord
+
+    def __gt__(self, other):
+        return self._ord > other._ord
+
+    def weekday(self):
+        return (self._ord + 6) % 7
+
+    def isoweekday(self):
+        return self._ord % 7 or 7
+
+    def isoformat(self):
+        return _d2iso(self._ord)
+
+    def __repr__(self):
+        return "datetime.date(0, 0, {})".format(self._ord)
+
+    __str__ = isoformat
+
+    def __hash__(self):
+        if not hasattr(self, "_hash"):
+            self._hash = hash(self._ord)
+        return self._hash
+
+    def tuple(self):
+        return _o2ymd(self._ord)
+
+
+date.min = date(MINYEAR, 1, 1)
+date.max = date(MAXYEAR, 12, 31)
+date.resolution = timedelta(days=1)
+
+
+def _time(h, m, s, us, fold):
+    if (
+        0 <= h < 24
+        and 0 <= m < 60
+        and 0 <= s < 60
+        and 0 <= us < 1_000_000
+        and (fold == 0 or fold == 1)
+    ) or (h == 0 and m == 0 and s == 0 and 0 < us < 86_400_000_000):
+        return timedelta(0, s, us, 0, m, h)
+    else:
+        raise ValueError
+
+
+def _iso2t(s):
+    hour = 0
+    minute = 0
+    sec = 0
+    usec = 0
+    tz_sign = ""
+    tz_hour = 0
+    tz_minute = 0
+    tz_sec = 0
+    tz_usec = 0
+    l = len(s)
+    i = 0
+    if l < 2:
+        raise ValueError
+    i += 2
+    hour = int(s[i - 2 : i])
+    if l > i and s[i] == ":":
+        i += 3
+        if l - i < 0:
+            raise ValueError
+        minute = int(s[i - 2 : i])
+        if l > i and s[i] == ":":
+            i += 3
+            if l - i < 0:
+                raise ValueError
+            sec = int(s[i - 2 : i])
+            if l > i and s[i] == ".":
+                i += 4
+                if l - i < 0:
+                    raise ValueError
+                usec = 1000 * int(s[i - 3 : i])
+                if l > i and s[i] != "+":
+                    i += 3
+                    if l - i < 0:
+                        raise ValueError
+                    usec += int(s[i - 3 : i])
+    if l > i:
+        if s[i] not in "+-":
+            raise ValueError
+        tz_sign = s[i]
+        i += 6
+        if l - i < 0:
+            raise ValueError
+        tz_hour = int(s[i - 5 : i - 3])
+        tz_minute = int(s[i - 2 : i])
+        if l > i and s[i] == ":":
+            i += 3
+            if l - i < 0:
+                raise ValueError
+            tz_sec = int(s[i - 2 : i])
+            if l > i and s[i] == ".":
+                i += 7
+                if l - i < 0:
+                    raise ValueError
+                tz_usec = int(s[i - 6 : i])
+    if l != i:
+        raise ValueError
+    if tz_sign:
+        td = timedelta(hours=tz_hour, minutes=tz_minute, seconds=tz_sec, microseconds=tz_usec)
+        if tz_sign == "-":
+            td = -td
+        tz = timezone(td)
+    else:
+        tz = None
+    return hour, minute, sec, usec, tz
+
+
+def _t2iso(td, timespec, dt, tz):
+    s = td._format(_TIME_SPEC.index(timespec))
+    if tz is not None:
+        s += tz.isoformat(dt)
+    return s
+
+
+class time:
+    def __init__(self, hour=0, minute=0, second=0, microsecond=0, tzinfo=None, *, fold=0):
+        self._td = _time(hour, minute, second, microsecond, fold)
+        self._tz = tzinfo
+        self._fd = fold
+
+    @classmethod
+    def fromisoformat(cls, s):
+        return cls(*_iso2t(s))
+
+    @property
+    def hour(self):
+        return self.tuple()[0]
+
+    @property
+    def minute(self):
+        return self.tuple()[1]
+
+    @property
+    def second(self):
+        return self.tuple()[2]
+
+    @property
+    def microsecond(self):
+        return self.tuple()[3]
+
+    @property
+    def tzinfo(self):
+        return self._tz
+
+    @property
+    def fold(self):
+        return self._fd
+
+    def replace(
+        self, hour=None, minute=None, second=None, microsecond=None, tzinfo=True, *, fold=None
+    ):
+        h, m, s, us, tz, fl = self.tuple()
+        if hour is None:
+            hour = h
+        if minute is None:
+            minute = m
+        if second is None:
+            second = s
+        if microsecond is None:
+            microsecond = us
+        if tzinfo is True:
+            tzinfo = tz
+        if fold is None:
+            fold = fl
+        return time(hour, minute, second, microsecond, tzinfo, fold=fold)
+
+    def isoformat(self, timespec="auto"):
+        return _t2iso(self._td, timespec, None, self._tz)
+
+    def __repr__(self):
+        return "datetime.time(microsecond={}, tzinfo={}, fold={})".format(
+            self._td._us, repr(self._tz), self._fd
+        )
+
+    __str__ = isoformat
+
+    def __bool__(self):
+        return True
+
+    def __eq__(self, other):
+        if (self._tz == None) ^ (other._tz == None):
+            return False
+        return self._sub(other) == 0
+
+    def __le__(self, other):
+        return self._sub(other) <= 0
+
+    def __lt__(self, other):
+        return self._sub(other) < 0
+
+    def __ge__(self, other):
+        return self._sub(other) >= 0
+
+    def __gt__(self, other):
+        return self._sub(other) > 0
+
+    def _sub(self, other):
+        tz1 = self._tz
+        if (tz1 is None) ^ (other._tz is None):
+            raise TypeError
+        us1 = self._td._us
+        us2 = other._td._us
+        if tz1 is not None:
+            os1 = self.utcoffset()._us
+            os2 = other.utcoffset()._us
+            if os1 != os2:
+                us1 -= os1
+                us2 -= os2
+        return us1 - us2
+
+    def __hash__(self):
+        if not hasattr(self, "_hash"):
+            # fold doesn't make any difference
+            self._hash = hash((self._td, self._tz))
+        return self._hash
+
+    def utcoffset(self):
+        return None if self._tz is None else self._tz.utcoffset(None)
+
+    def dst(self):
+        return None if self._tz is None else self._tz.dst(None)
+
+    def tzname(self):
+        return None if self._tz is None else self._tz.tzname(None)
+
+    def tuple(self):
+        d, h, m, s, us = self._td.tuple()
+        return h, m, s, us, self._tz, self._fd
+
+
+time.min = time(0)
+time.max = time(23, 59, 59, 999_999)
+time.resolution = timedelta.resolution
+
+
+class datetime:
+    def __init__(
+        self, year, month, day, hour=0, minute=0, second=0, microsecond=0, tzinfo=None, *, fold=0
+    ):
+        self._d = _date(year, month, day)
+        self._t = _time(hour, minute, second, microsecond, fold)
+        self._tz = tzinfo
+        self._fd = fold
+
+    @classmethod
+    def fromtimestamp(cls, ts, tz=None):
+        if isinstance(ts, float):
+            ts, us = divmod(round(ts * 1_000_000), 1_000_000)
+        else:
+            us = 0
+        if tz is None:
+            raise NotImplementedError
+        else:
+            dt = cls(*_tmod.gmtime(ts)[:6], microsecond=us, tzinfo=tz)
+            dt = tz.fromutc(dt)
+        return dt
+
+    @classmethod
+    def now(cls, tz=None):
+        return cls.fromtimestamp(_tmod.time(), tz)
+
+    @classmethod
+    def fromordinal(cls, n):
+        return cls(0, 0, n)
+
+    @classmethod
+    def fromisoformat(cls, s):
+        d = _iso2d(s)
+        if len(s) <= 12:
+            return cls(*d)
+        t = _iso2t(s[11:])
+        return cls(*(d + t))
+
+    @classmethod
+    def combine(cls, date, time, tzinfo=None):
+        return cls(
+            0, 0, date.toordinal(), 0, 0, 0, time._td._us, tzinfo or time._tz, fold=time._fd
+        )
+
+    @property
+    def year(self):
+        return _o2ymd(self._d)[0]
+
+    @property
+    def month(self):
+        return _o2ymd(self._d)[1]
+
+    @property
+    def day(self):
+        return _o2ymd(self._d)[2]
+
+    @property
+    def hour(self):
+        return self._t.tuple()[1]
+
+    @property
+    def minute(self):
+        return self._t.tuple()[2]
+
+    @property
+    def second(self):
+        return self._t.tuple()[3]
+
+    @property
+    def microsecond(self):
+        return self._t.tuple()[4]
+
+    @property
+    def tzinfo(self):
+        return self._tz
+
+    @property
+    def fold(self):
+        return self._fd
+
+    def __add__(self, other):
+        us = self._t._us + other._us
+        d, us = divmod(us, 86_400_000_000)
+        d += self._d
+        return datetime(0, 0, d, 0, 0, 0, us, self._tz)
+
+    def __sub__(self, other):
+        if isinstance(other, timedelta):
+            return self.__add__(-other)
+        elif isinstance(other, datetime):
+            d, us = self._sub(other)
+            return timedelta(d, 0, us)
+        else:
+            raise TypeError
+
+    def _sub(self, other):
+        # Subtract two datetime instances.
+        tz1 = self._tz
+        if (tz1 is None) ^ (other._tz is None):
+            raise TypeError
+        dt1 = self
+        dt2 = other
+        if tz1 is not None:
+            os1 = dt1.utcoffset()
+            os2 = dt2.utcoffset()
+            if os1 != os2:
+                dt1 -= os1
+                dt2 -= os2
+        D = dt1._d - dt2._d
+        us = dt1._t._us - dt2._t._us
+        d, us = divmod(us, 86_400_000_000)
+        return D + d, us
+
+    def __eq__(self, other):
+        if (self._tz == None) ^ (other._tz == None):
+            return False
+        return self._cmp(other) == 0
+
+    def __le__(self, other):
+        return self._cmp(other) <= 0
+
+    def __lt__(self, other):
+        return self._cmp(other) < 0
+
+    def __ge__(self, other):
+        return self._cmp(other) >= 0
+
+    def __gt__(self, other):
+        return self._cmp(other) > 0
+
+    def _cmp(self, other):
+        # Compare two datetime instances.
+        d, us = self._sub(other)
+        if d < 0:
+            return -1
+        if d > 0:
+            return 1
+
+        if us < 0:
+            return -1
+        if us > 0:
+            return 1
+
+        return 0
+
+    def date(self):
+        return date.fromordinal(self._d)
+
+    def time(self):
+        return time(microsecond=self._t._us, fold=self._fd)
+
+    def timetz(self):
+        return time(microsecond=self._t._us, tzinfo=self._tz, fold=self._fd)
+
+    def replace(
+        self,
+        year=None,
+        month=None,
+        day=None,
+        hour=None,
+        minute=None,
+        second=None,
+        microsecond=None,
+        tzinfo=True,
+        *,
+        fold=None,
+    ):
+        Y, M, D, h, m, s, us, tz, fl = self.tuple()
+        if year is None:
+            year = Y
+        if month is None:
+            month = M
+        if day is None:
+            day = D
+        if hour is None:
+            hour = h
+        if minute is None:
+            minute = m
+        if second is None:
+            second = s
+        if microsecond is None:
+            microsecond = us
+        if tzinfo is True:
+            tzinfo = tz
+        if fold is None:
+            fold = fl
+        return datetime(year, month, day, hour, minute, second, microsecond, tzinfo, fold=fold)
+
+    def astimezone(self, tz=None):
+        if self._tz is tz:
+            return self
+        _tz = self._tz
+        if _tz is None:
+            raise NotImplementedError
+        else:
+            os = _tz.utcoffset(self)
+        utc = self - os
+        utc = utc.replace(tzinfo=tz)
+        return tz.fromutc(utc)
+
+    def utcoffset(self):
+        return None if self._tz is None else self._tz.utcoffset(self)
+
+    def dst(self):
+        return None if self._tz is None else self._tz.dst(self)
+
+    def tzname(self):
+        return None if self._tz is None else self._tz.tzname(self)
+
+    def timetuple(self):
+        if self._tz is None:
+            conv = _tmod.gmtime
+            epoch = datetime.EPOCH.replace(tzinfo=None)
+        else:
+            conv = _tmod.localtime
+            epoch = datetime.EPOCH
+        return conv(round((self - epoch).total_seconds()))
+
+    def toordinal(self):
+        return self._d
+
+    def timestamp(self):
+        if self._tz is None:
+            raise NotImplementedError
+        else:
+            return (self - datetime.EPOCH).total_seconds()
+
+    def weekday(self):
+        return (self._d + 6) % 7
+
+    def isoweekday(self):
+        return self._d % 7 or 7
+
+    def isoformat(self, sep="T", timespec="auto"):
+        return _d2iso(self._d) + sep + _t2iso(self._t, timespec, self, self._tz)
+
+    def __repr__(self):
+        Y, M, D, h, m, s, us, tz, fold = self.tuple()
+        tz = repr(tz)
+        return "datetime.datetime({}, {}, {}, {}, {}, {}, {}, {}, fold={})".format(
+            Y, M, D, h, m, s, us, tz, fold
+        )
+
+    def __str__(self):
+        return self.isoformat(" ")
+
+    def __hash__(self):
+        if not hasattr(self, "_hash"):
+            self._hash = hash((self._d, self._t, self._tz))
+        return self._hash
+
+    def tuple(self):
+        d = _o2ymd(self._d)
+        t = self._t.tuple()[1:]
+        return d + t + (self._tz, self._fd)
+
+
+datetime.EPOCH = datetime(*_tmod.gmtime(0)[:6], tzinfo=timezone.utc)
diff --git a/python-stdlib/datetime/localtz.patch b/python-stdlib/datetime/localtz.patch
new file mode 100644
index 000000000..7a2449d5d
--- /dev/null
+++ b/python-stdlib/datetime/localtz.patch
@@ -0,0 +1,84 @@
+localtz.patch
+
+The CPython's implementation of `datetime.fromtimestamp()`,
+`datetime.astimezone()` and `datetime.timestamp()` for naive datetime objects
+relay on proper management of DST (daylight saving time) by `time.localtime()`
+for the timezone of interest. In the Unix port of MicroPython, this is
+accomplished by properly setting the TZ environment variable, e.g.
+`os.putenv("TZ", "Europe/Rome")`.
+
+Because real boards often lack a supportive `time.localtime()`, the source code
+in `datetime.py` has been removed as to save precious resources. If your board
+provide a proper implementation, you can restore the support to naive datetime
+objects by applying this patch, e.g. `patch -p1 < localtz.patch`.
+
+--- a/datetime.py
++++ b/datetime.py
+@@ -635,7 +635,10 @@ class datetime:
+         else:
+             us = 0
+         if tz is None:
+-            raise NotImplementedError
++            dt = cls(*_tmod.localtime(ts)[:6], microsecond=us, tzinfo=tz)
++            s = (dt - datetime(*_tmod.localtime(ts - 86400)[:6]))._us // 1_000_000 - 86400
++            if s < 0 and dt == datetime(*_tmod.localtime(ts + s)[:6]):
++                dt._fd = 1
+         else:
+             dt = cls(*_tmod.gmtime(ts)[:6], microsecond=us, tzinfo=tz)
+             dt = tz.fromutc(dt)
+@@ -812,13 +815,45 @@ class datetime:
+             return self
+         _tz = self._tz
+         if _tz is None:
+-            raise NotImplementedError
++            ts = int(self._mktime())
++            os = datetime(*_tmod.localtime(ts)[:6]) - datetime(*_tmod.gmtime(ts)[:6])
+         else:
+             os = _tz.utcoffset(self)
+         utc = self - os
+         utc = utc.replace(tzinfo=tz)
+         return tz.fromutc(utc)
+ 
++    def _mktime(self):
++        def local(u):
++            return (datetime(*_tmod.localtime(u)[:6]) - epoch)._us // 1_000_000
++
++        epoch = datetime.EPOCH.replace(tzinfo=None)
++        t, us = divmod((self - epoch)._us, 1_000_000)
++        ts = None
++
++        a = local(t) - t
++        u1 = t - a
++        t1 = local(u1)
++        if t1 == t:
++            u2 = u1 + (86400 if self.fold else -86400)
++            b = local(u2) - u2
++            if a == b:
++                ts = u1
++        else:
++            b = t1 - u1
++        if ts is None:
++            u2 = t - b
++            t2 = local(u2)
++            if t2 == t:
++                ts = u2
++            elif t1 == t:
++                ts = u1
++            elif self.fold:
++                ts = min(u1, u2)
++            else:
++                ts = max(u1, u2)
++        return ts + us / 1_000_000
++
+     def utcoffset(self):
+         return None if self._tz is None else self._tz.utcoffset(self)
+ 
+@@ -842,7 +877,7 @@ class datetime:
+ 
+     def timestamp(self):
+         if self._tz is None:
+-            raise NotImplementedError
++            return self._mktime()
+         else:
+             return (self - datetime.EPOCH).total_seconds()
+ 
diff --git a/python-stdlib/datetime/metadata.txt b/python-stdlib/datetime/metadata.txt
new file mode 100644
index 000000000..ee879327b
--- /dev/null
+++ b/python-stdlib/datetime/metadata.txt
@@ -0,0 +1,4 @@
+srctype = micropython-lib
+type = module
+version = 4.0.0
+author = Lorenzo Cappelletti
diff --git a/python-stdlib/datetime/setup.py b/python-stdlib/datetime/setup.py
new file mode 100644
index 000000000..e925aa2f8
--- /dev/null
+++ b/python-stdlib/datetime/setup.py
@@ -0,0 +1,24 @@
+import sys
+
+# Remove current dir from sys.path, otherwise setuptools will peek up our
+# module instead of system's.
+sys.path.pop(0)
+from setuptools import setup
+
+sys.path.append("..")
+import sdist_upip
+
+setup(
+    name="micropython-datetime",
+    version="4.0.0",
+    description="datetime module for MicroPython",
+    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
+    url="https://github.com/micropython/micropython-lib",
+    author="micropython-lib Developers",
+    author_email="micro-python@googlegroups.com",
+    maintainer="micropython-lib Developers",
+    maintainer_email="micro-python@googlegroups.com",
+    license="MIT",
+    cmdclass={"sdist": sdist_upip.sdist},
+    py_modules=["datetime"],
+)
diff --git a/python-stdlib/datetime/test_datetime.py b/python-stdlib/datetime/test_datetime.py
new file mode 100644
index 000000000..372bdf3de
--- /dev/null
+++ b/python-stdlib/datetime/test_datetime.py
@@ -0,0 +1,2269 @@
+# See https://github.com/python/cpython/blob/3.9/Lib/test/datetimetester.py
+#
+# This script can be run in 3 different modes:
+# 1. `python3 test_datetime.py --stdlib`: checks that the tests comply to
+#    CPython's standard datetime library.
+# 2. `python3 test_datetime.py`: runs the tests against datetime.py, using
+#    CPython's standard unittest (which accepts filter options, such as
+#    `-v TestTimeDelta -k tuple`, and provides more verbose output in case
+#    of failure).
+# 3. `micropython test_datetime.py`: runs the tests against datetime.py
+#    using MicroPython's unittest library (which must be available).
+#
+# This script also accepts option `--reorder` which rewrites this file
+# in-place by numbering tests in sequence.
+
+import sys
+
+STDLIB = False
+
+if __name__ == "__main__":
+    while len(sys.argv) > 1:
+        if sys.argv[1] == "--reorder":
+            import fileinput, re
+
+            with fileinput.input(files=sys.argv[0], inplace=True) as f:
+                cases = {}
+                n = 0
+                for line in f:
+                    match = re.match("(\s+def\s+test_)(\w+?)(?:\d+)(\(.+\):)", line)
+                    if match:
+                        prefix, name, suffix = match.groups()
+                        if name != last_name:
+                            if name in cases[case]:
+                                sys.exit(
+                                    f"duplicated test in {case} at line {fileinput.filelineno()}: {name}"
+                                )
+                            cases[case].append(name)
+                            last_name = name
+                            i = 0
+                        print(f"{prefix}{name}{i:02d}{suffix}")
+                        i += 1
+                        n += 1
+                        continue
+
+                    match = re.match("class\s+(Test[\w\d]+)\(", line)
+                    if match:
+                        case = match[1]
+                        if case in cases:
+                            sys.exit(
+                                f"duplicated test case at line {fileinput.filelineno()}: {case}"
+                            )
+                        cases[case] = []
+                        last_name = ""
+
+                    print(line, end="")
+            print(f"Reordered {n} tests in {len(cases)} cases")
+        elif sys.argv[1] == "--stdlib":
+            sys.path.pop(0)
+            STDLIB = True
+        else:
+            break
+        sys.argv.pop(1)
+
+import os
+import time as mod_time
+import datetime as mod_datetime
+from datetime import MAXYEAR, MINYEAR, datetime, date, time, timedelta, timezone, tzinfo
+import unittest
+
+
+# See localtz.patch
+try:
+    datetime.fromtimestamp(0)
+    LOCALTZ = True
+except NotImplementedError:
+    LOCALTZ = False
+
+
+if hasattr(datetime, "EPOCH"):
+    EPOCH = datetime.EPOCH
+else:
+    EPOCH = datetime(*mod_time.gmtime(0)[:6], tzinfo=timezone.utc)
+
+
+def eval_mod(s):
+    return eval(s.replace("datetime.", "mod_datetime."))
+
+
+### timedelta ################################################################
+
+a = timedelta(hours=7)
+b = timedelta(minutes=6)
+c = timedelta(seconds=10)
+us = timedelta(microseconds=1)
+td0 = timedelta(0)
+td1 = timedelta(2, 3, 4)
+td2 = timedelta(2, 3, 4)
+td3 = timedelta(2, 3, 5)
+td4 = timedelta(
+    days=100,
+    weeks=-7,
+    hours=-24 * (100 - 49),
+    minutes=-3,
+    seconds=12,
+    microseconds=(3 * 60 - 12) * 1000000,
+)  # == timedelta(0)
+
+td1h = timedelta(hours=1)
+td1hr = "datetime.timedelta(microseconds={})".format(1 * 3600 * 10**6)
+td10h2m = timedelta(hours=10, minutes=2)
+td10h2mr = "datetime.timedelta(microseconds={})".format((10 * 3600 + 2 * 60) * 10**6)
+tdn10h2m40s = timedelta(hours=-10, minutes=2, seconds=40)
+tdn10h2m40sr = "datetime.timedelta(microseconds={})".format((-10 * 3600 + 2 * 60 + 40) * 10**6)
+td1h2m40s100us = timedelta(hours=1, minutes=2, seconds=40, microseconds=100)
+td1h2m40s100usr = "datetime.timedelta(microseconds={})".format(
+    (1 * 3600 + 2 * 60 + 40) * 10**6 + 100
+)
+
+
+class Test0TimeDelta(unittest.TestCase):
+    def test___init__00(self):
+        self.assertEqual(timedelta(), timedelta(weeks=0, days=0, hours=0, minutes=0, seconds=0))
+
+    def test___init__01(self):
+        self.assertEqual(timedelta(weeks=1), timedelta(days=7))
+
+    def test___init__02(self):
+        self.assertEqual(timedelta(days=1), timedelta(hours=24))
+
+    def test___init__03(self):
+        self.assertEqual(timedelta(hours=1), timedelta(minutes=60))
+
+    def test___init__04(self):
+        self.assertEqual(timedelta(minutes=1), timedelta(seconds=60))
+
+    def test___init__05(self):
+        self.assertEqual(timedelta(seconds=1), timedelta(milliseconds=1000))
+
+    def test___init__06(self):
+        self.assertEqual(timedelta(milliseconds=1), timedelta(microseconds=1000))
+
+    def test___init__07(self):
+        self.assertEqual(timedelta(weeks=1.0 / 7), timedelta(days=1))
+
+    def test___init__08(self):
+        self.assertEqual(timedelta(days=1.0 / 24), timedelta(hours=1))
+
+    def test___init__09(self):
+        self.assertEqual(timedelta(hours=1.0 / 60), timedelta(minutes=1))
+
+    def test___init__10(self):
+        self.assertEqual(timedelta(minutes=1.0 / 60), timedelta(seconds=1))
+
+    def test___init__11(self):
+        self.assertEqual(timedelta(seconds=0.001), timedelta(milliseconds=1))
+
+    def test___init__12(self):
+        self.assertEqual(timedelta(milliseconds=0.001), timedelta(microseconds=1))
+
+    def test___init__13(self):
+        self.assertEqual(td1h, eval_mod(td1hr))
+
+    def test___init__14(self):
+        self.assertEqual(td10h2m, eval_mod(td10h2mr))
+
+    def test___init__15(self):
+        self.assertEqual(tdn10h2m40s, eval_mod(tdn10h2m40sr))
+
+    def test___init__16(self):
+        self.assertEqual(td1h2m40s100us, eval_mod(td1h2m40s100usr))
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__00(self):
+        self.assertEqual(repr(td1h), td1hr)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__01(self):
+        self.assertEqual(repr(td10h2m), td10h2mr)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__02(self):
+        self.assertEqual(repr(tdn10h2m40s), tdn10h2m40sr)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__03(self):
+        self.assertEqual(repr(td1h2m40s100us), td1h2m40s100usr)
+
+    def test___repr__04(self):
+        self.assertEqual(td1, eval_mod(repr(td1)))
+
+    def test_total_seconds00(self):
+        d = timedelta(days=365)
+        self.assertEqual(d.total_seconds(), 31536000.0)
+
+    def test_days00(self):
+        self.assertEqual(td1.days, 2)
+
+    def test_seconds00(self):
+        self.assertEqual(td1.seconds, 3)
+
+    def test_microseconds00(self):
+        self.assertEqual(td1.microseconds, 4)
+
+    def test___add__00(self):
+        self.assertEqual(a + b + c, timedelta(hours=7, minutes=6, seconds=10))
+
+    def test___add__01(self):
+        dt = a + datetime(2010, 1, 1, 12, 30)
+        self.assertEqual(dt, datetime(2010, 1, 1, 12 + 7, 30))
+
+    def test___sub__00(self):
+        self.assertEqual(a - b, timedelta(hours=6, minutes=60 - 6))
+
+    def test___neg__00(self):
+        self.assertEqual(-a, timedelta(hours=-7))
+
+    def test___neg__01(self):
+        self.assertEqual(-b, timedelta(hours=-1, minutes=54))
+
+    def test___neg__02(self):
+        self.assertEqual(-c, timedelta(hours=-1, minutes=59, seconds=50))
+
+    def test___pos__00(self):
+        self.assertEqual(+a, timedelta(hours=7))
+
+    def test___abs__00(self):
+        self.assertEqual(abs(a), a)
+
+    def test___abs__01(self):
+        self.assertEqual(abs(-a), a)
+
+    def test___mul__00(self):
+        self.assertEqual(a * 10, timedelta(hours=70))
+
+    def test___mul__01(self):
+        self.assertEqual(a * 10, 10 * a)
+
+    def test___mul__02(self):
+        self.assertEqual(b * 10, timedelta(minutes=60))
+
+    def test___mul__03(self):
+        self.assertEqual(10 * b, timedelta(minutes=60))
+
+    def test___mul__04(self):
+        self.assertEqual(c * 10, timedelta(seconds=100))
+
+    def test___mul__05(self):
+        self.assertEqual(10 * c, timedelta(seconds=100))
+
+    def test___mul__06(self):
+        self.assertEqual(a * -1, -a)
+
+    def test___mul__07(self):
+        self.assertEqual(b * -2, -b - b)
+
+    def test___mul__08(self):
+        self.assertEqual(c * -2, -c + -c)
+
+    def test___mul__09(self):
+        self.assertEqual(b * (60 * 24), (b * 60) * 24)
+
+    def test___mul__10(self):
+        self.assertEqual(b * (60 * 24), (60 * b) * 24)
+
+    def test___mul__11(self):
+        self.assertEqual(c * 6, timedelta(minutes=1))
+
+    def test___mul__12(self):
+        self.assertEqual(6 * c, timedelta(minutes=1))
+
+    def test___truediv__00(self):
+        self.assertEqual(a / 0.5, timedelta(hours=14))
+
+    def test___truediv__01(self):
+        self.assertEqual(b / 0.5, timedelta(minutes=12))
+
+    def test___truediv__02(self):
+        self.assertEqual(a / 7, timedelta(hours=1))
+
+    def test___truediv__03(self):
+        self.assertEqual(b / 6, timedelta(minutes=1))
+
+    def test___truediv__04(self):
+        self.assertEqual(c / 10, timedelta(seconds=1))
+
+    def test___truediv__05(self):
+        self.assertEqual(a / 10, timedelta(minutes=7 * 6))
+
+    def test___truediv__06(self):
+        self.assertEqual(a / 3600, timedelta(seconds=7))
+
+    def test___truediv__07(self):
+        self.assertEqual(a / a, 1.0)
+
+    def test___truediv__08(self):
+        t = timedelta(hours=1, minutes=24, seconds=19)
+        second = timedelta(seconds=1)
+        self.assertEqual(t / second, 5059.0)
+
+    def test___truediv__09(self):
+        t = timedelta(minutes=2, seconds=30)
+        minute = timedelta(minutes=1)
+        self.assertEqual(t / minute, 2.5)
+
+    def test___floordiv__00(self):
+        self.assertEqual(a // 7, timedelta(hours=1))
+
+    def test___floordiv__01(self):
+        self.assertEqual(b // 6, timedelta(minutes=1))
+
+    def test___floordiv__02(self):
+        self.assertEqual(c // 10, timedelta(seconds=1))
+
+    def test___floordiv__03(self):
+        self.assertEqual(a // 10, timedelta(minutes=7 * 6))
+
+    def test___floordiv__04(self):
+        self.assertEqual(a // 3600, timedelta(seconds=7))
+
+    def test___floordiv__05(self):
+        t = timedelta(hours=1, minutes=24, seconds=19)
+        second = timedelta(seconds=1)
+        self.assertEqual(t // second, 5059)
+
+    def test___floordiv__06(self):
+        t = timedelta(minutes=2, seconds=30)
+        minute = timedelta(minutes=1)
+        self.assertEqual(t // minute, 2)
+
+    def test___mod__00(self):
+        t = timedelta(minutes=2, seconds=30)
+        r = t % timedelta(minutes=1)
+        self.assertEqual(r, timedelta(seconds=30))
+
+    def test___mod__01(self):
+        t = timedelta(minutes=-2, seconds=30)
+        r = t % timedelta(minutes=1)
+        self.assertEqual(r, timedelta(seconds=30))
+
+    def test___divmod__00(self):
+        t = timedelta(minutes=2, seconds=30)
+        q, r = divmod(t, timedelta(minutes=1))
+        self.assertEqual(q, 2)
+        self.assertEqual(r, timedelta(seconds=30))
+
+    def test___divmod__01(self):
+        t = timedelta(minutes=-2, seconds=30)
+        q, r = divmod(t, timedelta(minutes=1))
+        self.assertEqual(q, -2)
+        self.assertEqual(r, timedelta(seconds=30))
+
+    def test___eq__00(self):
+        self.assertEqual(td1, td2)
+
+    def test___eq__01(self):
+        self.assertTrue(not td1 != td2)
+
+    def test___eq__02(self):
+        self.assertEqual(timedelta(hours=6, minutes=60), a)
+
+    def test___eq__03(self):
+        self.assertEqual(timedelta(seconds=60 * 6), b)
+
+    def test___eq__04(self):
+        self.assertTrue(not td1 == td3)
+
+    def test___eq__05(self):
+        self.assertTrue(td1 != td3)
+
+    def test___eq__06(self):
+        self.assertTrue(td3 != td1)
+
+    def test___eq__07(self):
+        self.assertTrue(not td3 == td1)
+
+    def test___le__00(self):
+        self.assertTrue(td1 <= td2)
+
+    def test___le__01(self):
+        self.assertTrue(td1 <= td3)
+
+    def test___le__02(self):
+        self.assertTrue(not td3 <= td1)
+
+    def test___lt__00(self):
+        self.assertTrue(not td1 < td2)
+
+    def test___lt__01(self):
+        self.assertTrue(td1 < td3)
+
+    def test___lt__02(self):
+        self.assertTrue(not td3 < td1)
+
+    def test___ge__00(self):
+        self.assertTrue(td1 >= td2)
+
+    def test___ge__01(self):
+        self.assertTrue(td3 >= td1)
+
+    def test___ge__02(self):
+        self.assertTrue(not td1 >= td3)
+
+    def test___gt__00(self):
+        self.assertTrue(not td1 > td2)
+
+    def test___gt__01(self):
+        self.assertTrue(td3 > td1)
+
+    def test___gt__02(self):
+        self.assertTrue(not td1 > td3)
+
+    def test___bool__00(self):
+        self.assertTrue(timedelta(hours=1))
+
+    def test___bool__01(self):
+        self.assertTrue(timedelta(minutes=1))
+
+    def test___bool__02(self):
+        self.assertTrue(timedelta(seconds=1))
+
+    def test___bool__03(self):
+        self.assertTrue(not td0)
+
+    def test___str__00(self):
+        self.assertEqual(str(timedelta(days=1)), "1 day, 0:00:00")
+
+    def test___str__01(self):
+        self.assertEqual(str(timedelta(days=-1)), "-1 day, 0:00:00")
+
+    def test___str__02(self):
+        self.assertEqual(str(timedelta(days=2)), "2 days, 0:00:00")
+
+    def test___str__03(self):
+        self.assertEqual(str(timedelta(days=-2)), "-2 days, 0:00:00")
+
+    def test___str__04(self):
+        self.assertEqual(str(timedelta(hours=12, minutes=58, seconds=59)), "12:58:59")
+
+    def test___str__05(self):
+        self.assertEqual(str(timedelta(hours=2, minutes=3, seconds=4)), "2:03:04")
+
+    def test___hash__00(self):
+        self.assertEqual(td0, td4)
+        self.assertEqual(hash(td0), hash(td4))
+
+    def test___hash__01(self):
+        tt0 = td0 + timedelta(weeks=7)
+        tt4 = td4 + timedelta(days=7 * 7)
+        self.assertEqual(hash(tt0), hash(tt4))
+
+    def test___hash__02(self):
+        d = {td0: 1}
+        d[td4] = 2
+        self.assertEqual(len(d), 1)
+        self.assertEqual(d[td0], 2)
+
+    def test_constant00(self):
+        self.assertIsInstance(timedelta.min, timedelta)
+        self.assertIsInstance(timedelta.max, timedelta)
+        self.assertIsInstance(timedelta.resolution, timedelta)
+        self.assertTrue(timedelta.max > timedelta.min)
+
+    def test_constant01(self):
+        self.assertEqual(timedelta.min, timedelta(days=-999_999_999))
+
+    def test_constant02(self):
+        self.assertEqual(
+            timedelta.max,
+            timedelta(days=999_999_999, seconds=24 * 3600 - 1, microseconds=10**6 - 1),
+        )
+
+    def test_constant03(self):
+        self.assertEqual(timedelta.resolution, timedelta(microseconds=1))
+
+    def test_computation00(self):
+        self.assertEqual((3 * us) * 0.5, 2 * us)
+
+    def test_computation01(self):
+        self.assertEqual((5 * us) * 0.5, 2 * us)
+
+    def test_computation02(self):
+        self.assertEqual(0.5 * (3 * us), 2 * us)
+
+    def test_computation03(self):
+        self.assertEqual(0.5 * (5 * us), 2 * us)
+
+    def test_computation04(self):
+        self.assertEqual((-3 * us) * 0.5, -2 * us)
+
+    def test_computation05(self):
+        self.assertEqual((-5 * us) * 0.5, -2 * us)
+
+    def test_computation06(self):
+        self.assertEqual((3 * us) / 2, 2 * us)
+
+    def test_computation07(self):
+        self.assertEqual((5 * us) / 2, 2 * us)
+
+    def test_computation08(self):
+        self.assertEqual((-3 * us) / 2.0, -2 * us)
+
+    def test_computation09(self):
+        self.assertEqual((-5 * us) / 2.0, -2 * us)
+
+    def test_computation10(self):
+        self.assertEqual((3 * us) / -2, -2 * us)
+
+    def test_computation11(self):
+        self.assertEqual((5 * us) / -2, -2 * us)
+
+    def test_computation12(self):
+        self.assertEqual((3 * us) / -2.0, -2 * us)
+
+    def test_computation13(self):
+        self.assertEqual((5 * us) / -2.0, -2 * us)
+
+    def test_computation14(self):
+        for i in range(-10, 10):
+            # with self.subTest(i=i): not supported by Micropython
+            self.assertEqual((i * us / 3) // us, round(i / 3))
+
+    def test_computation15(self):
+        for i in range(-10, 10):
+            # with self.subTest(i=i): not supported by Micropython
+            self.assertEqual((i * us / -3) // us, round(i / -3))
+
+    def test_carries00(self):
+        td1 = timedelta(
+            days=100,
+            weeks=-7,
+            hours=-24 * (100 - 49),
+            minutes=-3,
+            seconds=3 * 60 + 1,
+        )
+        td2 = timedelta(seconds=1)
+        self.assertEqual(td1, td2)
+
+    def test_resolution00(self):
+        self.assertIsInstance(timedelta.min, timedelta)
+
+    def test_resolution01(self):
+        self.assertIsInstance(timedelta.max, timedelta)
+
+    def test_resolution02(self):
+        self.assertIsInstance(timedelta.resolution, timedelta)
+
+    def test_resolution03(self):
+        self.assertTrue(timedelta.max > timedelta.min)
+
+    def test_resolution04(self):
+        self.assertEqual(timedelta.resolution, timedelta(microseconds=1))
+
+    @unittest.skipIf(STDLIB, "standard timedelta has no tuple()")
+    def test_tuple00(self):
+        self.assertEqual(td1.tuple(), (2, 0, 0, 3, 4))
+
+    @unittest.skipIf(STDLIB, "standard timedelta has no tuple()")
+    def test_tuple01(self):
+        self.assertEqual(td1h2m40s100us.tuple(), (0, 1, 2, 40, 100))
+
+
+### timezone #################################################################
+
+
+class Cet(tzinfo):
+    # Central European Time (see https://en.wikipedia.org/wiki/Summer_time_in_Europe)
+
+    def utcoffset(self, dt):
+        h = 2 if self.isdst(dt)[0] else 1
+        return timedelta(hours=h)
+
+    def dst(self, dt):
+        h = 1 if self.isdst(dt)[0] else 0
+        return timedelta(hours=h)
+
+    def tzname(self, dt):
+        return "CEST" if self.isdst(dt)[0] else "CET"
+
+    def fromutc(self, dt):
+        assert dt.tzinfo is self
+        isdst, fold = self.isdst(dt, utc=True)
+        h = 2 if isdst else 1
+        dt += timedelta(hours=h)
+        dt = dt.replace(fold=fold)
+        return dt
+
+    def isdst(self, dt, utc=False):
+        if dt is None:
+            return False, None
+
+        year = dt.year
+        if not 2000 <= year < 2100:
+            # Formulas below are valid in the range [2000; 2100)
+            raise ValueError
+
+        hour = 1 if utc else 3
+        day = 31 - (5 * year // 4 + 4) % 7  # last Sunday of March
+        beg = datetime(year, 3, day, hour)
+        day = 31 - (5 * year // 4 + 1) % 7  # last Sunday of October
+        end = datetime(year, 10, day, hour)
+
+        dt = dt.replace(tzinfo=None)
+        if utc:
+            fold = 1 if end <= dt < end + timedelta(hours=1) else 0
+        else:
+            fold = dt.fold
+        isdst = beg <= dt < end
+        return isdst, fold
+
+    def __repr__(self):
+        return "Cet()"
+
+    def __str__(self):
+        return self.tzname(None)
+
+    def __eq__(self, other):
+        return repr(self) == repr(other)
+
+    def __hash__(self):
+        return hash(repr(self))
+
+
+class USTimeZone(tzinfo):
+    DSTSTART = datetime(1, 3, 8, 2)
+    DSTEND = datetime(1, 11, 1, 2)
+    ZERO = timedelta(0)
+    HOUR = timedelta(hours=1)
+
+    def __init__(self, hours, reprname, stdname, dstname):
+        self.stdoffset = timedelta(hours=hours)
+        self.reprname = reprname
+        self.stdname = stdname
+        self.dstname = dstname
+
+    def __repr__(self):
+        return self.reprname
+
+    def tzname(self, dt):
+        if self.dst(dt):
+            return self.dstname
+        else:
+            return self.stdname
+
+    def utcoffset(self, dt):
+        return self.stdoffset + self.dst(dt)
+
+    def dst(self, dt):
+        if dt is None or dt.tzinfo is None:
+            return self.ZERO
+        assert dt.tzinfo is self
+        start, end = USTimeZone.us_dst_range(dt.year)
+        dt = dt.replace(tzinfo=None)
+        if start + self.HOUR <= dt < end - self.HOUR:
+            return self.HOUR
+        if end - self.HOUR <= dt < end:
+            return self.ZERO if dt.fold else self.HOUR
+        if start <= dt < start + self.HOUR:
+            return self.HOUR if dt.fold else self.ZERO
+        return self.ZERO
+
+    def fromutc(self, dt):
+        assert dt.tzinfo is self
+        start, end = USTimeZone.us_dst_range(dt.year)
+        start = start.replace(tzinfo=self)
+        end = end.replace(tzinfo=self)
+        std_time = dt + self.stdoffset
+        dst_time = std_time + self.HOUR
+        if end <= dst_time < end + self.HOUR:
+            return std_time.replace(fold=1)
+        if std_time < start or dst_time >= end:
+            return std_time
+        if start <= std_time < end - self.HOUR:
+            return dst_time
+
+    @staticmethod
+    def us_dst_range(year):
+        start = first_sunday_on_or_after(USTimeZone.DSTSTART.replace(year=year))
+        end = first_sunday_on_or_after(USTimeZone.DSTEND.replace(year=year))
+        return start, end
+
+    @staticmethod
+    def first_sunday_on_or_after(dt):
+        days_to_go = 6 - dt.weekday()
+        if days_to_go:
+            dt += timedelta(days_to_go)
+        return dt
+
+
+class LocalTz:
+    def __init__(self, tz):
+        self.tz = tz
+        self._old = None
+
+    @staticmethod
+    def _set(tz):
+        if hasattr(mod_time, "tzset"):  # Python
+            if tz:
+                os.environ["TZ"] = tz
+            else:
+                del os.environ["TZ"]
+            mod_time.tzset()
+        else:
+            if tz:
+                os.putenv("TZ", tz)
+            else:
+                os.unsetenv("TZ")
+
+    def set(self):
+        self._old = os.getenv("TZ")
+        LocalTz._set(self.tz)
+
+    def unset(self):
+        LocalTz._set(self._old)
+        self._old = None
+
+    def __enter__(self):
+        self.set()
+
+    def __exit__(self, typ, value, trace):
+        self.unset()
+
+
+tz_acdt = timezone(timedelta(hours=9.5), "ACDT")
+tz_est = timezone(-timedelta(hours=5), "EST")
+tz1 = timezone(timedelta(hours=-1))
+tz2 = Cet()
+tz3 = USTimeZone(-5, "Eastern", "EST", "EDT")
+
+
+class Test1TimeZone(unittest.TestCase):
+    def test___init__00(self):
+        self.assertEqual(str(tz_acdt), "ACDT")
+        self.assertEqual(str(tz_acdt), tz_acdt.tzname(None))
+
+    def test___init__01(self):
+        self.assertEqual(str(tz_est), "EST")
+        self.assertEqual(str(tz_est), tz_est.tzname(None))
+
+    def test___init__02(self):
+        self.assertEqual(str(tz1), "UTC-01:00")
+        self.assertEqual(str(tz1), tz1.tzname(None))
+
+    def test___init__03(self):
+        self.assertEqual(str(tz2), "CET")
+        self.assertEqual(str(tz2), tz2.tzname(None))
+
+    def test___init__04(self):
+        offset = timedelta(hours=-24, microseconds=1)
+        tz = timezone(offset)
+        self.assertIsInstance(tz, timezone)
+
+    def test___init__05(self):
+        offset = timedelta(hours=24, microseconds=-1)
+        tz = timezone(offset)
+        self.assertIsInstance(tz, timezone)
+
+    def test___init__06(self):
+        offset = timedelta(hours=-24)
+        self.assertRaises(ValueError, timezone, offset)
+
+    def test___init__07(self):
+        offset = timedelta(hours=24)
+        self.assertRaises(ValueError, timezone, offset)
+
+    def test___repr__00(self):
+        self.assertEqual(tz1, eval_mod(repr(tz1)))
+
+    def test___eq__00(self):
+        self.assertEqual(timezone(timedelta(hours=1)), timezone(timedelta(hours=1)))
+
+    def test___eq__01(self):
+        self.assertNotEqual(timezone(timedelta(hours=1)), timezone(timedelta(hours=2)))
+
+    def test___eq__02(self):
+        self.assertEqual(timezone(timedelta(hours=-5)), timezone(timedelta(hours=-5), "EST"))
+
+    def test_utcoffset00(self):
+        self.assertEqual(str(tz2.utcoffset(None)), "1:00:00")
+
+    def test_utcoffset01(self):
+        self.assertEqual(str(tz2.utcoffset(datetime(2010, 3, 27, 12))), "1:00:00")
+
+    def test_utcoffset02(self):
+        self.assertEqual(str(tz2.utcoffset(datetime(2010, 3, 28, 12))), "2:00:00")
+
+    def test_utcoffset03(self):
+        self.assertEqual(str(tz2.utcoffset(datetime(2010, 10, 30, 12))), "2:00:00")
+
+    def test_utcoffset04(self):
+        self.assertEqual(str(tz2.utcoffset(datetime(2010, 10, 31, 12))), "1:00:00")
+
+    def test_tzname00(self):
+        self.assertEqual(tz2.tzname(datetime(2011, 1, 1)), "CET")
+
+    def test_tzname01(self):
+        self.assertEqual(tz2.tzname(datetime(2011, 8, 1)), "CEST")
+
+    def test_utc00(self):
+        self.assertEqual(timezone.utc.utcoffset(None), td0)
+
+    def test_fromutc00(self):
+        utc = EPOCH.replace(tzinfo=tz_acdt)
+        self.assertEqual(tz_acdt.fromutc(utc), utc + 9.5 * td1h)
+
+    def test_fromutc01(self):
+        utc = EPOCH.replace(tzinfo=tz_est)
+        self.assertEqual(tz_est.fromutc(utc), utc + 5 * -td1h)
+
+    def test_fromutc02(self):
+        utc = datetime(2010, 3, 28, 0, 59, 59, 999_999, tz2)
+        dt = tz2.fromutc(utc)
+        self.assertEqual(dt, utc + td1h)
+        self.assertFalse(dt.fold)
+
+    def test_fromutc03(self):
+        utc = datetime(2010, 3, 28, 1, 0, 0, 0, tz2)
+        dt = tz2.fromutc(utc)
+        self.assertEqual(dt, utc + 2 * td1h)
+        self.assertFalse(dt.fold)
+
+    def test_fromutc04(self):
+        utc = datetime(2010, 10, 31, 0, 59, 59, 999_999, tz2)
+        dt = tz2.fromutc(utc)
+        self.assertEqual(dt, utc + 2 * td1h)
+        self.assertFalse(dt.fold)
+
+    def test_fromutc05(self):
+        utc = datetime(2010, 10, 31, 1, 0, 0, 0, tz2)
+        dt = tz2.fromutc(utc)
+        self.assertEqual(dt, utc + td1h)
+        self.assertTrue(dt.fold)
+
+    def test_fromutc06(self):
+        dt1 = tz2.fromutc(datetime(2010, 10, 31, 0, 0, 0, 0, tz2))
+        dt2 = tz2.fromutc(datetime(2010, 10, 31, 1, 0, 0, 0, tz2))
+        self.assertEqual(dt1, dt2)
+        self.assertNotEqual(dt1.fold, dt2.fold)
+
+    def test_aware_datetime00(self):
+        t = datetime(1, 1, 1)
+        self.assertEqual(tz1.tzname(t), t.replace(tzinfo=tz1).tzname())
+
+    def test_aware_datetime01(self):
+        t = datetime(1, 1, 1)
+        self.assertEqual(tz1.utcoffset(t), t.replace(tzinfo=tz1).utcoffset())
+
+    def test_aware_datetime02(self):
+        t = datetime(1, 1, 1)
+        self.assertEqual(tz1.dst(t), t.replace(tzinfo=tz1).dst())
+
+    def test_offset_boundaries00(self):
+        td = timedelta(hours=23, minutes=59, seconds=59, microseconds=999999)
+        for i in (1, -1):
+            self.assertIsInstance(timezone(i * td), timezone)
+
+    def test_offset_boundaries01(self):
+        td = timedelta(hours=24)
+        for i in (1, -1):
+            with self.assertRaises(ValueError):
+                timezone(i * td)
+
+
+### date #####################################################################
+
+d1 = date(2002, 1, 31)
+d1r = "datetime.date(0, 0, 730881)"
+d2 = date(1956, 1, 31)
+d2d1s = (46 * 365 + len(range(1956, 2002, 4))) * 24 * 60 * 60
+d3 = date(2002, 3, 1)
+d4 = date(2002, 3, 2)
+d5 = date(2002, 1, 31)
+
+hour = timedelta(hours=1)
+day = timedelta(days=1)
+week = timedelta(weeks=1)
+max_days = MAXYEAR * 365 + MAXYEAR // 4 - MAXYEAR // 100 + MAXYEAR // 400
+
+
+class Test2Date(unittest.TestCase):
+    def test___init__00(self):
+        self.assertEqual(d1.year, 2002)
+        self.assertEqual(d1.month, 1)
+        self.assertEqual(d1.day, 31)
+
+    @unittest.skipIf(STDLIB, "not supported by standard datetime")
+    def test___init__01(self):
+        date(0, 0, 1)
+
+    @unittest.skipIf(STDLIB, "not supported by standard datetime")
+    def test___init__02(self):
+        date(0, 0, max_days)
+
+    def test___init__03(self):
+        datetime(2000, 2, 29)
+
+    def test___init__04(self):
+        datetime(2004, 2, 29)
+
+    def test___init__05(self):
+        datetime(2400, 2, 29)
+
+    def test___init__06(self):
+        self.assertRaises(ValueError, datetime, 2000, 2, 30)
+
+    def test___init__07(self):
+        self.assertRaises(ValueError, datetime, 2001, 2, 29)
+
+    def test___init__08(self):
+        self.assertRaises(ValueError, datetime, 2100, 2, 29)
+
+    def test___init__09(self):
+        self.assertRaises(ValueError, datetime, 1900, 2, 29)
+
+    def test___init__10(self):
+        self.assertRaises(ValueError, date, MINYEAR - 1, 1, 1)
+        self.assertRaises(ValueError, date, MINYEAR, 0, 1)
+        self.assertRaises(ValueError, date, MINYEAR, 1, 0)
+
+    def test___init__11(self):
+        self.assertRaises(ValueError, date, MAXYEAR + 1, 12, 31)
+        self.assertRaises(ValueError, date, MAXYEAR, 13, 31)
+        self.assertRaises(ValueError, date, MAXYEAR, 12, 32)
+
+    def test___init__12(self):
+        self.assertRaises(ValueError, date, 1, 2, 29)
+        self.assertRaises(ValueError, date, 1, 4, 31)
+        self.assertRaises(ValueError, date, 1, 6, 31)
+        self.assertRaises(ValueError, date, 1, 9, 31)
+        self.assertRaises(ValueError, date, 1, 11, 31)
+
+    def test_fromtimestamp00(self):
+        with LocalTz("UTC"):
+            d = date.fromtimestamp(1012435200)
+            self.assertEqual(d, d1)
+
+    def test_fromtimestamp01(self):
+        with LocalTz("UTC"):
+            d = date.fromtimestamp(1012435200 + 1)
+            self.assertEqual(d, d1)
+
+    def test_fromtimestamp02(self):
+        with LocalTz("UTC"):
+            d = date.fromtimestamp(1012435200 - 1)
+            self.assertEqual(d, d1 - timedelta(days=1))
+
+    def test_fromtimestamp03(self):
+        with LocalTz("Europe/Rome"):
+            d = date.fromtimestamp(1012435200 - 3601)
+            self.assertEqual(d, d1 - timedelta(days=1))
+
+    def test_today00(self):
+        tm = mod_time.localtime()[:3]
+        dt = date.today()
+        dd = (dt.year, dt.month, dt.day)
+        self.assertEqual(tm, dd)
+
+    def test_fromordinal00(self):
+        self.assertEqual(date.fromordinal(1), date(1, 1, 1))
+
+    def test_fromordinal01(self):
+        self.assertEqual(date.fromordinal(max_days), date(MAXYEAR, 12, 31))
+
+    def test_fromisoformat00(self):
+        self.assertEqual(datetime.fromisoformat("1975-08-10"), datetime(1975, 8, 10))
+
+    def test_year00(self):
+        self.assertEqual(d1.year, 2002)
+
+    def test_year01(self):
+        self.assertEqual(d2.year, 1956)
+
+    def test_month00(self):
+        self.assertEqual(d1.month, 1)
+
+    def test_month01(self):
+        self.assertEqual(d4.month, 3)
+
+    def test_day00(self):
+        self.assertEqual(d1.day, 31)
+
+    def test_day01(self):
+        self.assertEqual(d4.day, 2)
+
+    def test_toordinal00(self):
+        self.assertEqual(date(1, 1, 1).toordinal(), 1)
+
+    def test_toordinal01(self):
+        self.assertEqual(date(MAXYEAR, 12, 31).toordinal(), max_days)
+
+    def test_timetuple00(self):
+        self.assertEqual(d1.timetuple()[:8], (2002, 1, 31, 0, 0, 0, 3, 31))
+
+    def test_timetuple01(self):
+        self.assertEqual(d3.timetuple()[:8], (2002, 3, 1, 0, 0, 0, 4, 60))
+
+    def test_replace00(self):
+        self.assertEqual(d1.replace(), d1)
+
+    def test_replace01(self):
+        self.assertEqual(d1.replace(year=2001), date(2001, 1, 31))
+
+    def test_replace02(self):
+        self.assertEqual(d1.replace(month=5), date(2002, 5, 31))
+
+    def test_replace03(self):
+        self.assertEqual(d1.replace(day=16), date(2002, 1, 16))
+
+    def test___add__00(self):
+        self.assertEqual(d4 + hour, d4)
+
+    def test___add__01(self):
+        self.assertEqual(d4 + day, date(2002, 3, 3))
+
+    def test___add__02(self):
+        self.assertEqual(d4 + week, date(2002, 3, 9))
+
+    def test___add__03(self):
+        self.assertEqual(d4 + 52 * week, date(2003, 3, 1))
+
+    def test___add__04(self):
+        self.assertEqual(d4 + -hour, date(2002, 3, 1))
+
+    def test___add__05(self):
+        self.assertEqual(d5 + -day, date(2002, 1, 30))
+
+    def test___add__06(self):
+        self.assertEqual(d4 + -week, date(2002, 2, 23))
+
+    def test___sub__00(self):
+        d = d1 - d2
+        self.assertEqual(d.total_seconds(), d2d1s)
+
+    def test___sub__01(self):
+        self.assertEqual(d4 - hour, d4)
+
+    def test___sub__02(self):
+        self.assertEqual(d4 - day, date(2002, 3, 1))
+
+    def test___sub__03(self):
+        self.assertEqual(d4 - week, date(2002, 2, 23))
+
+    def test___sub__04(self):
+        self.assertEqual(d4 - 52 * week, date(2001, 3, 3))
+
+    def test___sub__05(self):
+        self.assertEqual(d4 - -hour, date(2002, 3, 3))
+
+    def test___sub__06(self):
+        self.assertEqual(d4 - -day, date(2002, 3, 3))
+
+    def test___sub__07(self):
+        self.assertEqual(d4 - -week, date(2002, 3, 9))
+
+    def test___eq__00(self):
+        self.assertEqual(d1, d5)
+
+    def test___eq__01(self):
+        self.assertFalse(d1 != d5)
+
+    def test___eq__02(self):
+        self.assertTrue(d2 != d5)
+
+    def test___eq__03(self):
+        self.assertTrue(d5 != d2)
+
+    def test___eq__04(self):
+        self.assertFalse(d2 == d5)
+
+    def test___eq__05(self):
+        self.assertFalse(d5 == d2)
+
+    def test___eq__06(self):
+        self.assertFalse(d1 == None)
+
+    def test___eq__07(self):
+        self.assertTrue(d1 != None)
+
+    def test___le__00(self):
+        self.assertTrue(d1 <= d5)
+
+    def test___le__01(self):
+        self.assertTrue(d2 <= d5)
+
+    def test___le__02(self):
+        self.assertFalse(d5 <= d2)
+
+    def test___ge__00(self):
+        self.assertTrue(d1 >= d5)
+
+    def test___ge__01(self):
+        self.assertTrue(d5 >= d2)
+
+    def test___ge__02(self):
+        self.assertFalse(d2 >= d5)
+
+    def test___lt__00(self):
+        self.assertFalse(d1 < d5)
+
+    def test___lt__01(self):
+        self.assertTrue(d2 < d5)
+
+    def test___lt__02(self):
+        self.assertFalse(d5 < d2)
+
+    def test___gt__00(self):
+        self.assertFalse(d1 > d5)
+
+    def test___gt__01(self):
+        self.assertTrue(d5 > d2)
+
+    def test___gt__02(self):
+        self.assertFalse(d2 > d5)
+
+    def test_weekday00(self):
+        for i in range(7):
+            # March 4, 2002 is a Monday
+            self.assertEqual(datetime(2002, 3, 4 + i).weekday(), i)
+            # January 2, 1956 is a Monday
+            self.assertEqual(datetime(1956, 1, 2 + i).weekday(), i)
+
+    def test_isoweekday00(self):
+        for i in range(7):
+            self.assertEqual(datetime(2002, 3, 4 + i).isoweekday(), i + 1)
+            self.assertEqual(datetime(1956, 1, 2 + i).isoweekday(), i + 1)
+
+    def test_isoformat00(self):
+        self.assertEqual(d1.isoformat(), "2002-01-31")
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__00(self):
+        self.assertEqual(repr(d1), d1r)
+
+    def test___repr__01(self):
+        self.assertEqual(d1, eval_mod(repr(d1)))
+
+    def test___hash__00(self):
+        self.assertEqual(d1, d5)
+        self.assertEqual(hash(d1), hash(d5))
+
+    def test___hash__01(self):
+        dd1 = d1 + timedelta(weeks=7)
+        dd5 = d5 + timedelta(days=7 * 7)
+        self.assertEqual(hash(dd1), hash(dd5))
+
+    def test___hash__02(self):
+        d = {d1: 1}
+        d[d5] = 2
+        self.assertEqual(len(d), 1)
+        self.assertEqual(d[d1], 2)
+
+
+### time #####################################################################
+
+t1 = time(18, 45, 3, 1234)
+t1r = "datetime.time(microsecond=67503001234, tzinfo=None, fold=0)"
+t1f = time(18, 45, 3, 1234, fold=1)
+t1fr = f"datetime.time(microsecond=67503001234, tzinfo=None, fold=1)"
+t1z = time(18, 45, 3, 1234, tz1)
+t1zr = f"datetime.time(microsecond=67503001234, tzinfo={repr(tz1)}, fold=0)"
+t2 = time(12, 59, 59, 100)
+t2z = time(12, 59, 59, 100, tz2)
+t3 = time(18, 45, 3, 1234)
+t3z = time(18, 45, 3, 1234, tz2)
+t4 = time(18, 45, 3, 1234, fold=1)
+t4z = time(18, 45, 3, 1234, tz2, fold=1)
+t5z = time(20, 45, 3, 1234, tz2)
+
+
+class Test3Time(unittest.TestCase):
+    def test___init__00(self):
+        t = time()
+        self.assertEqual(t.hour, 0)
+        self.assertEqual(t.minute, 0)
+        self.assertEqual(t.second, 0)
+        self.assertEqual(t.microsecond, 0)
+        self.assertEqual(t.tzinfo, None)
+        self.assertEqual(t.fold, 0)
+
+    def test___init__01(self):
+        t = time(12)
+        self.assertEqual(t.hour, 12)
+        self.assertEqual(t.minute, 0)
+        self.assertEqual(t.second, 0)
+        self.assertEqual(t.microsecond, 0)
+        self.assertEqual(t.tzinfo, None)
+        self.assertEqual(t.fold, 0)
+
+    def test___init__02(self):
+        self.assertEqual(t1z.hour, 18)
+        self.assertEqual(t1z.minute, 45)
+        self.assertEqual(t1z.second, 3)
+        self.assertEqual(t1z.microsecond, 1234)
+        self.assertEqual(t1z.tzinfo, tz1)
+        self.assertEqual(t1z.fold, 0)
+
+    def test___init__03(self):
+        t = time(microsecond=1, fold=1)
+        self.assertEqual(t.fold, 1)
+
+    @unittest.skipIf(STDLIB, "not supported by standard datetime")
+    def test___init__04(self):
+        time(microsecond=24 * 60 * 60 * 1_000_000 - 1)
+
+    def test___init__05(self):
+        self.assertRaises(ValueError, time, -1, 0, 0, 0)
+        self.assertRaises(ValueError, time, 0, -1, 0, 0)
+        self.assertRaises(ValueError, time, 0, 0, -1, 0)
+        self.assertRaises(ValueError, time, 0, 0, 0, -1)
+        self.assertRaises(ValueError, time, 0, 0, 0, 0, fold=-1)
+
+    def test___init__06(self):
+        self.assertRaises(ValueError, time, 24, 0, 0, 0)
+        self.assertRaises(ValueError, time, 0, 60, 0, 0)
+        self.assertRaises(ValueError, time, 0, 0, 60, 0)
+        self.assertRaises(ValueError, time, 0, 0, 0, 0, fold=2)
+
+    @unittest.skipIf(STDLIB, "not supported by standard datetime")
+    def test___init__07(self):
+        self.assertRaises(ValueError, time, microsecond=24 * 60 * 60 * 1_000_000)
+
+    def test_fromisoformat00(self):
+        self.assertEqual(time.fromisoformat("01"), time(1))
+
+    def test_fromisoformat01(self):
+        self.assertEqual(time.fromisoformat("13:30"), time(13, 30))
+
+    def test_fromisoformat02(self):
+        self.assertEqual(time.fromisoformat("23:30:12"), time(23, 30, 12))
+
+    def test_fromisoformat03(self):
+        self.assertEqual(str(time.fromisoformat("11:03:04+01:00")), "11:03:04+01:00")
+
+    def test_hour00(self):
+        self.assertEqual(t1.hour, 18)
+
+    def test_hour01(self):
+        self.assertEqual(t2z.hour, 12)
+
+    def test_minute00(self):
+        self.assertEqual(t1.minute, 45)
+
+    def test_minute01(self):
+        self.assertEqual(t2z.minute, 59)
+
+    def test_second00(self):
+        self.assertEqual(t1.second, 3)
+
+    def test_second01(self):
+        self.assertEqual(t2z.second, 59)
+
+    def test_microsecond00(self):
+        self.assertEqual(t1.microsecond, 1234)
+
+    def test_microsecond01(self):
+        self.assertEqual(t2z.microsecond, 100)
+
+    def test_tzinfo00(self):
+        self.assertEqual(t1.tzinfo, None)
+
+    def test_tzinfo01(self):
+        self.assertEqual(t2z.tzinfo, tz2)
+
+    def test_fold00(self):
+        self.assertEqual(t1.fold, 0)
+
+    def test_replace00(self):
+        self.assertEqual(t2z.replace(), t2z)
+
+    def test_replace01(self):
+        self.assertEqual(t2z.replace(hour=20), time(20, 59, 59, 100, tz2))
+
+    def test_replace02(self):
+        self.assertEqual(t2z.replace(minute=4), time(12, 4, 59, 100, tz2))
+
+    def test_replace03(self):
+        self.assertEqual(t2z.replace(second=16), time(12, 59, 16, 100, tz2))
+
+    def test_replace04(self):
+        self.assertEqual(t2z.replace(microsecond=99), time(12, 59, 59, 99, tz2))
+
+    def test_replace05(self):
+        self.assertEqual(t2z.replace(tzinfo=tz1), time(12, 59, 59, 100, tz1))
+
+    def test_isoformat00(self):
+        self.assertEqual(t1.isoformat(), "18:45:03.001234")
+
+    def test_isoformat01(self):
+        self.assertEqual(t1z.isoformat(), "18:45:03.001234-01:00")
+
+    def test_isoformat02(self):
+        self.assertEqual(t2z.isoformat(), "12:59:59.000100+01:00")
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__00(self):
+        self.assertEqual(repr(t1), t1r)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__01(self):
+        self.assertEqual(repr(t1f), t1fr)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__02(self):
+        self.assertEqual(repr(t1z), t1zr)
+
+    def test___repr__03(self):
+        self.assertEqual(t1, eval_mod(repr(t1)))
+
+    def test___repr__04(self):
+        self.assertEqual(t1z, eval_mod(repr(t1z)))
+
+    def test___repr__05(self):
+        self.assertEqual(t4, eval_mod(repr(t4)))
+
+    def test___repr__06(self):
+        dt = eval_mod(repr(t4z))
+        self.assertEqual(t4z, eval_mod(repr(t4z)))
+
+    def test___bool__00(self):
+        self.assertTrue(t1)
+
+    def test___bool__01(self):
+        self.assertTrue(t1z)
+
+    def test___bool__02(self):
+        self.assertTrue(time())
+
+    def test___eq__00(self):
+        self.assertEqual(t1, t1)
+
+    def test___eq__01(self):
+        self.assertEqual(t1z, t1z)
+
+    def test___eq__02(self):
+        self.assertNotEqual(t1, t1z)
+
+    def test___eq__03(self):
+        self.assertNotEqual(t1z, t2z)
+
+    def test___eq__04(self):
+        self.assertEqual(t1z, t5z)
+
+    def test___eq__05(self):
+        self.assertEqual(t1, t1f)
+
+    def test___lt__00(self):
+        self.assertTrue(t2 < t1)
+
+    def test___lt__01(self):
+        self.assertTrue(t2z < t1z)
+
+    def test___lt__02(self):
+        self.assertRaises(TypeError, t1.__lt__, t1z)
+
+    def test___le__00(self):
+        self.assertTrue(t3 <= t1)
+
+    def test___le__01(self):
+        self.assertTrue(t1z <= t5z)
+
+    def test___le__02(self):
+        self.assertRaises(TypeError, t1.__le__, t1z)
+
+    def test___ge__00(self):
+        self.assertTrue(t1 >= t3)
+
+    def test___ge__01(self):
+        self.assertTrue(t5z >= t1z)
+
+    def test___ge__02(self):
+        self.assertRaises(TypeError, t1.__ge__, t1z)
+
+    def test___gt__00(self):
+        self.assertTrue(t1 > t2)
+
+    def test___gt__01(self):
+        self.assertTrue(t1z > t2z)
+
+    def test___gt__02(self):
+        self.assertRaises(TypeError, t1.__gt__, t1z)
+
+    def test___hash__00(self):
+        self.assertEqual(t1, t3)
+        self.assertEqual(hash(t1), hash(t3))
+
+    def test___hash__01(self):
+        d = {t1: 1}
+        d[t3] = 3
+        self.assertEqual(len(d), 1)
+        self.assertEqual(d[t1], 3)
+
+    def test___hash__02(self):
+        self.assertNotEqual(t1, t1z)
+        self.assertNotEqual(hash(t1), hash(t1z))
+
+    def test___hash__03(self):
+        self.assertNotEqual(t1z, t3z)
+        self.assertNotEqual(hash(t1z), hash(t3z))
+
+    def test___hash__04(self):
+        tf = t1.replace(fold=1)
+        self.assertEqual(t1, tf)
+        self.assertEqual(hash(t1), hash(tf))
+
+    def test_utcoffset00(self):
+        self.assertEqual(t1.utcoffset(), None)
+
+    def test_utcoffset01(self):
+        self.assertEqual(t1z.utcoffset(), timedelta(hours=-1))
+
+    def test_utcoffset02(self):
+        self.assertEqual(t2z.utcoffset(), timedelta(hours=1))
+
+    def test_dst00(self):
+        self.assertEqual(t1.dst(), None)
+
+    def test_dst01(self):
+        self.assertEqual(t1z.dst(), None)
+
+    def test_dst02(self):
+        self.assertEqual(t2z.dst(), td0)
+
+    def test_tzname00(self):
+        self.assertEqual(t1.tzname(), None)
+
+    def test_tzname01(self):
+        self.assertEqual(t1z.tzname(), "UTC-01:00")
+
+    def test_tzname02(self):
+        self.assertEqual(t2z.tzname(), "CET")
+
+    def test_constant00(self):
+        self.assertIsInstance(timedelta.resolution, timedelta)
+        self.assertTrue(timedelta.max > timedelta.min)
+
+    def test_constant01(self):
+        self.assertEqual(time.min, time(0))
+
+    def test_constant02(self):
+        self.assertEqual(time.max, time(23, 59, 59, 999_999))
+
+    def test_constant03(self):
+        self.assertEqual(time.resolution, timedelta(microseconds=1))
+
+
+### datetime #################################################################
+
+dt1 = datetime(2002, 1, 31)
+dt1z1 = datetime(2002, 1, 31, tzinfo=tz1)
+dt1z2 = datetime(2002, 1, 31, tzinfo=tz2)
+dt2 = datetime(1956, 1, 31)
+dt3 = datetime(2002, 3, 1, 12, 59, 59, 100, tz2)
+dt4 = datetime(2002, 3, 2, 17, 6)
+dt5 = datetime(2002, 1, 31)
+dt5z2 = datetime(2002, 1, 31, tzinfo=tz2)
+
+dt1r = "datetime.datetime(2002, 1, 31, 0, 0, 0, 0, None, fold=0)"
+dt3r = "datetime.datetime(2002, 3, 1, 12, 59, 59, 100, Cet(), fold=0)"
+dt4r = "datetime.datetime(2002, 3, 2, 17, 6, 0, 0, None, fold=0)"
+
+d1t1 = datetime(2002, 1, 31, 18, 45, 3, 1234)
+d1t1f = datetime(2002, 1, 31, 18, 45, 3, 1234, fold=1)
+d1t1z = datetime(2002, 1, 31, 18, 45, 3, 1234, tz1)
+
+dt27tz2 = datetime(2010, 3, 27, 12, tzinfo=tz2)  # last CET day
+dt28tz2 = datetime(2010, 3, 28, 12, tzinfo=tz2)  # first CEST day
+dt30tz2 = datetime(2010, 10, 30, 12, tzinfo=tz2)  # last CEST day
+dt31tz2 = datetime(2010, 10, 31, 12, tzinfo=tz2)  # first CET day
+
+
+# Tests where datetime depens on date and time
+class Test4DateTime(unittest.TestCase):
+    def test_combine00(self):
+        dt = datetime.combine(d1, t1)
+        self.assertEqual(dt, d1t1)
+
+    def test_combine01(self):
+        dt = datetime.combine(d1, t1)
+        self.assertEqual(dt.date(), d1)
+
+    def test_combine02(self):
+        dt1 = datetime.combine(d1, t1)
+        dt2 = datetime.combine(dt1, t1)
+        self.assertEqual(dt1, dt2)
+
+    def test_combine03(self):
+        dt = datetime.combine(d1, t1)
+        self.assertEqual(dt.time(), t1)
+
+    def test_combine04(self):
+        dt = datetime.combine(d1, t1, tz1)
+        self.assertEqual(dt, d1t1z)
+
+    def test_combine05(self):
+        dt = datetime.combine(d1, t1z)
+        self.assertEqual(dt, d1t1z)
+
+    def test_combine06(self):
+        dt = datetime.combine(d1, t1f)
+        self.assertEqual(dt, d1t1f)
+
+    def test_date00(self):
+        self.assertEqual(d1t1.date(), d1)
+
+    def test_time00(self):
+        self.assertEqual(d1t1.time(), t1)
+
+    def test_time01(self):
+        self.assertNotEqual(d1t1z.time(), t1z)
+
+    def test_timetz00(self):
+        self.assertEqual(d1t1.timetz(), t1)
+
+    def test_timetz01(self):
+        self.assertEqual(d1t1z.timetz(), t1z)
+
+    def test_timetz02(self):
+        self.assertEqual(d1t1f.timetz(), t1f)
+
+
+# Tests where datetime is independent from date and time
+class Test5DateTime(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        for k in ("date", "time"):
+            del mod_datetime.__dict__[k]
+
+    def test___init__00(self):
+        d = datetime(2002, 3, 1, 12, 0, fold=1)
+        self.assertEqual(d.year, 2002)
+        self.assertEqual(d.month, 3)
+        self.assertEqual(d.day, 1)
+        self.assertEqual(d.hour, 12)
+        self.assertEqual(d.minute, 0)
+        self.assertEqual(d.second, 0)
+        self.assertEqual(d.microsecond, 0)
+        self.assertEqual(d.tzinfo, None)
+        self.assertEqual(d.fold, 1)
+
+    def test___init__01(self):
+        self.assertEqual(dt3.year, 2002)
+        self.assertEqual(dt3.month, 3)
+        self.assertEqual(dt3.day, 1)
+        self.assertEqual(dt3.hour, 12)
+        self.assertEqual(dt3.minute, 59)
+        self.assertEqual(dt3.second, 59)
+        self.assertEqual(dt3.microsecond, 100)
+        self.assertEqual(dt3.tzinfo, tz2)
+        self.assertEqual(dt3.fold, 0)
+
+    def test___init__02(self):
+        datetime(MINYEAR, 1, 1)
+
+    def test___init__03(self):
+        datetime(MAXYEAR, 12, 31)
+
+    def test___init__04(self):
+        self.assertRaises(ValueError, datetime, MINYEAR - 1, 1, 1)
+
+    def test___init__05(self):
+        self.assertRaises(ValueError, datetime, MAXYEAR + 1, 1, 1)
+
+    def test___init__06(self):
+        self.assertRaises(ValueError, datetime, 2000, 0, 1)
+
+    def test___init__07(self):
+        datetime(2000, 2, 29)
+
+    def test___init__08(self):
+        datetime(2004, 2, 29)
+
+    def test___init__09(self):
+        datetime(2400, 2, 29)
+
+    def test___init__10(self):
+        self.assertRaises(ValueError, datetime, 2000, 2, 30)
+
+    def test___init__11(self):
+        self.assertRaises(ValueError, datetime, 2001, 2, 29)
+
+    def test___init__12(self):
+        self.assertRaises(ValueError, datetime, 2100, 2, 29)
+
+    def test___init__13(self):
+        self.assertRaises(ValueError, datetime, 1900, 2, 29)
+
+    def test___init__14(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 0)
+
+    def test___init__15(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 32)
+
+    def test___init__16(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 31, -1)
+
+    def test___init__17(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 31, 24)
+
+    def test___init__18(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 31, 23, -1)
+
+    def test___init__19(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 31, 23, 60)
+
+    def test___init__20(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 31, 23, 59, -1)
+
+    def test___init__21(self):
+        self.assertRaises(ValueError, datetime, 2000, 1, 31, 23, 59, 60)
+
+    def test___init__22(self):
+        self.assertEqual(dt1, eval_mod(dt1r))
+
+    def test___init__23(self):
+        self.assertEqual(dt3, eval_mod(dt3r))
+
+    def test___init__24(self):
+        self.assertEqual(dt4, eval_mod(dt4r))
+
+    def test_fromtimestamp00(self):
+        with LocalTz("Europe/Rome"):
+            ts = 1012499103.001234
+            if LOCALTZ:
+                dt = datetime.fromtimestamp(ts)
+                self.assertEqual(dt, d1t1)
+            else:
+                self.assertRaises(NotImplementedError, datetime.fromtimestamp, ts)
+
+    def test_fromtimestamp01(self):
+        ts = 1012506303.001234
+        self.assertEqual(datetime.fromtimestamp(ts, tz1), d1t1z)
+
+    def test_fromtimestamp02(self):
+        ts = 1269687600
+        self.assertEqual(datetime.fromtimestamp(ts, tz2), dt27tz2)
+
+    def test_fromtimestamp03(self):
+        ts = 1269770400
+        self.assertEqual(datetime.fromtimestamp(ts, tz2), dt28tz2)
+
+    def test_fromtimestamp04(self):
+        with LocalTz("Europe/Rome"):
+            dt = datetime(2010, 10, 31, 0, 30, tzinfo=timezone.utc)
+            ts = (dt - EPOCH).total_seconds()
+            dt = dt.replace(tzinfo=None) + 2 * td1h
+            if LOCALTZ:
+                ds = datetime.fromtimestamp(ts)
+                self.assertEqual(ds, dt)
+                self.assertFalse(ds.fold)
+            else:
+                self.assertRaises(NotImplementedError, datetime.fromtimestamp, ts)
+
+    def test_fromtimestamp05(self):
+        with LocalTz("Europe/Rome"):
+            dt = datetime(2010, 10, 31, 1, 30, tzinfo=timezone.utc)
+            ts = (dt - EPOCH).total_seconds()
+            dt = dt.replace(tzinfo=None) + 1 * td1h
+            if LOCALTZ:
+                ds = datetime.fromtimestamp(ts)
+                self.assertEqual(ds, dt)
+                self.assertTrue(ds.fold)
+            else:
+                self.assertRaises(NotImplementedError, datetime.fromtimestamp, ts)
+
+    def test_fromtimestamp06(self):
+        with LocalTz("US/Eastern"):
+            dt = datetime(2020, 11, 1, 5, 30, tzinfo=timezone.utc)
+            ts = (dt - EPOCH).total_seconds()
+            dt = dt.replace(tzinfo=None) - 4 * td1h
+            if LOCALTZ:
+                ds = datetime.fromtimestamp(ts)
+                self.assertEqual(ds, dt)
+            else:
+                self.assertRaises(NotImplementedError, datetime.fromtimestamp, ts)
+
+    def test_fromtimestamp07(self):
+        with LocalTz("US/Eastern"):
+            dt = datetime(2020, 11, 1, 7, 30, tzinfo=timezone.utc)
+            ts = (dt - EPOCH).total_seconds()
+            dt = dt.replace(tzinfo=None) - 5 * td1h
+            if LOCALTZ:
+                ds = datetime.fromtimestamp(ts)
+                self.assertEqual(ds, dt)
+            else:
+                self.assertRaises(NotImplementedError, datetime.fromtimestamp, ts)
+
+    @unittest.skipIf(not LOCALTZ, "naive datetime not supported")
+    def test_now00(self):
+        tm = datetime(*mod_time.localtime()[:6])
+        dt = datetime.now()
+        self.assertAlmostEqual(tm, dt, delta=timedelta(seconds=1))
+
+    def test_now01(self):
+        tm = datetime(*mod_time.gmtime()[:6], tzinfo=tz2)
+        tm += tz2.utcoffset(tm)
+        dt = datetime.now(tz2)
+        self.assertAlmostEqual(tm, dt, delta=timedelta(seconds=1))
+
+    def test_fromordinal00(self):
+        self.assertEqual(datetime.fromordinal(1), datetime(1, 1, 1))
+
+    def test_fromordinal01(self):
+        self.assertEqual(datetime.fromordinal(max_days), datetime(MAXYEAR, 12, 31))
+
+    def test_fromisoformat00(self):
+        self.assertEqual(datetime.fromisoformat("1975-08-10"), datetime(1975, 8, 10))
+
+    def test_fromisoformat01(self):
+        self.assertEqual(datetime.fromisoformat("1975-08-10 23"), datetime(1975, 8, 10, 23))
+
+    def test_fromisoformat02(self):
+        self.assertEqual(datetime.fromisoformat("1975-08-10 23:30"), datetime(1975, 8, 10, 23, 30))
+
+    def test_fromisoformat03(self):
+        self.assertEqual(
+            datetime.fromisoformat("1975-08-10 23:30:12"), datetime(1975, 8, 10, 23, 30, 12)
+        )
+
+    def test_fromisoformat04(self):
+        self.assertEqual(
+            str(datetime.fromisoformat("1975-08-10 23:30:12+01:00")), "1975-08-10 23:30:12+01:00"
+        )
+
+    def test_year00(self):
+        self.assertEqual(dt1.year, 2002)
+
+    def test_year01(self):
+        self.assertEqual(dt2.year, 1956)
+
+    def test_month00(self):
+        self.assertEqual(dt1.month, 1)
+
+    def test_month01(self):
+        self.assertEqual(dt3.month, 3)
+
+    def test_day00(self):
+        self.assertEqual(dt1.day, 31)
+
+    def test_day01(self):
+        self.assertEqual(dt4.day, 2)
+
+    def test_hour00(self):
+        self.assertEqual(dt1.hour, 0)
+
+    def test_hour01(self):
+        self.assertEqual(dt3.hour, 12)
+
+    def test_minute00(self):
+        self.assertEqual(dt1.minute, 0)
+
+    def test_minute01(self):
+        self.assertEqual(dt3.minute, 59)
+
+    def test_second00(self):
+        self.assertEqual(dt1.second, 0)
+
+    def test_second01(self):
+        self.assertEqual(dt3.second, 59)
+
+    def test_microsecond00(self):
+        self.assertEqual(dt1.microsecond, 0)
+
+    def test_microsecond01(self):
+        self.assertEqual(dt3.microsecond, 100)
+
+    def test_tzinfo00(self):
+        self.assertEqual(dt1.tzinfo, None)
+
+    def test_tzinfo01(self):
+        self.assertEqual(dt3.tzinfo, tz2)
+
+    def test_fold00(self):
+        self.assertEqual(dt1.fold, 0)
+
+    def test___add__00(self):
+        self.assertEqual(dt4 + hour, datetime(2002, 3, 2, 18, 6))
+
+    def test___add__01(self):
+        self.assertEqual(hour + dt4, datetime(2002, 3, 2, 18, 6))
+
+    def test___add__02(self):
+        self.assertEqual(dt4 + 10 * hour, datetime(2002, 3, 3, 3, 6))
+
+    def test___add__03(self):
+        self.assertEqual(dt4 + day, datetime(2002, 3, 3, 17, 6))
+
+    def test___add__04(self):
+        self.assertEqual(dt4 + week, datetime(2002, 3, 9, 17, 6))
+
+    def test___add__05(self):
+        self.assertEqual(dt4 + 52 * week, datetime(2003, 3, 1, 17, 6))
+
+    def test___add__06(self):
+        self.assertEqual(dt4 + (week + day + hour), datetime(2002, 3, 10, 18, 6))
+
+    def test___add__07(self):
+        self.assertEqual(dt5 + -day, datetime(2002, 1, 30))
+
+    def test___add__08(self):
+        self.assertEqual(-hour + dt4, datetime(2002, 3, 2, 16, 6))
+
+    def test___sub__00(self):
+        d = dt1 - dt2
+        self.assertEqual(d.total_seconds(), d2d1s)
+
+    def test___sub__01(self):
+        self.assertEqual(dt4 - hour, datetime(2002, 3, 2, 16, 6))
+
+    def test___sub__02(self):
+        self.assertEqual(dt4 - hour, dt4 + -hour)
+
+    def test___sub__03(self):
+        self.assertEqual(dt4 - 20 * hour, datetime(2002, 3, 1, 21, 6))
+
+    def test___sub__04(self):
+        self.assertEqual(dt4 - day, datetime(2002, 3, 1, 17, 6))
+
+    def test___sub__05(self):
+        self.assertEqual(dt4 - week, datetime(2002, 2, 23, 17, 6))
+
+    def test___sub__06(self):
+        self.assertEqual(dt4 - 52 * week, datetime(2001, 3, 3, 17, 6))
+
+    def test___sub__07(self):
+        self.assertEqual(dt4 - (week + day + hour), datetime(2002, 2, 22, 16, 6))
+
+    def test_computation00(self):
+        self.assertEqual((dt4 + week) - dt4, week)
+
+    def test_computation01(self):
+        self.assertEqual((dt4 + day) - dt4, day)
+
+    def test_computation02(self):
+        self.assertEqual((dt4 + hour) - dt4, hour)
+
+    def test_computation03(self):
+        self.assertEqual(dt4 - (dt4 + week), -week)
+
+    def test_computation04(self):
+        self.assertEqual(dt4 - (dt4 + day), -day)
+
+    def test_computation05(self):
+        self.assertEqual(dt4 - (dt4 + hour), -hour)
+
+    def test_computation06(self):
+        self.assertEqual(dt4 - (dt4 - week), week)
+
+    def test_computation07(self):
+        self.assertEqual(dt4 - (dt4 - day), day)
+
+    def test_computation08(self):
+        self.assertEqual(dt4 - (dt4 - hour), hour)
+
+    def test_computation09(self):
+        self.assertEqual(dt4 + (week + day + hour), (((dt4 + week) + day) + hour))
+
+    def test_computation10(self):
+        self.assertEqual(dt4 - (week + day + hour), (((dt4 - week) - day) - hour))
+
+    def test___eq__00(self):
+        self.assertEqual(dt1, dt5)
+
+    def test___eq__01(self):
+        self.assertFalse(dt1 != dt5)
+
+    def test___eq__02(self):
+        self.assertTrue(dt2 != dt5)
+
+    def test___eq__03(self):
+        self.assertTrue(dt5 != dt2)
+
+    def test___eq__04(self):
+        self.assertFalse(dt2 == dt5)
+
+    def test___eq__05(self):
+        self.assertFalse(dt5 == dt2)
+
+    def test___eq__06(self):
+        self.assertFalse(dt1 == dt1z1)
+
+    def test___eq__07(self):
+        self.assertFalse(dt1z1 == dt1z2)
+
+    def test___eq__08(self):
+        self.assertTrue(dt1z2 == dt5z2)
+
+    def test___le__00(self):
+        self.assertTrue(dt1 <= dt5)
+
+    def test___le__01(self):
+        self.assertTrue(dt2 <= dt5)
+
+    def test___le__02(self):
+        self.assertFalse(dt5 <= dt2)
+
+    def test___le__03(self):
+        self.assertFalse(dt1z1 <= dt1z2)
+
+    def test___le__04(self):
+        self.assertTrue(dt1z2 <= dt5z2)
+
+    def test___le__05(self):
+        self.assertRaises(TypeError, dt1.__le__, dt1z1)
+
+    def test___ge__00(self):
+        self.assertTrue(dt1 >= dt5)
+
+    def test___ge__01(self):
+        self.assertTrue(dt5 >= dt2)
+
+    def test___ge__02(self):
+        self.assertFalse(dt2 >= dt5)
+
+    def test___ge__03(self):
+        self.assertTrue(dt1z1 >= dt1z2)
+
+    def test___ge__04(self):
+        self.assertTrue(dt1z2 >= dt5z2)
+
+    def test___ge__05(self):
+        self.assertRaises(TypeError, dt1.__ge__, dt1z1)
+
+    def test___lt__00(self):
+        self.assertFalse(dt1 < dt5)
+
+    def test___lt__01(self):
+        self.assertTrue(dt2 < dt5)
+
+    def test___lt__02(self):
+        self.assertFalse(dt5 < dt2)
+
+    def test___lt__03(self):
+        self.assertFalse(dt1z1 < dt1z2)
+
+    def test___lt__04(self):
+        self.assertFalse(dt1z2 < dt5z2)
+
+    def test___lt__05(self):
+        self.assertRaises(TypeError, dt1.__lt__, dt1z1)
+
+    def test___gt__00(self):
+        self.assertFalse(dt1 > dt5)
+
+    def test___gt__01(self):
+        self.assertTrue(dt5 > dt2)
+
+    def test___gt__02(self):
+        self.assertFalse(dt2 > dt5)
+
+    def test___gt__03(self):
+        self.assertTrue(dt1z1 > dt1z2)
+
+    def test___gt__04(self):
+        self.assertFalse(dt1z2 > dt5z2)
+
+    def test___gt__05(self):
+        self.assertRaises(TypeError, dt1.__gt__, dt1z1)
+
+    def test_replace00(self):
+        self.assertEqual(dt3.replace(), dt3)
+
+    def test_replace01(self):
+        self.assertEqual(dt3.replace(year=2001), datetime(2001, 3, 1, 12, 59, 59, 100, tz2))
+
+    def test_replace02(self):
+        self.assertEqual(dt3.replace(month=4), datetime(2002, 4, 1, 12, 59, 59, 100, tz2))
+
+    def test_replace03(self):
+        self.assertEqual(dt3.replace(day=16), datetime(2002, 3, 16, 12, 59, 59, 100, tz2))
+
+    def test_replace04(self):
+        self.assertEqual(dt3.replace(hour=13), datetime(2002, 3, 1, 13, 59, 59, 100, tz2))
+
+    def test_replace05(self):
+        self.assertEqual(dt3.replace(minute=0), datetime(2002, 3, 1, 12, 0, 59, 100, tz2))
+
+    def test_replace06(self):
+        self.assertEqual(dt3.replace(second=1), datetime(2002, 3, 1, 12, 59, 1, 100, tz2))
+
+    def test_replace07(self):
+        self.assertEqual(dt3.replace(microsecond=99), datetime(2002, 3, 1, 12, 59, 59, 99, tz2))
+
+    def test_replace08(self):
+        self.assertEqual(dt3.replace(tzinfo=tz1), datetime(2002, 3, 1, 12, 59, 59, 100, tz1))
+
+    def test_replace09(self):
+        self.assertRaises(ValueError, datetime(2000, 2, 29).replace, year=2001)
+
+    def test_astimezone00(self):
+        dt = datetime(2002, 3, 1, 11, 59, 59, 100, timezone.utc)
+        self.assertEqual(dt3.astimezone(timezone.utc), dt)
+
+    def test_astimezone01(self):
+        self.assertIs(dt1z1.astimezone(tz1), dt1z1)
+
+    def test_astimezone02(self):
+        dt = datetime(2002, 1, 31, 2, 0, tzinfo=tz2)
+        self.assertEqual(dt1z1.astimezone(tz2), dt)
+
+    def test_astimezone03(self):
+        dt = datetime(2002, 1, 31, 10, 30, tzinfo=tz_acdt)
+        self.assertEqual(dt1z1.astimezone(tz_acdt), dt)
+
+    def test_astimezone04(self):
+        with LocalTz("Europe/Rome"):
+            dt1 = dt27tz2
+            dt2 = dt1.replace(tzinfo=None)
+            if LOCALTZ:
+                self.assertEqual(dt1, dt2.astimezone(tz2))
+            else:
+                self.assertRaises(NotImplementedError, dt2.astimezone, tz2)
+
+    def test_astimezone05(self):
+        with LocalTz("Europe/Rome"):
+            dt1 = dt28tz2
+            dt2 = dt1.replace(tzinfo=None)
+            if LOCALTZ:
+                self.assertEqual(dt1, dt2.astimezone(tz2))
+            else:
+                self.assertRaises(NotImplementedError, dt2.astimezone, tz2)
+
+    def test_astimezone06(self):
+        with LocalTz("Europe/Rome"):
+            dt1 = dt30tz2
+            dt2 = dt1.replace(tzinfo=None)
+            if LOCALTZ:
+                self.assertEqual(dt1, dt2.astimezone(tz2))
+            else:
+                self.assertRaises(NotImplementedError, dt2.astimezone, tz2)
+
+    def test_astimezone07(self):
+        with LocalTz("Europe/Rome"):
+            dt1 = dt31tz2
+            dt2 = dt1.replace(tzinfo=None)
+            if LOCALTZ:
+                self.assertEqual(dt1, dt2.astimezone(tz2))
+            else:
+                self.assertRaises(NotImplementedError, dt2.astimezone, tz2)
+
+    def test_astimezone08(self):
+        with LocalTz("Europe/Rome"):
+            dt1 = dt3
+            dt2 = dt1.replace(tzinfo=None)
+            if LOCALTZ:
+                self.assertEqual(dt1, dt2.astimezone(tz2))
+            else:
+                self.assertRaises(NotImplementedError, dt2.astimezone, tz2)
+
+    def test_utcoffset00(self):
+        self.assertEqual(dt1.utcoffset(), None)
+
+    def test_utcoffset01(self):
+        self.assertEqual(dt27tz2.utcoffset(), timedelta(hours=1))
+
+    def test_utcoffset02(self):
+        self.assertEqual(dt28tz2.utcoffset(), timedelta(hours=2))
+
+    def test_utcoffset03(self):
+        self.assertEqual(dt30tz2.utcoffset(), timedelta(hours=2))
+
+    def test_utcoffset04(self):
+        self.assertEqual(dt31tz2.utcoffset(), timedelta(hours=1))
+
+    def test_dst00(self):
+        self.assertEqual(dt1.dst(), None)
+
+    def test_dst01(self):
+        self.assertEqual(dt27tz2.dst(), timedelta(hours=0))
+
+    def test_dst02(self):
+        self.assertEqual(dt28tz2.dst(), timedelta(hours=1))
+
+    def test_tzname00(self):
+        self.assertEqual(dt1.tzname(), None)
+
+    def test_tzname01(self):
+        self.assertEqual(dt27tz2.tzname(), "CET")
+
+    def test_tzname02(self):
+        self.assertEqual(dt28tz2.tzname(), "CEST")
+
+    def test_timetuple00(self):
+        with LocalTz("Europe/Rome"):
+            self.assertEqual(dt1.timetuple()[:8], (2002, 1, 31, 0, 0, 0, 3, 31))
+
+    def test_timetuple01(self):
+        self.assertEqual(dt27tz2.timetuple()[:8], (2010, 3, 27, 12, 0, 0, 5, 86))
+
+    def test_timetuple02(self):
+        self.assertEqual(dt28tz2.timetuple()[:8], (2010, 3, 28, 12, 0, 0, 6, 87))
+
+    def test_timetuple03(self):
+        with LocalTz("Europe/Rome"):
+            self.assertEqual(
+                dt27tz2.replace(tzinfo=None).timetuple()[:8], (2010, 3, 27, 12, 0, 0, 5, 86)
+            )
+
+    def test_timetuple04(self):
+        self.assertEqual(
+            dt28tz2.replace(tzinfo=None).timetuple()[:8], (2010, 3, 28, 12, 0, 0, 6, 87)
+        )
+
+    def test_toordinal00(self):
+        self.assertEqual(datetime(1, 1, 1).toordinal(), 1)
+
+    def test_toordinal01(self):
+        self.assertEqual(datetime(1, 12, 31).toordinal(), 365)
+
+    def test_toordinal02(self):
+        self.assertEqual(datetime(2, 1, 1).toordinal(), 366)
+
+    def test_toordinal03(self):
+        # https://www.timeanddate.com/date/dateadded.html?d1=1&m1=1&y1=1&type=add&ad=730882
+        self.assertEqual(dt1.toordinal(), 730_882 - 1)
+
+    def test_toordinal04(self):
+        # https://www.timeanddate.com/date/dateadded.html?d1=1&m1=1&y1=1&type=add&ad=730911
+        self.assertEqual(dt3.toordinal(), 730_911 - 1)
+
+    def test_weekday00(self):
+        self.assertEqual(dt1.weekday(), d1.weekday())
+
+    def test_timestamp00(self):
+        with LocalTz("Europe/Rome"):
+            if LOCALTZ:
+                self.assertEqual(d1t1.timestamp(), 1012499103.001234)
+            else:
+                self.assertRaises(NotImplementedError, d1t1.timestamp)
+
+    def test_timestamp01(self):
+        self.assertEqual(d1t1z.timestamp(), 1012506303.001234)
+
+    def test_timestamp02(self):
+        with LocalTz("Europe/Rome"):
+            dt = datetime(2010, 3, 28, 2, 30)  # doens't exist
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1269739800.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp03(self):
+        with LocalTz("Europe/Rome"):
+            dt = datetime(2010, 8, 10, 2, 30)
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1281400200.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp04(self):
+        with LocalTz("Europe/Rome"):
+            dt = datetime(2010, 10, 31, 2, 30, fold=0)
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1288485000.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp05(self):
+        with LocalTz("Europe/Rome"):
+            dt = datetime(2010, 10, 31, 2, 30, fold=1)
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1288488600.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp06(self):
+        with LocalTz("US/Eastern"):
+            dt = datetime(2020, 3, 8, 2, 30)  # doens't exist
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1583652600.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp07(self):
+        with LocalTz("US/Eastern"):
+            dt = datetime(2020, 8, 10, 2, 30)
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1597041000.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp08(self):
+        with LocalTz("US/Eastern"):
+            dt = datetime(2020, 11, 1, 2, 30, fold=0)
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1604215800.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_timestamp09(self):
+        with LocalTz("US/Eastern"):
+            dt = datetime(2020, 11, 1, 2, 30, fold=1)
+            if LOCALTZ:
+                self.assertEqual(dt.timestamp(), 1604215800.0)
+            else:
+                self.assertRaises(NotImplementedError, dt.timestamp)
+
+    def test_isoweekday00(self):
+        self.assertEqual(dt1.isoweekday(), d1.isoweekday())
+
+    def test_isoformat00(self):
+        self.assertEqual(dt3.isoformat(), "2002-03-01T12:59:59.000100+01:00")
+
+    def test_isoformat01(self):
+        self.assertEqual(dt3.isoformat("T"), "2002-03-01T12:59:59.000100+01:00")
+
+    def test_isoformat02(self):
+        self.assertEqual(dt3.isoformat(" "), "2002-03-01 12:59:59.000100+01:00")
+
+    def test_isoformat03(self):
+        self.assertEqual(str(dt3), "2002-03-01 12:59:59.000100+01:00")
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__00(self):
+        self.assertEqual(repr(dt1), dt1r)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__01(self):
+        self.assertEqual(repr(dt3), dt3r)
+
+    @unittest.skipIf(STDLIB, "standard datetime differs")
+    def test___repr__02(self):
+        self.assertEqual(repr(dt4), dt4r)
+
+    def test___repr__03(self):
+        self.assertEqual(dt1, eval_mod(repr(dt1)))
+
+    def test___repr__04(self):
+        self.assertEqual(dt3, eval_mod(repr(dt3)))
+
+    def test___repr__05(self):
+        self.assertEqual(dt4, eval_mod(repr(dt4)))
+
+    def test___hash__00(self):
+        self.assertEqual(dt1, dt5)
+        self.assertEqual(hash(dt1), hash(dt5))
+
+    def test___hash__01(self):
+        dd1 = dt1 + timedelta(weeks=7)
+        dd5 = dt5 + timedelta(days=7 * 7)
+        self.assertEqual(hash(dd1), hash(dd5))
+
+    def test___hash__02(self):
+        d = {dt1: 1}
+        d[dt5] = 2
+        self.assertEqual(len(d), 1)
+        self.assertEqual(d[dt1], 2)
+
+    def test___hash__03(self):
+        self.assertNotEqual(dt1, dt1z1)
+        self.assertNotEqual(hash(dt1), hash(dt1z1))
+
+    def test___hash__04(self):
+        self.assertNotEqual(dt1z1, dt5z2)
+        self.assertNotEqual(hash(dt1z1), hash(dt5z2))
+
+    @unittest.skipIf(STDLIB, "standard datetime has no tuple()")
+    def test_tuple00(self):
+        self.assertEqual(dt1.tuple(), (2002, 1, 31, 0, 0, 0, 0, None, 0))
+
+    @unittest.skipIf(STDLIB, "standard datetime has no tuple()")
+    def test_tuple01(self):
+        self.assertEqual(dt27tz2.tuple(), (2010, 3, 27, 12, 0, 0, 0, tz2, 0))
+
+    @unittest.skipIf(STDLIB, "standard datetime has no tuple()")
+    def test_tuple02(self):
+        self.assertEqual(dt28tz2.tuple(), (2010, 3, 28, 12, 0, 0, 0, tz2, 0))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/unix-ffi/datetime/datetime.py b/unix-ffi/datetime/datetime.py
deleted file mode 100644
index 8f3dff0d0..000000000
--- a/unix-ffi/datetime/datetime.py
+++ /dev/null
@@ -1,2276 +0,0 @@
-"""Concrete date/time and related types.
-
-See http://www.iana.org/time-zones/repository/tz-link.html for
-time zone and DST data sources.
-"""
-
-import time as _time
-import math as _math
-
-
-def _cmp(x, y):
-    return 0 if x == y else 1 if x > y else -1
-
-
-MINYEAR = 1
-MAXYEAR = 9999
-_MAXORDINAL = 3652059  # date.max.toordinal()
-
-# Utility functions, adapted from Python's Demo/classes/Dates.py, which
-# also assumes the current Gregorian calendar indefinitely extended in
-# both directions.  Difference:  Dates.py calls January 1 of year 0 day
-# number 1.  The code here calls January 1 of year 1 day number 1.  This is
-# to match the definition of the "proleptic Gregorian" calendar in Dershowitz
-# and Reingold's "Calendrical Calculations", where it's the base calendar
-# for all computations.  See the book for algorithms for converting between
-# proleptic Gregorian ordinals and many other calendar systems.
-
-_DAYS_IN_MONTH = [None, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-
-_DAYS_BEFORE_MONTH = [None]
-dbm = 0
-for dim in _DAYS_IN_MONTH[1:]:
-    _DAYS_BEFORE_MONTH.append(dbm)
-    dbm += dim
-del dbm, dim
-
-
-def _is_leap(year):
-    "year -> 1 if leap year, else 0."
-    return year % 4 == 0 and (year % 100 != 0 or year % 400 == 0)
-
-
-def _days_before_year(year):
-    "year -> number of days before January 1st of year."
-    y = year - 1
-    return y * 365 + y // 4 - y // 100 + y // 400
-
-
-def _days_in_month(year, month):
-    "year, month -> number of days in that month in that year."
-    assert 1 <= month <= 12, month
-    if month == 2 and _is_leap(year):
-        return 29
-    return _DAYS_IN_MONTH[month]
-
-
-def _days_before_month(year, month):
-    "year, month -> number of days in year preceding first day of month."
-    assert 1 <= month <= 12, "month must be in 1..12"
-    return _DAYS_BEFORE_MONTH[month] + (month > 2 and _is_leap(year))
-
-
-def _ymd2ord(year, month, day):
-    "year, month, day -> ordinal, considering 01-Jan-0001 as day 1."
-    assert 1 <= month <= 12, "month must be in 1..12"
-    dim = _days_in_month(year, month)
-    assert 1 <= day <= dim, "day must be in 1..%d" % dim
-    return _days_before_year(year) + _days_before_month(year, month) + day
-
-
-_DI400Y = _days_before_year(401)  # number of days in 400 years
-_DI100Y = _days_before_year(101)  #    "    "   "   " 100   "
-_DI4Y = _days_before_year(5)  #    "    "   "   "   4   "
-
-# A 4-year cycle has an extra leap day over what we'd get from pasting
-# together 4 single years.
-assert _DI4Y == 4 * 365 + 1
-
-# Similarly, a 400-year cycle has an extra leap day over what we'd get from
-# pasting together 4 100-year cycles.
-assert _DI400Y == 4 * _DI100Y + 1
-
-# OTOH, a 100-year cycle has one fewer leap day than we'd get from
-# pasting together 25 4-year cycles.
-assert _DI100Y == 25 * _DI4Y - 1
-
-
-def _ord2ymd(n):
-    "ordinal -> (year, month, day), considering 01-Jan-0001 as day 1."
-
-    # n is a 1-based index, starting at 1-Jan-1.  The pattern of leap years
-    # repeats exactly every 400 years.  The basic strategy is to find the
-    # closest 400-year boundary at or before n, then work with the offset
-    # from that boundary to n.  Life is much clearer if we subtract 1 from
-    # n first -- then the values of n at 400-year boundaries are exactly
-    # those divisible by _DI400Y:
-    #
-    #     D  M   Y            n              n-1
-    #     -- --- ----        ----------     ----------------
-    #     31 Dec -400        -_DI400Y       -_DI400Y -1
-    #      1 Jan -399         -_DI400Y +1   -_DI400Y      400-year boundary
-    #     ...
-    #     30 Dec  000        -1             -2
-    #     31 Dec  000         0             -1
-    #      1 Jan  001         1              0            400-year boundary
-    #      2 Jan  001         2              1
-    #      3 Jan  001         3              2
-    #     ...
-    #     31 Dec  400         _DI400Y        _DI400Y -1
-    #      1 Jan  401         _DI400Y +1     _DI400Y      400-year boundary
-    n -= 1
-    n400, n = divmod(n, _DI400Y)
-    year = n400 * 400 + 1  # ..., -399, 1, 401, ...
-
-    # Now n is the (non-negative) offset, in days, from January 1 of year, to
-    # the desired date.  Now compute how many 100-year cycles precede n.
-    # Note that it's possible for n100 to equal 4!  In that case 4 full
-    # 100-year cycles precede the desired day, which implies the desired
-    # day is December 31 at the end of a 400-year cycle.
-    n100, n = divmod(n, _DI100Y)
-
-    # Now compute how many 4-year cycles precede it.
-    n4, n = divmod(n, _DI4Y)
-
-    # And now how many single years.  Again n1 can be 4, and again meaning
-    # that the desired day is December 31 at the end of the 4-year cycle.
-    n1, n = divmod(n, 365)
-
-    year += n100 * 100 + n4 * 4 + n1
-    if n1 == 4 or n100 == 4:
-        assert n == 0
-        return year - 1, 12, 31
-
-    # Now the year is correct, and n is the offset from January 1.  We find
-    # the month via an estimate that's either exact or one too large.
-    leapyear = n1 == 3 and (n4 != 24 or n100 == 3)
-    assert leapyear == _is_leap(year)
-    month = (n + 50) >> 5
-    preceding = _DAYS_BEFORE_MONTH[month] + (month > 2 and leapyear)
-    if preceding > n:  # estimate is too large
-        month -= 1
-        preceding -= _DAYS_IN_MONTH[month] + (month == 2 and leapyear)
-    n -= preceding
-    assert 0 <= n < _days_in_month(year, month)
-
-    # Now the year and month are correct, and n is the offset from the
-    # start of that month:  we're done!
-    return year, month, n + 1
-
-
-# Month and day names.  For localized versions, see the calendar module.
-_MONTHNAMES = [
-    None,
-    "Jan",
-    "Feb",
-    "Mar",
-    "Apr",
-    "May",
-    "Jun",
-    "Jul",
-    "Aug",
-    "Sep",
-    "Oct",
-    "Nov",
-    "Dec",
-]
-_DAYNAMES = [None, "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-
-
-def _build_struct_time(y, m, d, hh, mm, ss, dstflag):
-    wday = (_ymd2ord(y, m, d) + 6) % 7
-    dnum = _days_before_month(y, m) + d
-    return _time.struct_time((y, m, d, hh, mm, ss, wday, dnum, dstflag))
-
-
-def _format_time(hh, mm, ss, us):
-    # Skip trailing microseconds when us==0.
-    result = "%02d:%02d:%02d" % (hh, mm, ss)
-    if us:
-        result += ".%06d" % us
-    return result
-
-
-# Correctly substitute for %z and %Z escapes in strftime formats.
-def _wrap_strftime(object, format, timetuple):
-    # Don't call utcoffset() or tzname() unless actually needed.
-    freplace = None  # the string to use for %f
-    zreplace = None  # the string to use for %z
-    Zreplace = None  # the string to use for %Z
-
-    # Scan format for %z and %Z escapes, replacing as needed.
-    newformat = []
-    push = newformat.append
-    i, n = 0, len(format)
-    while i < n:
-        ch = format[i]
-        i += 1
-        if ch == "%":
-            if i < n:
-                ch = format[i]
-                i += 1
-                if ch == "f":
-                    if freplace is None:
-                        freplace = "%06d" % getattr(object, "microsecond", 0)
-                    newformat.append(freplace)
-                elif ch == "z":
-                    if zreplace is None:
-                        zreplace = ""
-                        if hasattr(object, "utcoffset"):
-                            offset = object.utcoffset()
-                            if offset is not None:
-                                sign = "+"
-                                if offset.days < 0:
-                                    offset = -offset
-                                    sign = "-"
-                                h, m = divmod(offset, timedelta(hours=1))
-                                assert not m % timedelta(minutes=1), "whole minute"
-                                m //= timedelta(minutes=1)
-                                zreplace = "%c%02d%02d" % (sign, h, m)
-                    assert "%" not in zreplace
-                    newformat.append(zreplace)
-                elif ch == "Z":
-                    if Zreplace is None:
-                        Zreplace = ""
-                        if hasattr(object, "tzname"):
-                            s = object.tzname()
-                            if s is not None:
-                                # strftime is going to have at this: escape %
-                                Zreplace = s.replace("%", "%%")
-                    newformat.append(Zreplace)
-                else:
-                    push("%")
-                    push(ch)
-            else:
-                push("%")
-        else:
-            push(ch)
-    newformat = "".join(newformat)
-    return _time.strftime(newformat, timetuple)
-
-
-def _call_tzinfo_method(tzinfo, methname, tzinfoarg):
-    if tzinfo is None:
-        return None
-    return getattr(tzinfo, methname)(tzinfoarg)
-
-
-# Just raise TypeError if the arg isn't None or a string.
-def _check_tzname(name):
-    if name is not None and not isinstance(name, str):
-        raise TypeError("tzinfo.tzname() must return None or string, " "not '%s'" % type(name))
-
-
-# name is the offset-producing method, "utcoffset" or "dst".
-# offset is what it returned.
-# If offset isn't None or timedelta, raises TypeError.
-# If offset is None, returns None.
-# Else offset is checked for being in range, and a whole # of minutes.
-# If it is, its integer value is returned.  Else ValueError is raised.
-def _check_utc_offset(name, offset):
-    assert name in ("utcoffset", "dst")
-    if offset is None:
-        return
-    if not isinstance(offset, timedelta):
-        raise TypeError(
-            "tzinfo.%s() must return None " "or timedelta, not '%s'" % (name, type(offset))
-        )
-    if offset % timedelta(minutes=1) or offset.microseconds:
-        raise ValueError(
-            "tzinfo.%s() must return a whole number " "of minutes, got %s" % (name, offset)
-        )
-    if not -timedelta(1) < offset < timedelta(1):
-        raise ValueError(
-            "%s()=%s, must be must be strictly between"
-            " -timedelta(hours=24) and timedelta(hours=24)" % (name, offset)
-        )
-
-
-def _check_date_fields(year, month, day):
-    if not isinstance(year, int):
-        raise TypeError("int expected")
-    if not MINYEAR <= year <= MAXYEAR:
-        raise ValueError("year must be in %d..%d" % (MINYEAR, MAXYEAR), year)
-    if not 1 <= month <= 12:
-        raise ValueError("month must be in 1..12", month)
-    dim = _days_in_month(year, month)
-    if not 1 <= day <= dim:
-        raise ValueError("day must be in 1..%d" % dim, day)
-
-
-def _check_time_fields(hour, minute, second, microsecond):
-    if not isinstance(hour, int):
-        raise TypeError("int expected")
-    if not 0 <= hour <= 23:
-        raise ValueError("hour must be in 0..23", hour)
-    if not 0 <= minute <= 59:
-        raise ValueError("minute must be in 0..59", minute)
-    if not 0 <= second <= 59:
-        raise ValueError("second must be in 0..59", second)
-    if not 0 <= microsecond <= 999999:
-        raise ValueError("microsecond must be in 0..999999", microsecond)
-
-
-def _check_tzinfo_arg(tz):
-    if tz is not None and not isinstance(tz, tzinfo):
-        raise TypeError("tzinfo argument must be None or of a tzinfo subclass")
-
-
-def _cmperror(x, y):
-    raise TypeError("can't compare '%s' to '%s'" % (type(x).__name__, type(y).__name__))
-
-
-class timedelta:
-    """Represent the difference between two datetime objects.
-
-    Supported operators:
-
-    - add, subtract timedelta
-    - unary plus, minus, abs
-    - compare to timedelta
-    - multiply, divide by int
-
-    In addition, datetime supports subtraction of two datetime objects
-    returning a timedelta, and addition or subtraction of a datetime
-    and a timedelta giving a datetime.
-
-    Representation: (days, seconds, microseconds).  Why?  Because I
-    felt like it.
-    """
-
-    __slots__ = "_days", "_seconds", "_microseconds"
-
-    def __new__(
-        cls, days=0, seconds=0, microseconds=0, milliseconds=0, minutes=0, hours=0, weeks=0
-    ):
-        # Doing this efficiently and accurately in C is going to be difficult
-        # and error-prone, due to ubiquitous overflow possibilities, and that
-        # C double doesn't have enough bits of precision to represent
-        # microseconds over 10K years faithfully.  The code here tries to make
-        # explicit where go-fast assumptions can be relied on, in order to
-        # guide the C implementation; it's way more convoluted than speed-
-        # ignoring auto-overflow-to-long idiomatic Python could be.
-
-        # XXX Check that all inputs are ints or floats.
-
-        # Final values, all integer.
-        # s and us fit in 32-bit signed ints; d isn't bounded.
-        d = s = us = 0
-
-        # Normalize everything to days, seconds, microseconds.
-        days += weeks * 7
-        seconds += minutes * 60 + hours * 3600
-        microseconds += milliseconds * 1000
-
-        # Get rid of all fractions, and normalize s and us.
-        # Take a deep breath <wink>.
-        if isinstance(days, float):
-            dayfrac, days = _math.modf(days)
-            daysecondsfrac, daysecondswhole = _math.modf(dayfrac * (24.0 * 3600.0))
-            assert daysecondswhole == int(daysecondswhole)  # can't overflow
-            s = int(daysecondswhole)
-            assert days == int(days)
-            d = int(days)
-        else:
-            daysecondsfrac = 0.0
-            d = days
-        assert isinstance(daysecondsfrac, float)
-        assert abs(daysecondsfrac) <= 1.0
-        assert isinstance(d, int)
-        assert abs(s) <= 24 * 3600
-        # days isn't referenced again before redefinition
-
-        if isinstance(seconds, float):
-            secondsfrac, seconds = _math.modf(seconds)
-            assert seconds == int(seconds)
-            seconds = int(seconds)
-            secondsfrac += daysecondsfrac
-            assert abs(secondsfrac) <= 2.0
-        else:
-            secondsfrac = daysecondsfrac
-        # daysecondsfrac isn't referenced again
-        assert isinstance(secondsfrac, float)
-        assert abs(secondsfrac) <= 2.0
-
-        assert isinstance(seconds, int)
-        days, seconds = divmod(seconds, 24 * 3600)
-        d += days
-        s += int(seconds)  # can't overflow
-        assert isinstance(s, int)
-        assert abs(s) <= 2 * 24 * 3600
-        # seconds isn't referenced again before redefinition
-
-        usdouble = secondsfrac * 1e6
-        assert abs(usdouble) < 2.1e6  # exact value not critical
-        # secondsfrac isn't referenced again
-
-        if isinstance(microseconds, float):
-            microseconds += usdouble
-            microseconds = round(microseconds, 0)
-            seconds, microseconds = divmod(microseconds, 1e6)
-            assert microseconds == int(microseconds)
-            assert seconds == int(seconds)
-            days, seconds = divmod(seconds, 24.0 * 3600.0)
-            assert days == int(days)
-            assert seconds == int(seconds)
-            d += int(days)
-            s += int(seconds)  # can't overflow
-            assert isinstance(s, int)
-            assert abs(s) <= 3 * 24 * 3600
-        else:
-            seconds, microseconds = divmod(microseconds, 1000000)
-            days, seconds = divmod(seconds, 24 * 3600)
-            d += days
-            s += int(seconds)  # can't overflow
-            assert isinstance(s, int)
-            assert abs(s) <= 3 * 24 * 3600
-            microseconds = float(microseconds)
-            microseconds += usdouble
-            microseconds = round(microseconds, 0)
-        assert abs(s) <= 3 * 24 * 3600
-        assert abs(microseconds) < 3.1e6
-
-        # Just a little bit of carrying possible for microseconds and seconds.
-        assert isinstance(microseconds, float)
-        assert int(microseconds) == microseconds
-        us = int(microseconds)
-        seconds, us = divmod(us, 1000000)
-        s += seconds  # cant't overflow
-        assert isinstance(s, int)
-        days, s = divmod(s, 24 * 3600)
-        d += days
-
-        assert isinstance(d, int)
-        assert isinstance(s, int) and 0 <= s < 24 * 3600
-        assert isinstance(us, int) and 0 <= us < 1000000
-
-        self = object.__new__(cls)
-
-        self._days = d
-        self._seconds = s
-        self._microseconds = us
-        if abs(d) > 999999999:
-            raise OverflowError("timedelta # of days is too large: %d" % d)
-
-        return self
-
-    def __repr__(self):
-        if self._microseconds:
-            return "%s(%d, %d, %d)" % (
-                "datetime." + self.__class__.__name__,
-                self._days,
-                self._seconds,
-                self._microseconds,
-            )
-        if self._seconds:
-            return "%s(%d, %d)" % (
-                "datetime." + self.__class__.__name__,
-                self._days,
-                self._seconds,
-            )
-        return "%s(%d)" % ("datetime." + self.__class__.__name__, self._days)
-
-    def __str__(self):
-        mm, ss = divmod(self._seconds, 60)
-        hh, mm = divmod(mm, 60)
-        s = "%d:%02d:%02d" % (hh, mm, ss)
-        if self._days:
-
-            def plural(n):
-                return n, abs(n) != 1 and "s" or ""
-
-            s = ("%d day%s, " % plural(self._days)) + s
-        if self._microseconds:
-            s = s + ".%06d" % self._microseconds
-        return s
-
-    def total_seconds(self):
-        """Total seconds in the duration."""
-        return ((self.days * 86400 + self.seconds) * 10**6 + self.microseconds) / 10**6
-
-    # Read-only field accessors
-    @property
-    def days(self):
-        """days"""
-        return self._days
-
-    @property
-    def seconds(self):
-        """seconds"""
-        return self._seconds
-
-    @property
-    def microseconds(self):
-        """microseconds"""
-        return self._microseconds
-
-    def __add__(self, other):
-        if isinstance(other, timedelta):
-            # for CPython compatibility, we cannot use
-            # our __class__ here, but need a real timedelta
-            return timedelta(
-                self._days + other._days,
-                self._seconds + other._seconds,
-                self._microseconds + other._microseconds,
-            )
-        return NotImplemented
-
-    __radd__ = __add__
-
-    def __sub__(self, other):
-        if isinstance(other, timedelta):
-            # for CPython compatibility, we cannot use
-            # our __class__ here, but need a real timedelta
-            return timedelta(
-                self._days - other._days,
-                self._seconds - other._seconds,
-                self._microseconds - other._microseconds,
-            )
-        return NotImplemented
-
-    def __rsub__(self, other):
-        if isinstance(other, timedelta):
-            return -self + other
-        return NotImplemented
-
-    def __neg__(self):
-        # for CPython compatibility, we cannot use
-        # our __class__ here, but need a real timedelta
-        return timedelta(-self._days, -self._seconds, -self._microseconds)
-
-    def __pos__(self):
-        return self
-
-    def __abs__(self):
-        if self._days < 0:
-            return -self
-        else:
-            return self
-
-    def __mul__(self, other):
-        if isinstance(other, int):
-            # for CPython compatibility, we cannot use
-            # our __class__ here, but need a real timedelta
-            return timedelta(self._days * other, self._seconds * other, self._microseconds * other)
-        if isinstance(other, float):
-            # a, b = other.as_integer_ratio()
-            # return self * a / b
-            usec = self._to_microseconds()
-            return timedelta(0, 0, round(usec * other))
-        return NotImplemented
-
-    __rmul__ = __mul__
-
-    def _to_microseconds(self):
-        return (self._days * (24 * 3600) + self._seconds) * 1000000 + self._microseconds
-
-    def __floordiv__(self, other):
-        if not isinstance(other, (int, timedelta)):
-            return NotImplemented
-        usec = self._to_microseconds()
-        if isinstance(other, timedelta):
-            return usec // other._to_microseconds()
-        if isinstance(other, int):
-            return timedelta(0, 0, usec // other)
-
-    def __truediv__(self, other):
-        if not isinstance(other, (int, float, timedelta)):
-            return NotImplemented
-        usec = self._to_microseconds()
-        if isinstance(other, timedelta):
-            return usec / other._to_microseconds()
-        if isinstance(other, int):
-            return timedelta(0, 0, usec / other)
-        if isinstance(other, float):
-            #            a, b = other.as_integer_ratio()
-            #            return timedelta(0, 0, b * usec / a)
-            return timedelta(0, 0, round(usec / other))
-
-    def __mod__(self, other):
-        if isinstance(other, timedelta):
-            r = self._to_microseconds() % other._to_microseconds()
-            return timedelta(0, 0, r)
-        return NotImplemented
-
-    def __divmod__(self, other):
-        if isinstance(other, timedelta):
-            q, r = divmod(self._to_microseconds(), other._to_microseconds())
-            return q, timedelta(0, 0, r)
-        return NotImplemented
-
-    # Comparisons of timedelta objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) == 0
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) != 0
-        else:
-            return True
-
-    def __le__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) <= 0
-        else:
-            _cmperror(self, other)
-
-    def __lt__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) < 0
-        else:
-            _cmperror(self, other)
-
-    def __ge__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) >= 0
-        else:
-            _cmperror(self, other)
-
-    def __gt__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) > 0
-        else:
-            _cmperror(self, other)
-
-    def _cmp(self, other):
-        assert isinstance(other, timedelta)
-        return _cmp(self._getstate(), other._getstate())
-
-    def __hash__(self):
-        return hash(self._getstate())
-
-    def __bool__(self):
-        return self._days != 0 or self._seconds != 0 or self._microseconds != 0
-
-    # Pickle support.
-
-    def _getstate(self):
-        return (self._days, self._seconds, self._microseconds)
-
-    def __reduce__(self):
-        return (self.__class__, self._getstate())
-
-
-timedelta.min = timedelta(-999999999)
-timedelta.max = timedelta(days=999999999, hours=23, minutes=59, seconds=59, microseconds=999999)
-timedelta.resolution = timedelta(microseconds=1)
-
-
-class date:
-    """Concrete date type.
-
-    Constructors:
-
-    __new__()
-    fromtimestamp()
-    today()
-    fromordinal()
-
-    Operators:
-
-    __repr__, __str__
-    __cmp__, __hash__
-    __add__, __radd__, __sub__ (add/radd only with timedelta arg)
-
-    Methods:
-
-    timetuple()
-    toordinal()
-    weekday()
-    isoweekday(), isocalendar(), isoformat()
-    ctime()
-    strftime()
-
-    Properties (readonly):
-    year, month, day
-    """
-
-    __slots__ = "_year", "_month", "_day"
-
-    def __new__(cls, year, month=None, day=None):
-        """Constructor.
-
-        Arguments:
-
-        year, month, day (required, base 1)
-        """
-        if (
-            isinstance(year, bytes) and len(year) == 4 and 1 <= year[2] <= 12 and month is None
-        ):  # Month is sane
-            # Pickle support
-            self = object.__new__(cls)
-            self.__setstate(year)
-            return self
-        _check_date_fields(year, month, day)
-        self = object.__new__(cls)
-        self._year = year
-        self._month = month
-        self._day = day
-        return self
-
-    # Additional constructors
-
-    @classmethod
-    def fromtimestamp(cls, t):
-        "Construct a date from a POSIX timestamp (like time.time())."
-        y, m, d, hh, mm, ss, weekday, jday, dst = _time.localtime(t)
-        return cls(y, m, d)
-
-    @classmethod
-    def today(cls):
-        "Construct a date from time.time()."
-        t = _time.time()
-        return cls.fromtimestamp(t)
-
-    @classmethod
-    def fromordinal(cls, n):
-        """Contruct a date from a proleptic Gregorian ordinal.
-
-        January 1 of year 1 is day 1.  Only the year, month and day are
-        non-zero in the result.
-        """
-        y, m, d = _ord2ymd(n)
-        return cls(y, m, d)
-
-    # Conversions to string
-
-    def __repr__(self):
-        """Convert to formal string, for repr().
-
-        >>> dt = datetime(2010, 1, 1)
-        >>> repr(dt)
-        'datetime.datetime(2010, 1, 1, 0, 0)'
-
-        >>> dt = datetime(2010, 1, 1, tzinfo=timezone.utc)
-        >>> repr(dt)
-        'datetime.datetime(2010, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)'
-        """
-        return "%s(%d, %d, %d)" % (
-            "datetime." + self.__class__.__name__,
-            self._year,
-            self._month,
-            self._day,
-        )
-
-    # XXX These shouldn't depend on time.localtime(), because that
-    # clips the usable dates to [1970 .. 2038).  At least ctime() is
-    # easily done without using strftime() -- that's better too because
-    # strftime("%c", ...) is locale specific.
-
-    def ctime(self):
-        "Return ctime() style string."
-        weekday = self.toordinal() % 7 or 7
-        return "%s %s %2d 00:00:00 %04d" % (
-            _DAYNAMES[weekday],
-            _MONTHNAMES[self._month],
-            self._day,
-            self._year,
-        )
-
-    def strftime(self, fmt):
-        "Format using strftime()."
-        return _wrap_strftime(self, fmt, self.timetuple())
-
-    def __format__(self, fmt):
-        if len(fmt) != 0:
-            return self.strftime(fmt)
-        return str(self)
-
-    def isoformat(self):
-        """Return the date formatted according to ISO.
-
-        This is 'YYYY-MM-DD'.
-
-        References:
-        - http://www.w3.org/TR/NOTE-datetime
-        - http://www.cl.cam.ac.uk/~mgk25/iso-time.html
-        """
-        return "%04d-%02d-%02d" % (self._year, self._month, self._day)
-
-    __str__ = isoformat
-
-    # Read-only field accessors
-    @property
-    def year(self):
-        """year (1-9999)"""
-        return self._year
-
-    @property
-    def month(self):
-        """month (1-12)"""
-        return self._month
-
-    @property
-    def day(self):
-        """day (1-31)"""
-        return self._day
-
-    # Standard conversions, __cmp__, __hash__ (and helpers)
-
-    def timetuple(self):
-        "Return local time tuple compatible with time.localtime()."
-        return _build_struct_time(self._year, self._month, self._day, 0, 0, 0, -1)
-
-    def toordinal(self):
-        """Return proleptic Gregorian ordinal for the year, month and day.
-
-        January 1 of year 1 is day 1.  Only the year, month and day values
-        contribute to the result.
-        """
-        return _ymd2ord(self._year, self._month, self._day)
-
-    def replace(self, year=None, month=None, day=None):
-        """Return a new date with new values for the specified fields."""
-        if year is None:
-            year = self._year
-        if month is None:
-            month = self._month
-        if day is None:
-            day = self._day
-        _check_date_fields(year, month, day)
-        return date(year, month, day)
-
-    # Comparisons of date objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) == 0
-        return NotImplemented
-
-    def __ne__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) != 0
-        return NotImplemented
-
-    def __le__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) <= 0
-        return NotImplemented
-
-    def __lt__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) < 0
-        return NotImplemented
-
-    def __ge__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) >= 0
-        return NotImplemented
-
-    def __gt__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) > 0
-        return NotImplemented
-
-    def _cmp(self, other):
-        assert isinstance(other, date)
-        y, m, d = self._year, self._month, self._day
-        y2, m2, d2 = other._year, other._month, other._day
-        return _cmp((y, m, d), (y2, m2, d2))
-
-    def __hash__(self):
-        "Hash."
-        return hash(self._getstate())
-
-    # Computations
-
-    def __add__(self, other):
-        "Add a date to a timedelta."
-        if isinstance(other, timedelta):
-            o = self.toordinal() + other.days
-            if 0 < o <= _MAXORDINAL:
-                return date.fromordinal(o)
-            raise OverflowError("result out of range")
-        return NotImplemented
-
-    __radd__ = __add__
-
-    def __sub__(self, other):
-        """Subtract two dates, or a date and a timedelta."""
-        if isinstance(other, timedelta):
-            return self + timedelta(-other.days)
-        if isinstance(other, date):
-            days1 = self.toordinal()
-            days2 = other.toordinal()
-            return timedelta(days1 - days2)
-        return NotImplemented
-
-    def weekday(self):
-        "Return day of the week, where Monday == 0 ... Sunday == 6."
-        return (self.toordinal() + 6) % 7
-
-    # Day-of-the-week and week-of-the-year, according to ISO
-
-    def isoweekday(self):
-        "Return day of the week, where Monday == 1 ... Sunday == 7."
-        # 1-Jan-0001 is a Monday
-        return self.toordinal() % 7 or 7
-
-    def isocalendar(self):
-        """Return a 3-tuple containing ISO year, week number, and weekday.
-
-        The first ISO week of the year is the (Mon-Sun) week
-        containing the year's first Thursday; everything else derives
-        from that.
-
-        The first week is 1; Monday is 1 ... Sunday is 7.
-
-        ISO calendar algorithm taken from
-        http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
-        """
-        year = self._year
-        week1monday = _isoweek1monday(year)
-        today = _ymd2ord(self._year, self._month, self._day)
-        # Internally, week and day have origin 0
-        week, day = divmod(today - week1monday, 7)
-        if week < 0:
-            year -= 1
-            week1monday = _isoweek1monday(year)
-            week, day = divmod(today - week1monday, 7)
-        elif week >= 52:
-            if today >= _isoweek1monday(year + 1):
-                year += 1
-                week = 0
-        return year, week + 1, day + 1
-
-    # Pickle support.
-
-    def _getstate(self):
-        yhi, ylo = divmod(self._year, 256)
-        return (bytes([yhi, ylo, self._month, self._day]),)
-
-    def __setstate(self, string):
-        if len(string) != 4 or not (1 <= string[2] <= 12):
-            raise TypeError("not enough arguments")
-        yhi, ylo, self._month, self._day = string
-        self._year = yhi * 256 + ylo
-
-    def __reduce__(self):
-        return (self.__class__, self._getstate())
-
-
-_date_class = date  # so functions w/ args named "date" can get at the class
-
-date.min = date(1, 1, 1)
-date.max = date(9999, 12, 31)
-date.resolution = timedelta(days=1)
-
-
-class tzinfo:
-    """Abstract base class for time zone info classes.
-
-    Subclasses must override the name(), utcoffset() and dst() methods.
-    """
-
-    __slots__ = ()
-
-    def __new__(self, *args, **kwargs):
-        """Constructor."""
-        return object.__new__(self)
-
-    def tzname(self, dt):
-        "datetime -> string name of time zone."
-        raise NotImplementedError("tzinfo subclass must override tzname()")
-
-    def utcoffset(self, dt):
-        "datetime -> minutes east of UTC (negative for west of UTC)"
-        raise NotImplementedError("tzinfo subclass must override utcoffset()")
-
-    def dst(self, dt):
-        """datetime -> DST offset in minutes east of UTC.
-
-        Return 0 if DST not in effect.  utcoffset() must include the DST
-        offset.
-        """
-        raise NotImplementedError("tzinfo subclass must override dst()")
-
-    def fromutc(self, dt):
-        "datetime in UTC -> datetime in local time."
-
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        dtoff = dt.utcoffset()
-        if dtoff is None:
-            raise ValueError("fromutc() requires a non-None utcoffset() " "result")
-
-        # See the long comment block at the end of this file for an
-        # explanation of this algorithm.
-        dtdst = dt.dst()
-        if dtdst is None:
-            raise ValueError("fromutc() requires a non-None dst() result")
-        delta = dtoff - dtdst
-        if delta:
-            dt += delta
-            dtdst = dt.dst()
-            if dtdst is None:
-                raise ValueError("fromutc(): dt.dst gave inconsistent " "results; cannot convert")
-        return dt + dtdst
-
-    # Pickle support.
-
-    def __reduce__(self):
-        getinitargs = getattr(self, "__getinitargs__", None)
-        if getinitargs:
-            args = getinitargs()
-        else:
-            args = ()
-        getstate = getattr(self, "__getstate__", None)
-        if getstate:
-            state = getstate()
-        else:
-            state = getattr(self, "__dict__", None) or None
-        if state is None:
-            return (self.__class__, args)
-        else:
-            return (self.__class__, args, state)
-
-
-_tzinfo_class = tzinfo
-
-
-class time:
-    """Time with time zone.
-
-    Constructors:
-
-    __new__()
-
-    Operators:
-
-    __repr__, __str__
-    __cmp__, __hash__
-
-    Methods:
-
-    strftime()
-    isoformat()
-    utcoffset()
-    tzname()
-    dst()
-
-    Properties (readonly):
-    hour, minute, second, microsecond, tzinfo
-    """
-
-    def __new__(cls, hour=0, minute=0, second=0, microsecond=0, tzinfo=None):
-        """Constructor.
-
-        Arguments:
-
-        hour, minute (required)
-        second, microsecond (default to zero)
-        tzinfo (default to None)
-        """
-        self = object.__new__(cls)
-        if isinstance(hour, bytes) and len(hour) == 6:
-            # Pickle support
-            self.__setstate(hour, minute or None)
-            return self
-        _check_tzinfo_arg(tzinfo)
-        _check_time_fields(hour, minute, second, microsecond)
-        self._hour = hour
-        self._minute = minute
-        self._second = second
-        self._microsecond = microsecond
-        self._tzinfo = tzinfo
-        return self
-
-    # Read-only field accessors
-    @property
-    def hour(self):
-        """hour (0-23)"""
-        return self._hour
-
-    @property
-    def minute(self):
-        """minute (0-59)"""
-        return self._minute
-
-    @property
-    def second(self):
-        """second (0-59)"""
-        return self._second
-
-    @property
-    def microsecond(self):
-        """microsecond (0-999999)"""
-        return self._microsecond
-
-    @property
-    def tzinfo(self):
-        """timezone info object"""
-        return self._tzinfo
-
-    # Standard conversions, __hash__ (and helpers)
-
-    # Comparisons of time objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other, allow_mixed=True) == 0
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other, allow_mixed=True) != 0
-        else:
-            return True
-
-    def __le__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) <= 0
-        else:
-            _cmperror(self, other)
-
-    def __lt__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) < 0
-        else:
-            _cmperror(self, other)
-
-    def __ge__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) >= 0
-        else:
-            _cmperror(self, other)
-
-    def __gt__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) > 0
-        else:
-            _cmperror(self, other)
-
-    def _cmp(self, other, allow_mixed=False):
-        assert isinstance(other, time)
-        mytz = self._tzinfo
-        ottz = other._tzinfo
-        myoff = otoff = None
-
-        if mytz is ottz:
-            base_compare = True
-        else:
-            myoff = self.utcoffset()
-            otoff = other.utcoffset()
-            base_compare = myoff == otoff
-
-        if base_compare:
-            return _cmp(
-                (self._hour, self._minute, self._second, self._microsecond),
-                (other._hour, other._minute, other._second, other._microsecond),
-            )
-        if myoff is None or otoff is None:
-            if allow_mixed:
-                return 2  # arbitrary non-zero value
-            else:
-                raise TypeError("cannot compare naive and aware times")
-        myhhmm = self._hour * 60 + self._minute - myoff // timedelta(minutes=1)
-        othhmm = other._hour * 60 + other._minute - otoff // timedelta(minutes=1)
-        return _cmp(
-            (myhhmm, self._second, self._microsecond), (othhmm, other._second, other._microsecond)
-        )
-
-    def __hash__(self):
-        """Hash."""
-        tzoff = self.utcoffset()
-        if not tzoff:  # zero or None
-            return hash(self._getstate()[0])
-        h, m = divmod(timedelta(hours=self.hour, minutes=self.minute) - tzoff, timedelta(hours=1))
-        assert not m % timedelta(minutes=1), "whole minute"
-        m //= timedelta(minutes=1)
-        if 0 <= h < 24:
-            return hash(time(h, m, self.second, self.microsecond))
-        return hash((h, m, self.second, self.microsecond))
-
-    # Conversion to string
-
-    def _tzstr(self, sep=":"):
-        """Return formatted timezone offset (+xx:xx) or None."""
-        off = self.utcoffset()
-        if off is not None:
-            if off.days < 0:
-                sign = "-"
-                off = -off
-            else:
-                sign = "+"
-            hh, mm = divmod(off, timedelta(hours=1))
-            assert not mm % timedelta(minutes=1), "whole minute"
-            mm //= timedelta(minutes=1)
-            assert 0 <= hh < 24
-            off = "%s%02d%s%02d" % (sign, hh, sep, mm)
-        return off
-
-    def __repr__(self):
-        """Convert to formal string, for repr()."""
-        if self._microsecond != 0:
-            s = ", %d, %d" % (self._second, self._microsecond)
-        elif self._second != 0:
-            s = ", %d" % self._second
-        else:
-            s = ""
-        s = "%s(%d, %d%s)" % ("datetime." + self.__class__.__name__, self._hour, self._minute, s)
-        if self._tzinfo is not None:
-            assert s[-1:] == ")"
-            s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")"
-        return s
-
-    def isoformat(self):
-        """Return the time formatted according to ISO.
-
-        This is 'HH:MM:SS.mmmmmm+zz:zz', or 'HH:MM:SS+zz:zz' if
-        self.microsecond == 0.
-        """
-        s = _format_time(self._hour, self._minute, self._second, self._microsecond)
-        tz = self._tzstr()
-        if tz:
-            s += tz
-        return s
-
-    __str__ = isoformat
-
-    def strftime(self, fmt):
-        """Format using strftime().  The date part of the timestamp passed
-        to underlying strftime should not be used.
-        """
-        # The year must be >= 1000 else Python's strftime implementation
-        # can raise a bogus exception.
-        timetuple = (1900, 1, 1, self._hour, self._minute, self._second, 0, 1, -1)
-        return _wrap_strftime(self, fmt, timetuple)
-
-    def __format__(self, fmt):
-        if len(fmt) != 0:
-            return self.strftime(fmt)
-        return str(self)
-
-    # Timezone functions
-
-    def utcoffset(self):
-        """Return the timezone offset in minutes east of UTC (negative west of
-        UTC)."""
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.utcoffset(None)
-        _check_utc_offset("utcoffset", offset)
-        return offset
-
-    def tzname(self):
-        """Return the timezone name.
-
-        Note that the name is 100% informational -- there's no requirement that
-        it mean anything in particular. For example, "GMT", "UTC", "-500",
-        "-5:00", "EDT", "US/Eastern", "America/New York" are all valid replies.
-        """
-        if self._tzinfo is None:
-            return None
-        name = self._tzinfo.tzname(None)
-        _check_tzname(name)
-        return name
-
-    def dst(self):
-        """Return 0 if DST is not in effect, or the DST offset (in minutes
-        eastward) if DST is in effect.
-
-        This is purely informational; the DST offset has already been added to
-        the UTC offset returned by utcoffset() if applicable, so there's no
-        need to consult dst() unless you're interested in displaying the DST
-        info.
-        """
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.dst(None)
-        _check_utc_offset("dst", offset)
-        return offset
-
-    def replace(self, hour=None, minute=None, second=None, microsecond=None, tzinfo=True):
-        """Return a new time with new values for the specified fields."""
-        if hour is None:
-            hour = self.hour
-        if minute is None:
-            minute = self.minute
-        if second is None:
-            second = self.second
-        if microsecond is None:
-            microsecond = self.microsecond
-        if tzinfo is True:
-            tzinfo = self.tzinfo
-        _check_time_fields(hour, minute, second, microsecond)
-        _check_tzinfo_arg(tzinfo)
-        return time(hour, minute, second, microsecond, tzinfo)
-
-    def __bool__(self):
-        if self.second or self.microsecond:
-            return True
-        offset = self.utcoffset() or timedelta(0)
-        return timedelta(hours=self.hour, minutes=self.minute) != offset
-
-    # Pickle support.
-
-    def _getstate(self):
-        us2, us3 = divmod(self._microsecond, 256)
-        us1, us2 = divmod(us2, 256)
-        basestate = bytes([self._hour, self._minute, self._second, us1, us2, us3])
-        if self._tzinfo is None:
-            return (basestate,)
-        else:
-            return (basestate, self._tzinfo)
-
-    def __setstate(self, string, tzinfo):
-        if len(string) != 6 or string[0] >= 24:
-            raise TypeError("an integer is required")
-        (self._hour, self._minute, self._second, us1, us2, us3) = string
-        self._microsecond = (((us1 << 8) | us2) << 8) | us3
-        if tzinfo is None or isinstance(tzinfo, _tzinfo_class):
-            self._tzinfo = tzinfo
-        else:
-            raise TypeError("bad tzinfo state arg %r" % tzinfo)
-
-    def __reduce__(self):
-        return (time, self._getstate())
-
-
-_time_class = time  # so functions w/ args named "time" can get at the class
-
-time.min = time(0, 0, 0)
-time.max = time(23, 59, 59, 999999)
-time.resolution = timedelta(microseconds=1)
-
-
-class datetime(date):
-    """datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])
-
-    The year, month and day arguments are required. tzinfo may be None, or an
-    instance of a tzinfo subclass. The remaining arguments may be ints.
-    """
-
-    __slots__ = date.__slots__ + ("_hour", "_minute", "_second", "_microsecond", "_tzinfo")
-
-    def __new__(
-        cls, year, month=None, day=None, hour=0, minute=0, second=0, microsecond=0, tzinfo=None
-    ):
-        if isinstance(year, bytes) and len(year) == 10:
-            # Pickle support
-            self = date.__new__(cls, year[:4])
-            self.__setstate(year, month)
-            return self
-        _check_tzinfo_arg(tzinfo)
-        _check_time_fields(hour, minute, second, microsecond)
-        self = date.__new__(cls, year, month, day)
-        self._hour = hour
-        self._minute = minute
-        self._second = second
-        self._microsecond = microsecond
-        self._tzinfo = tzinfo
-        return self
-
-    # Read-only field accessors
-    @property
-    def hour(self):
-        """hour (0-23)"""
-        return self._hour
-
-    @property
-    def minute(self):
-        """minute (0-59)"""
-        return self._minute
-
-    @property
-    def second(self):
-        """second (0-59)"""
-        return self._second
-
-    @property
-    def microsecond(self):
-        """microsecond (0-999999)"""
-        return self._microsecond
-
-    @property
-    def tzinfo(self):
-        """timezone info object"""
-        return self._tzinfo
-
-    @classmethod
-    def fromtimestamp(cls, t, tz=None):
-        """Construct a datetime from a POSIX timestamp (like time.time()).
-
-        A timezone info object may be passed in as well.
-        """
-
-        _check_tzinfo_arg(tz)
-
-        converter = _time.localtime if tz is None else _time.gmtime
-
-        t, frac = divmod(t, 1.0)
-        us = int(frac * 1e6)
-
-        # If timestamp is less than one microsecond smaller than a
-        # full second, us can be rounded up to 1000000.  In this case,
-        # roll over to seconds, otherwise, ValueError is raised
-        # by the constructor.
-        if us == 1000000:
-            t += 1
-            us = 0
-        y, m, d, hh, mm, ss, weekday, jday, dst = converter(t)
-        ss = min(ss, 59)  # clamp out leap seconds if the platform has them
-        result = cls(y, m, d, hh, mm, ss, us, tz)
-        if tz is not None:
-            result = tz.fromutc(result)
-        return result
-
-    @classmethod
-    def utcfromtimestamp(cls, t):
-        "Construct a UTC datetime from a POSIX timestamp (like time.time())."
-        t, frac = divmod(t, 1.0)
-        us = int(frac * 1e6)
-
-        # If timestamp is less than one microsecond smaller than a
-        # full second, us can be rounded up to 1000000.  In this case,
-        # roll over to seconds, otherwise, ValueError is raised
-        # by the constructor.
-        if us == 1000000:
-            t += 1
-            us = 0
-        y, m, d, hh, mm, ss, weekday, jday, dst = _time.gmtime(t)
-        ss = min(ss, 59)  # clamp out leap seconds if the platform has them
-        return cls(y, m, d, hh, mm, ss, us)
-
-    # XXX This is supposed to do better than we *can* do by using time.time(),
-    # XXX if the platform supports a more accurate way.  The C implementation
-    # XXX uses gettimeofday on platforms that have it, but that isn't
-    # XXX available from Python.  So now() may return different results
-    # XXX across the implementations.
-    @classmethod
-    def now(cls, tz=None):
-        "Construct a datetime from time.time() and optional time zone info."
-        t = _time.time()
-        return cls.fromtimestamp(t, tz)
-
-    @classmethod
-    def utcnow(cls):
-        "Construct a UTC datetime from time.time()."
-        t = _time.time()
-        return cls.utcfromtimestamp(t)
-
-    @classmethod
-    def combine(cls, date, time):
-        "Construct a datetime from a given date and a given time."
-        if not isinstance(date, _date_class):
-            raise TypeError("date argument must be a date instance")
-        if not isinstance(time, _time_class):
-            raise TypeError("time argument must be a time instance")
-        return cls(
-            date.year,
-            date.month,
-            date.day,
-            time.hour,
-            time.minute,
-            time.second,
-            time.microsecond,
-            time.tzinfo,
-        )
-
-    def timetuple(self):
-        "Return local time tuple compatible with time.localtime()."
-        dst = self.dst()
-        if dst is None:
-            dst = -1
-        elif dst:
-            dst = 1
-        else:
-            dst = 0
-        return _build_struct_time(
-            self.year, self.month, self.day, self.hour, self.minute, self.second, dst
-        )
-
-    def timestamp(self):
-        "Return POSIX timestamp as float"
-        if self._tzinfo is None:
-            return (
-                _time.mktime(
-                    (
-                        self.year,
-                        self.month,
-                        self.day,
-                        self.hour,
-                        self.minute,
-                        self.second,
-                        -1,
-                        -1,
-                        -1,
-                    )
-                )
-                + self.microsecond / 1e6
-            )
-        else:
-            return (self - _EPOCH).total_seconds()
-
-    def utctimetuple(self):
-        "Return UTC time tuple compatible with time.gmtime()."
-        offset = self.utcoffset()
-        if offset:
-            self -= offset
-        y, m, d = self.year, self.month, self.day
-        hh, mm, ss = self.hour, self.minute, self.second
-        return _build_struct_time(y, m, d, hh, mm, ss, 0)
-
-    def date(self):
-        "Return the date part."
-        return date(self._year, self._month, self._day)
-
-    def time(self):
-        "Return the time part, with tzinfo None."
-        return time(self.hour, self.minute, self.second, self.microsecond)
-
-    def timetz(self):
-        "Return the time part, with same tzinfo."
-        return time(self.hour, self.minute, self.second, self.microsecond, self._tzinfo)
-
-    def replace(
-        self,
-        year=None,
-        month=None,
-        day=None,
-        hour=None,
-        minute=None,
-        second=None,
-        microsecond=None,
-        tzinfo=True,
-    ):
-        """Return a new datetime with new values for the specified fields."""
-        if year is None:
-            year = self.year
-        if month is None:
-            month = self.month
-        if day is None:
-            day = self.day
-        if hour is None:
-            hour = self.hour
-        if minute is None:
-            minute = self.minute
-        if second is None:
-            second = self.second
-        if microsecond is None:
-            microsecond = self.microsecond
-        if tzinfo is True:
-            tzinfo = self.tzinfo
-        _check_date_fields(year, month, day)
-        _check_time_fields(hour, minute, second, microsecond)
-        _check_tzinfo_arg(tzinfo)
-        return datetime(year, month, day, hour, minute, second, microsecond, tzinfo)
-
-    def astimezone(self, tz=None):
-        if tz is None:
-            if self.tzinfo is None:
-                raise ValueError("astimezone() requires an aware datetime")
-            ts = (self - _EPOCH) // timedelta(seconds=1)
-            localtm = _time.localtime(ts)
-            local = datetime(*localtm[:6])
-            try:
-                # Extract TZ data if available
-                gmtoff = localtm.tm_gmtoff
-                zone = localtm.tm_zone
-            except AttributeError:
-                # Compute UTC offset and compare with the value implied
-                # by tm_isdst.  If the values match, use the zone name
-                # implied by tm_isdst.
-                delta = local - datetime(*_time.gmtime(ts)[:6])
-                dst = _time.daylight and localtm.tm_isdst > 0
-                gmtoff = -(_time.altzone if dst else _time.timezone)
-                if delta == timedelta(seconds=gmtoff):
-                    tz = timezone(delta, _time.tzname[dst])
-                else:
-                    tz = timezone(delta)
-            else:
-                tz = timezone(timedelta(seconds=gmtoff), zone)
-
-        elif not isinstance(tz, tzinfo):
-            raise TypeError("tz argument must be an instance of tzinfo")
-
-        mytz = self.tzinfo
-        if mytz is None:
-            raise ValueError("astimezone() requires an aware datetime")
-
-        if tz is mytz:
-            return self
-
-        # Convert self to UTC, and attach the new time zone object.
-        myoffset = self.utcoffset()
-        if myoffset is None:
-            raise ValueError("astimezone() requires an aware datetime")
-        utc = (self - myoffset).replace(tzinfo=tz)
-
-        # Convert from UTC to tz's local time.
-        return tz.fromutc(utc)
-
-    # Ways to produce a string.
-
-    def ctime(self):
-        "Return ctime() style string."
-        weekday = self.toordinal() % 7 or 7
-        return "%s %s %2d %02d:%02d:%02d %04d" % (
-            _DAYNAMES[weekday],
-            _MONTHNAMES[self._month],
-            self._day,
-            self._hour,
-            self._minute,
-            self._second,
-            self._year,
-        )
-
-    def isoformat(self, sep="T"):
-        """Return the time formatted according to ISO.
-
-        This is 'YYYY-MM-DD HH:MM:SS.mmmmmm', or 'YYYY-MM-DD HH:MM:SS' if
-        self.microsecond == 0.
-
-        If self.tzinfo is not None, the UTC offset is also attached, giving
-        'YYYY-MM-DD HH:MM:SS.mmmmmm+HH:MM' or 'YYYY-MM-DD HH:MM:SS+HH:MM'.
-
-        Optional argument sep specifies the separator between date and
-        time, default 'T'.
-        """
-        s = "%04d-%02d-%02d%s" % (self._year, self._month, self._day, sep) + _format_time(
-            self._hour, self._minute, self._second, self._microsecond
-        )
-        off = self.utcoffset()
-        if off is not None:
-            if off.days < 0:
-                sign = "-"
-                off = -off
-            else:
-                sign = "+"
-            hh, mm = divmod(off, timedelta(hours=1))
-            assert not mm % timedelta(minutes=1), "whole minute"
-            mm //= timedelta(minutes=1)
-            s += "%s%02d:%02d" % (sign, hh, mm)
-        return s
-
-    def __repr__(self):
-        """Convert to formal string, for repr()."""
-        L = [
-            self._year,
-            self._month,
-            self._day,  # These are never zero
-            self._hour,
-            self._minute,
-            self._second,
-            self._microsecond,
-        ]
-        if L[-1] == 0:
-            del L[-1]
-        if L[-1] == 0:
-            del L[-1]
-        s = ", ".join(map(str, L))
-        s = "%s(%s)" % ("datetime." + self.__class__.__name__, s)
-        if self._tzinfo is not None:
-            assert s[-1:] == ")"
-            s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")"
-        return s
-
-    def __str__(self):
-        "Convert to string, for str()."
-        return self.isoformat(sep=" ")
-
-    @classmethod
-    def strptime(cls, date_string, format):
-        "string, format -> new datetime parsed from a string (like time.strptime())."
-        import _strptime
-
-        return _strptime._strptime_datetime(cls, date_string, format)
-
-    def utcoffset(self):
-        """Return the timezone offset in minutes east of UTC (negative west of
-        UTC)."""
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.utcoffset(self)
-        _check_utc_offset("utcoffset", offset)
-        return offset
-
-    def tzname(self):
-        """Return the timezone name.
-
-        Note that the name is 100% informational -- there's no requirement that
-        it mean anything in particular. For example, "GMT", "UTC", "-500",
-        "-5:00", "EDT", "US/Eastern", "America/New York" are all valid replies.
-        """
-        name = _call_tzinfo_method(self._tzinfo, "tzname", self)
-        _check_tzname(name)
-        return name
-
-    def dst(self):
-        """Return 0 if DST is not in effect, or the DST offset (in minutes
-        eastward) if DST is in effect.
-
-        This is purely informational; the DST offset has already been added to
-        the UTC offset returned by utcoffset() if applicable, so there's no
-        need to consult dst() unless you're interested in displaying the DST
-        info.
-        """
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.dst(self)
-        _check_utc_offset("dst", offset)
-        return offset
-
-    # Comparisons of datetime objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other, allow_mixed=True) == 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other, allow_mixed=True) != 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            return True
-
-    def __le__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) <= 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def __lt__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) < 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def __ge__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) >= 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def __gt__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) > 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def _cmp(self, other, allow_mixed=False):
-        assert isinstance(other, datetime)
-        mytz = self._tzinfo
-        ottz = other._tzinfo
-        myoff = otoff = None
-
-        if mytz is ottz:
-            base_compare = True
-        else:
-            myoff = self.utcoffset()
-            otoff = other.utcoffset()
-            base_compare = myoff == otoff
-
-        if base_compare:
-            return _cmp(
-                (
-                    self._year,
-                    self._month,
-                    self._day,
-                    self._hour,
-                    self._minute,
-                    self._second,
-                    self._microsecond,
-                ),
-                (
-                    other._year,
-                    other._month,
-                    other._day,
-                    other._hour,
-                    other._minute,
-                    other._second,
-                    other._microsecond,
-                ),
-            )
-        if myoff is None or otoff is None:
-            if allow_mixed:
-                return 2  # arbitrary non-zero value
-            else:
-                raise TypeError("cannot compare naive and aware datetimes")
-        # XXX What follows could be done more efficiently...
-        diff = self - other  # this will take offsets into account
-        if diff.days < 0:
-            return -1
-        return diff and 1 or 0
-
-    def __add__(self, other):
-        "Add a datetime and a timedelta."
-        if not isinstance(other, timedelta):
-            return NotImplemented
-        delta = timedelta(
-            self.toordinal(),
-            hours=self._hour,
-            minutes=self._minute,
-            seconds=self._second,
-            microseconds=self._microsecond,
-        )
-        delta += other
-        hour, rem = divmod(delta.seconds, 3600)
-        minute, second = divmod(rem, 60)
-        if 0 < delta.days <= _MAXORDINAL:
-            return datetime.combine(
-                date.fromordinal(delta.days),
-                time(hour, minute, second, delta.microseconds, tzinfo=self._tzinfo),
-            )
-        raise OverflowError("result out of range")
-
-    __radd__ = __add__
-
-    def __sub__(self, other):
-        "Subtract two datetimes, or a datetime and a timedelta."
-        if not isinstance(other, datetime):
-            if isinstance(other, timedelta):
-                return self + -other
-            return NotImplemented
-
-        days1 = self.toordinal()
-        days2 = other.toordinal()
-        secs1 = self._second + self._minute * 60 + self._hour * 3600
-        secs2 = other._second + other._minute * 60 + other._hour * 3600
-        base = timedelta(days1 - days2, secs1 - secs2, self._microsecond - other._microsecond)
-        if self._tzinfo is other._tzinfo:
-            return base
-        myoff = self.utcoffset()
-        otoff = other.utcoffset()
-        if myoff == otoff:
-            return base
-        if myoff is None or otoff is None:
-            raise TypeError("cannot mix naive and timezone-aware time")
-        return base + otoff - myoff
-
-    def __hash__(self):
-        tzoff = self.utcoffset()
-        if tzoff is None:
-            return hash(self._getstate()[0])
-        days = _ymd2ord(self.year, self.month, self.day)
-        seconds = self.hour * 3600 + self.minute * 60 + self.second
-        return hash(timedelta(days, seconds, self.microsecond) - tzoff)
-
-    # Pickle support.
-
-    def _getstate(self):
-        yhi, ylo = divmod(self._year, 256)
-        us2, us3 = divmod(self._microsecond, 256)
-        us1, us2 = divmod(us2, 256)
-        basestate = bytes(
-            [
-                yhi,
-                ylo,
-                self._month,
-                self._day,
-                self._hour,
-                self._minute,
-                self._second,
-                us1,
-                us2,
-                us3,
-            ]
-        )
-        if self._tzinfo is None:
-            return (basestate,)
-        else:
-            return (basestate, self._tzinfo)
-
-    def __setstate(self, string, tzinfo):
-        (
-            yhi,
-            ylo,
-            self._month,
-            self._day,
-            self._hour,
-            self._minute,
-            self._second,
-            us1,
-            us2,
-            us3,
-        ) = string
-        self._year = yhi * 256 + ylo
-        self._microsecond = (((us1 << 8) | us2) << 8) | us3
-        if tzinfo is None or isinstance(tzinfo, _tzinfo_class):
-            self._tzinfo = tzinfo
-        else:
-            raise TypeError("bad tzinfo state arg %r" % tzinfo)
-
-    def __reduce__(self):
-        return (self.__class__, self._getstate())
-
-
-datetime.min = datetime(1, 1, 1)
-datetime.max = datetime(9999, 12, 31, 23, 59, 59, 999999)
-datetime.resolution = timedelta(microseconds=1)
-
-
-def _isoweek1monday(year):
-    # Helper to calculate the day number of the Monday starting week 1
-    # XXX This could be done more efficiently
-    THURSDAY = 3
-    firstday = _ymd2ord(year, 1, 1)
-    firstweekday = (firstday + 6) % 7  # See weekday() above
-    week1monday = firstday - firstweekday
-    if firstweekday > THURSDAY:
-        week1monday += 7
-    return week1monday
-
-
-class timezone(tzinfo):
-    __slots__ = "_offset", "_name"
-
-    # Sentinel value to disallow None
-    _Omitted = object()
-
-    def __new__(cls, offset, name=_Omitted):
-        if not isinstance(offset, timedelta):
-            raise TypeError("offset must be a timedelta")
-        if name is cls._Omitted:
-            if not offset:
-                return cls.utc
-            name = None
-        elif not isinstance(name, str):
-            raise TypeError("name must be a string")
-        if not cls._minoffset <= offset <= cls._maxoffset:
-            raise ValueError(
-                "offset must be a timedelta"
-                " strictly between -timedelta(hours=24) and"
-                " timedelta(hours=24)."
-            )
-        if offset.microseconds != 0 or offset.seconds % 60 != 0:
-            raise ValueError(
-                "offset must be a timedelta" " representing a whole number of minutes"
-            )
-        return cls._create(offset, name)
-
-    @classmethod
-    def _create(cls, offset, name=None):
-        self = tzinfo.__new__(cls)
-        self._offset = offset
-        self._name = name
-        return self
-
-    def __getinitargs__(self):
-        """pickle support"""
-        if self._name is None:
-            return (self._offset,)
-        return (self._offset, self._name)
-
-    def __eq__(self, other):
-        if type(other) != timezone:
-            return False
-        return self._offset == other._offset
-
-    def __hash__(self):
-        return hash(self._offset)
-
-    def __repr__(self):
-        """Convert to formal string, for repr().
-
-        >>> tz = timezone.utc
-        >>> repr(tz)
-        'datetime.timezone.utc'
-        >>> tz = timezone(timedelta(hours=-5), 'EST')
-        >>> repr(tz)
-        "datetime.timezone(datetime.timedelta(-1, 68400), 'EST')"
-        """
-        if self is self.utc:
-            return "datetime.timezone.utc"
-        if self._name is None:
-            return "%s(%r)" % ("datetime." + self.__class__.__name__, self._offset)
-        return "%s(%r, %r)" % ("datetime." + self.__class__.__name__, self._offset, self._name)
-
-    def __str__(self):
-        return self.tzname(None)
-
-    def utcoffset(self, dt):
-        if isinstance(dt, datetime) or dt is None:
-            return self._offset
-        raise TypeError("utcoffset() argument must be a datetime instance" " or None")
-
-    def tzname(self, dt):
-        if isinstance(dt, datetime) or dt is None:
-            if self._name is None:
-                return self._name_from_offset(self._offset)
-            return self._name
-        raise TypeError("tzname() argument must be a datetime instance" " or None")
-
-    def dst(self, dt):
-        if isinstance(dt, datetime) or dt is None:
-            return None
-        raise TypeError("dst() argument must be a datetime instance" " or None")
-
-    def fromutc(self, dt):
-        if isinstance(dt, datetime):
-            if dt.tzinfo is not self:
-                raise ValueError("fromutc: dt.tzinfo " "is not self")
-            return dt + self._offset
-        raise TypeError("fromutc() argument must be a datetime instance" " or None")
-
-    _maxoffset = timedelta(hours=23, minutes=59)
-    _minoffset = -_maxoffset
-
-    @staticmethod
-    def _name_from_offset(delta):
-        if delta < timedelta(0):
-            sign = "-"
-            delta = -delta
-        else:
-            sign = "+"
-        hours, rest = divmod(delta, timedelta(hours=1))
-        minutes = rest // timedelta(minutes=1)
-        return "UTC{}{:02d}:{:02d}".format(sign, hours, minutes)
-
-
-timezone.utc = timezone._create(timedelta(0))
-timezone.min = timezone._create(timezone._minoffset)
-timezone.max = timezone._create(timezone._maxoffset)
-_EPOCH = datetime(1970, 1, 1, tzinfo=timezone.utc)
-"""
-Some time zone algebra.  For a datetime x, let
-    x.n = x stripped of its timezone -- its naive time.
-    x.o = x.utcoffset(), and assuming that doesn't raise an exception or
-          return None
-    x.d = x.dst(), and assuming that doesn't raise an exception or
-          return None
-    x.s = x's standard offset, x.o - x.d
-
-Now some derived rules, where k is a duration (timedelta).
-
-1. x.o = x.s + x.d
-   This follows from the definition of x.s.
-
-2. If x and y have the same tzinfo member, x.s = y.s.
-   This is actually a requirement, an assumption we need to make about
-   sane tzinfo classes.
-
-3. The naive UTC time corresponding to x is x.n - x.o.
-   This is again a requirement for a sane tzinfo class.
-
-4. (x+k).s = x.s
-   This follows from #2, and that datimetimetz+timedelta preserves tzinfo.
-
-5. (x+k).n = x.n + k
-   Again follows from how arithmetic is defined.
-
-Now we can explain tz.fromutc(x).  Let's assume it's an interesting case
-(meaning that the various tzinfo methods exist, and don't blow up or return
-None when called).
-
-The function wants to return a datetime y with timezone tz, equivalent to x.
-x is already in UTC.
-
-By #3, we want
-
-    y.n - y.o = x.n                             [1]
-
-The algorithm starts by attaching tz to x.n, and calling that y.  So
-x.n = y.n at the start.  Then it wants to add a duration k to y, so that [1]
-becomes true; in effect, we want to solve [2] for k:
-
-   (y+k).n - (y+k).o = x.n                      [2]
-
-By #1, this is the same as
-
-   (y+k).n - ((y+k).s + (y+k).d) = x.n          [3]
-
-By #5, (y+k).n = y.n + k, which equals x.n + k because x.n=y.n at the start.
-Substituting that into [3],
-
-   x.n + k - (y+k).s - (y+k).d = x.n; the x.n terms cancel, leaving
-   k - (y+k).s - (y+k).d = 0; rearranging,
-   k = (y+k).s - (y+k).d; by #4, (y+k).s == y.s, so
-   k = y.s - (y+k).d
-
-On the RHS, (y+k).d can't be computed directly, but y.s can be, and we
-approximate k by ignoring the (y+k).d term at first.  Note that k can't be
-very large, since all offset-returning methods return a duration of magnitude
-less than 24 hours.  For that reason, if y is firmly in std time, (y+k).d must
-be 0, so ignoring it has no consequence then.
-
-In any case, the new value is
-
-    z = y + y.s                                 [4]
-
-It's helpful to step back at look at [4] from a higher level:  it's simply
-mapping from UTC to tz's standard time.
-
-At this point, if
-
-    z.n - z.o = x.n                             [5]
-
-we have an equivalent time, and are almost done.  The insecurity here is
-at the start of daylight time.  Picture US Eastern for concreteness.  The wall
-time jumps from 1:59 to 3:00, and wall hours of the form 2:MM don't make good
-sense then.  The docs ask that an Eastern tzinfo class consider such a time to
-be EDT (because it's "after 2"), which is a redundant spelling of 1:MM EST
-on the day DST starts.  We want to return the 1:MM EST spelling because that's
-the only spelling that makes sense on the local wall clock.
-
-In fact, if [5] holds at this point, we do have the standard-time spelling,
-but that takes a bit of proof.  We first prove a stronger result.  What's the
-difference between the LHS and RHS of [5]?  Let
-
-    diff = x.n - (z.n - z.o)                    [6]
-
-Now
-    z.n =                       by [4]
-    (y + y.s).n =               by #5
-    y.n + y.s =                 since y.n = x.n
-    x.n + y.s =                 since z and y are have the same tzinfo member,
-                                    y.s = z.s by #2
-    x.n + z.s
-
-Plugging that back into [6] gives
-
-    diff =
-    x.n - ((x.n + z.s) - z.o) =     expanding
-    x.n - x.n - z.s + z.o =         cancelling
-    - z.s + z.o =                   by #2
-    z.d
-
-So diff = z.d.
-
-If [5] is true now, diff = 0, so z.d = 0 too, and we have the standard-time
-spelling we wanted in the endcase described above.  We're done.  Contrarily,
-if z.d = 0, then we have a UTC equivalent, and are also done.
-
-If [5] is not true now, diff = z.d != 0, and z.d is the offset we need to
-add to z (in effect, z is in tz's standard time, and we need to shift the
-local clock into tz's daylight time).
-
-Let
-
-    z' = z + z.d = z + diff                     [7]
-
-and we can again ask whether
-
-    z'.n - z'.o = x.n                           [8]
-
-If so, we're done.  If not, the tzinfo class is insane, according to the
-assumptions we've made.  This also requires a bit of proof.  As before, let's
-compute the difference between the LHS and RHS of [8] (and skipping some of
-the justifications for the kinds of substitutions we've done several times
-already):
-
-    diff' = x.n - (z'.n - z'.o) =           replacing z'.n via [7]
-            x.n  - (z.n + diff - z'.o) =    replacing diff via [6]
-            x.n - (z.n + x.n - (z.n - z.o) - z'.o) =
-            x.n - z.n - x.n + z.n - z.o + z'.o =    cancel x.n
-            - z.n + z.n - z.o + z'.o =              cancel z.n
-            - z.o + z'.o =                      #1 twice
-            -z.s - z.d + z'.s + z'.d =          z and z' have same tzinfo
-            z'.d - z.d
-
-So z' is UTC-equivalent to x iff z'.d = z.d at this point.  If they are equal,
-we've found the UTC-equivalent so are done.  In fact, we stop with [7] and
-return z', not bothering to compute z'.d.
-
-How could z.d and z'd differ?  z' = z + z.d [7], so merely moving z' by
-a dst() offset, and starting *from* a time already in DST (we know z.d != 0),
-would have to change the result dst() returns:  we start in DST, and moving
-a little further into it takes us out of DST.
-
-There isn't a sane case where this can happen.  The closest it gets is at
-the end of DST, where there's an hour in UTC with no spelling in a hybrid
-tzinfo class.  In US Eastern, that's 5:MM UTC = 0:MM EST = 1:MM EDT.  During
-that hour, on an Eastern clock 1:MM is taken as being in standard time (6:MM
-UTC) because the docs insist on that, but 0:MM is taken as being in daylight
-time (4:MM UTC).  There is no local time mapping to 5:MM UTC.  The local
-clock jumps from 1:59 back to 1:00 again, and repeats the 1:MM hour in
-standard time.  Since that's what the local clock *does*, we want to map both
-UTC hours 5:MM and 6:MM to 1:MM Eastern.  The result is ambiguous
-in local time, but so it goes -- it's the way the local clock works.
-
-When x = 5:MM UTC is the input to this algorithm, x.o=0, y.o=-5 and y.d=0,
-so z=0:MM.  z.d=60 (minutes) then, so [5] doesn't hold and we keep going.
-z' = z + z.d = 1:MM then, and z'.d=0, and z'.d - z.d = -60 != 0 so [8]
-(correctly) concludes that z' is not UTC-equivalent to x.
-
-Because we know z.d said z was in daylight time (else [5] would have held and
-we would have stopped then), and we know z.d != z'.d (else [8] would have held
-and we have stopped then), and there are only 2 possible values dst() can
-return in Eastern, it follows that z'.d must be 0 (which it is in the example,
-but the reasoning doesn't depend on the example -- it depends on there being
-two possible dst() outcomes, one zero and the other non-zero).  Therefore
-z' must be in standard time, and is the spelling we want in this case.
-
-Note again that z' is not UTC-equivalent as far as the hybrid tzinfo class is
-concerned (because it takes z' as being in standard time rather than the
-daylight time we intend here), but returning it gives the real-life "local
-clock repeats an hour" behavior when mapping the "unspellable" UTC hour into
-tz.
-
-When the input is 6:MM, z=1:MM and z.d=0, and we stop at once, again with
-the 1:MM standard time spelling we want.
-
-So how can this break?  One of the assumptions must be violated.  Two
-possibilities:
-
-1) [2] effectively says that y.s is invariant across all y belong to a given
-   time zone.  This isn't true if, for political reasons or continental drift,
-   a region decides to change its base offset from UTC.
-
-2) There may be versions of "double daylight" time where the tail end of
-   the analysis gives up a step too early.  I haven't thought about that
-   enough to say.
-
-In any case, it's clear that the default fromutc() is strong enough to handle
-"almost all" time zones:  so long as the standard offset is invariant, it
-doesn't matter if daylight time transition points change from year to year, or
-if daylight time is skipped in some years; it doesn't matter how large or
-small dst() may get within its bounds; and it doesn't even matter if some
-perverse time zone returns a negative dst()).  So a breaking case must be
-pretty bizarre, and a tzinfo subclass can override fromutc() if it is.
-"""
-try:
-    from _datetime import *
-except ImportError:
-    pass
-else:
-    # Clean up unused names
-    del (
-        _DAYNAMES,
-        _DAYS_BEFORE_MONTH,
-        _DAYS_IN_MONTH,
-        _DI100Y,
-        _DI400Y,
-        _DI4Y,
-        _MAXORDINAL,
-        _MONTHNAMES,
-        _build_struct_time,
-        _call_tzinfo_method,
-        _check_date_fields,
-        _check_time_fields,
-        _check_tzinfo_arg,
-        _check_tzname,
-        _check_utc_offset,
-        _cmp,
-        _cmperror,
-        _date_class,
-        _days_before_month,
-        _days_before_year,
-        _days_in_month,
-        _format_time,
-        _is_leap,
-        _isoweek1monday,
-        _math,
-        _ord2ymd,
-        _time,
-        _time_class,
-        _tzinfo_class,
-        _wrap_strftime,
-        _ymd2ord,
-    )
-    # XXX Since import * above excludes names that start with _,
-    # docstring does not get overwritten. In the future, it may be
-    # appropriate to maintain a single module level docstring and
-    # remove the following line.
-    from _datetime import __doc__
diff --git a/unix-ffi/datetime/metadata.txt b/unix-ffi/datetime/metadata.txt
deleted file mode 100644
index 950962aef..000000000
--- a/unix-ffi/datetime/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-1
diff --git a/unix-ffi/datetime/setup.py b/unix-ffi/datetime/setup.py
deleted file mode 100644
index 2f502e520..000000000
--- a/unix-ffi/datetime/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-datetime",
-    version="3.3.3-1",
-    description="CPython datetime module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["datetime"],
-)
diff --git a/unix-ffi/datetime/test_datetime.py b/unix-ffi/datetime/test_datetime.py
deleted file mode 100644
index 463f2b28a..000000000
--- a/unix-ffi/datetime/test_datetime.py
+++ /dev/null
@@ -1,3881 +0,0 @@
-"""Test date/time type.
-
-See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
-"""
-
-import sys
-import pickle
-import unittest
-
-from operator import lt, le, gt, ge, eq, ne, truediv, floordiv, mod
-
-from test import support
-
-import datetime as datetime_module
-from datetime import MINYEAR, MAXYEAR
-from datetime import timedelta
-from datetime import tzinfo
-from datetime import time
-from datetime import timezone
-from datetime import date, datetime
-import time as _time
-
-# Needed by test_datetime
-# import _strptime
-#
-
-
-pickle_choices = [(pickle, pickle, proto) for proto in range(pickle.HIGHEST_PROTOCOL + 1)]
-assert len(pickle_choices) == pickle.HIGHEST_PROTOCOL + 1
-
-# An arbitrary collection of objects of non-datetime types, for testing
-# mixed-type comparisons.
-OTHERSTUFF = (10, 34.5, "abc", {}, [], ())
-
-
-# XXX Copied from test_float.
-INF = float("inf")
-NAN = float("nan")
-
-
-#############################################################################
-# module tests
-
-
-class TestModule(unittest.TestCase):
-    def test_constants(self):
-        datetime = datetime_module
-        self.assertEqual(datetime.MINYEAR, 1)
-        self.assertEqual(datetime.MAXYEAR, 9999)
-
-
-#############################################################################
-# tzinfo tests
-
-
-class FixedOffset(tzinfo):
-    def __init__(self, offset, name, dstoffset=42):
-        if isinstance(offset, int):
-            offset = timedelta(minutes=offset)
-        if isinstance(dstoffset, int):
-            dstoffset = timedelta(minutes=dstoffset)
-        self.__offset = offset
-        self.__name = name
-        self.__dstoffset = dstoffset
-
-    def __repr__(self):
-        return self.__name.lower()
-
-    def utcoffset(self, dt):
-        return self.__offset
-
-    def tzname(self, dt):
-        return self.__name
-
-    def dst(self, dt):
-        return self.__dstoffset
-
-
-class PicklableFixedOffset(FixedOffset):
-    def __init__(self, offset=None, name=None, dstoffset=None):
-        FixedOffset.__init__(self, offset, name, dstoffset)
-
-
-class TestTZInfo(unittest.TestCase):
-    def test_non_abstractness(self):
-        # In order to allow subclasses to get pickled, the C implementation
-        # wasn't able to get away with having __init__ raise
-        # NotImplementedError.
-        useless = tzinfo()
-        dt = datetime.max
-        self.assertRaises(NotImplementedError, useless.tzname, dt)
-        self.assertRaises(NotImplementedError, useless.utcoffset, dt)
-        self.assertRaises(NotImplementedError, useless.dst, dt)
-
-    def test_subclass_must_override(self):
-        class NotEnough(tzinfo):
-            def __init__(self, offset, name):
-                self.__offset = offset
-                self.__name = name
-
-        self.assertTrue(issubclass(NotEnough, tzinfo))
-        ne = NotEnough(3, "NotByALongShot")
-        self.assertIsInstance(ne, tzinfo)
-
-        dt = datetime.now()
-        self.assertRaises(NotImplementedError, ne.tzname, dt)
-        self.assertRaises(NotImplementedError, ne.utcoffset, dt)
-        self.assertRaises(NotImplementedError, ne.dst, dt)
-
-    def test_normal(self):
-        fo = FixedOffset(3, "Three")
-        self.assertIsInstance(fo, tzinfo)
-        for dt in datetime.now(), None:
-            self.assertEqual(fo.utcoffset(dt), timedelta(minutes=3))
-            self.assertEqual(fo.tzname(dt), "Three")
-            self.assertEqual(fo.dst(dt), timedelta(minutes=42))
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_pickling_base(self):
-        # There's no point to pickling tzinfo objects on their own (they
-        # carry no data), but they need to be picklable anyway else
-        # concrete subclasses can't be pickled.
-        orig = tzinfo.__new__(tzinfo)
-        self.assertTrue(type(orig) is tzinfo)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertTrue(type(derived) is tzinfo)
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_pickling_subclass(self):
-        # Make sure we can pickle/unpickle an instance of a subclass.
-        offset = timedelta(minutes=-300)
-        for otype, args in [
-            (PicklableFixedOffset, (offset, "cookie")),
-            (timezone, (offset,)),
-            (timezone, (offset, "EST")),
-        ]:
-            orig = otype(*args)
-            oname = orig.tzname(None)
-            self.assertIsInstance(orig, tzinfo)
-            self.assertIs(type(orig), otype)
-            self.assertEqual(orig.utcoffset(None), offset)
-            self.assertEqual(orig.tzname(None), oname)
-            for pickler, unpickler, proto in pickle_choices:
-                green = pickler.dumps(orig, proto)
-                derived = unpickler.loads(green)
-                self.assertIsInstance(derived, tzinfo)
-                self.assertIs(type(derived), otype)
-                self.assertEqual(derived.utcoffset(None), offset)
-                self.assertEqual(derived.tzname(None), oname)
-
-
-class TestTimeZone(unittest.TestCase):
-    def setUp(self):
-        self.ACDT = timezone(timedelta(hours=9.5), "ACDT")
-        self.EST = timezone(-timedelta(hours=5), "EST")
-        self.DT = datetime(2010, 1, 1)
-
-    def test_str(self):
-        for tz in [self.ACDT, self.EST, timezone.utc, timezone.min, timezone.max]:
-            self.assertEqual(str(tz), tz.tzname(None))
-
-    def test_repr(self):
-        datetime = datetime_module
-        for tz in [self.ACDT, self.EST, timezone.utc, timezone.min, timezone.max]:
-            # test round-trip
-            tzrep = repr(tz)
-            # MicroPython doesn't use locals() in eval()
-            tzrep = tzrep.replace("datetime.", "")
-            self.assertEqual(tz, eval(tzrep))
-
-    def test_class_members(self):
-        limit = timedelta(hours=23, minutes=59)
-        self.assertEqual(timezone.utc.utcoffset(None), ZERO)
-        self.assertEqual(timezone.min.utcoffset(None), -limit)
-        self.assertEqual(timezone.max.utcoffset(None), limit)
-
-    def test_constructor(self):
-        self.assertIs(timezone.utc, timezone(timedelta(0)))
-        self.assertIsNot(timezone.utc, timezone(timedelta(0), "UTC"))
-        self.assertEqual(timezone.utc, timezone(timedelta(0), "UTC"))
-        # invalid offsets
-        for invalid in [
-            timedelta(microseconds=1),
-            timedelta(1, 1),
-            timedelta(seconds=1),
-            timedelta(1),
-            -timedelta(1),
-        ]:
-            self.assertRaises(ValueError, timezone, invalid)
-            self.assertRaises(ValueError, timezone, -invalid)
-
-        with self.assertRaises(TypeError):
-            timezone(None)
-        with self.assertRaises(TypeError):
-            timezone(42)
-        with self.assertRaises(TypeError):
-            timezone(ZERO, None)
-        with self.assertRaises(TypeError):
-            timezone(ZERO, 42)
-        with self.assertRaises(TypeError):
-            timezone(ZERO, "ABC", "extra")
-
-    def test_inheritance(self):
-        self.assertIsInstance(timezone.utc, tzinfo)
-        self.assertIsInstance(self.EST, tzinfo)
-
-    def test_utcoffset(self):
-        dummy = self.DT
-        for h in [0, 1.5, 12]:
-            offset = h * HOUR
-            self.assertEqual(offset, timezone(offset).utcoffset(dummy))
-            self.assertEqual(-offset, timezone(-offset).utcoffset(dummy))
-
-        with self.assertRaises(TypeError):
-            self.EST.utcoffset("")
-        with self.assertRaises(TypeError):
-            self.EST.utcoffset(5)
-
-    def test_dst(self):
-        self.assertIsNone(timezone.utc.dst(self.DT))
-
-        with self.assertRaises(TypeError):
-            self.EST.dst("")
-        with self.assertRaises(TypeError):
-            self.EST.dst(5)
-
-    def test_tzname(self):
-        self.assertEqual("UTC+00:00", timezone(ZERO).tzname(None))
-        self.assertEqual("UTC-05:00", timezone(-5 * HOUR).tzname(None))
-        self.assertEqual("UTC+09:30", timezone(9.5 * HOUR).tzname(None))
-        self.assertEqual("UTC-00:01", timezone(timedelta(minutes=-1)).tzname(None))
-        self.assertEqual("XYZ", timezone(-5 * HOUR, "XYZ").tzname(None))
-
-        with self.assertRaises(TypeError):
-            self.EST.tzname("")
-        with self.assertRaises(TypeError):
-            self.EST.tzname(5)
-
-    def test_fromutc(self):
-        with self.assertRaises(ValueError):
-            timezone.utc.fromutc(self.DT)
-        with self.assertRaises(TypeError):
-            timezone.utc.fromutc("not datetime")
-        for tz in [self.EST, self.ACDT, Eastern]:
-            utctime = self.DT.replace(tzinfo=tz)
-            local = tz.fromutc(utctime)
-            self.assertEqual(local - utctime, tz.utcoffset(local))
-            self.assertEqual(local, self.DT.replace(tzinfo=timezone.utc))
-
-    def test_comparison(self):
-        self.assertNotEqual(timezone(ZERO), timezone(HOUR))
-        self.assertEqual(timezone(HOUR), timezone(HOUR))
-        self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, "EST"))
-        with self.assertRaises(TypeError):
-            timezone(ZERO) < timezone(ZERO)
-        self.assertIn(timezone(ZERO), {timezone(ZERO)})
-        self.assertTrue(timezone(ZERO) != None)
-        self.assertFalse(timezone(ZERO) == None)
-
-    def test_aware_datetime(self):
-        # test that timezone instances can be used by datetime
-        t = datetime(1, 1, 1)
-        for tz in [timezone.min, timezone.max, timezone.utc]:
-            self.assertEqual(tz.tzname(t), t.replace(tzinfo=tz).tzname())
-            self.assertEqual(tz.utcoffset(t), t.replace(tzinfo=tz).utcoffset())
-            self.assertEqual(tz.dst(t), t.replace(tzinfo=tz).dst())
-
-
-#############################################################################
-# Base class for testing a particular aspect of timedelta, time, date and
-# datetime comparisons.
-
-
-class HarmlessMixedComparison:
-    # Test that __eq__ and __ne__ don't complain for mixed-type comparisons.
-
-    # Subclasses must define 'theclass', and theclass(1, 1, 1) must be a
-    # legit constructor.
-
-    def test_harmless_mixed_comparison(self):
-        me = self.theclass(1, 1, 1)
-
-        self.assertFalse(me == ())
-        self.assertTrue(me != ())
-        self.assertFalse(() == me)
-        self.assertTrue(() != me)
-
-        self.assertIn(me, [1, 20, [], me])
-        self.assertIn([], [me, 1, 20, []])
-
-    def test_harmful_mixed_comparison(self):
-        me = self.theclass(1, 1, 1)
-
-        self.assertRaises(TypeError, lambda: me < ())
-        self.assertRaises(TypeError, lambda: me <= ())
-        self.assertRaises(TypeError, lambda: me > ())
-        self.assertRaises(TypeError, lambda: me >= ())
-
-        self.assertRaises(TypeError, lambda: () < me)
-        self.assertRaises(TypeError, lambda: () <= me)
-        self.assertRaises(TypeError, lambda: () > me)
-        self.assertRaises(TypeError, lambda: () >= me)
-
-
-#############################################################################
-# timedelta tests
-
-
-class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase):
-
-    theclass = timedelta
-
-    def test_constructor(self):
-        eq = self.assertEqual
-        td = timedelta
-
-        # Check keyword args to constructor
-        eq(
-            td(),
-            td(weeks=0, days=0, hours=0, minutes=0, seconds=0, milliseconds=0, microseconds=0),
-        )
-        eq(td(1), td(days=1))
-        eq(td(0, 1), td(seconds=1))
-        eq(td(0, 0, 1), td(microseconds=1))
-        eq(td(weeks=1), td(days=7))
-        eq(td(days=1), td(hours=24))
-        eq(td(hours=1), td(minutes=60))
-        eq(td(minutes=1), td(seconds=60))
-        eq(td(seconds=1), td(milliseconds=1000))
-        eq(td(milliseconds=1), td(microseconds=1000))
-
-        # Check float args to constructor
-        eq(td(weeks=1.0 / 7), td(days=1))
-        eq(td(days=1.0 / 24), td(hours=1))
-        eq(td(hours=1.0 / 60), td(minutes=1))
-        eq(td(minutes=1.0 / 60), td(seconds=1))
-        eq(td(seconds=0.001), td(milliseconds=1))
-        eq(td(milliseconds=0.001), td(microseconds=1))
-
-    def test_computations(self):
-        eq = self.assertEqual
-        td = timedelta
-
-        a = td(7)  # One week
-        b = td(0, 60)  # One minute
-        c = td(0, 0, 1000)  # One millisecond
-        eq(a + b + c, td(7, 60, 1000))
-        eq(a - b, td(6, 24 * 3600 - 60))
-        eq(b.__rsub__(a), td(6, 24 * 3600 - 60))
-        eq(-a, td(-7))
-        eq(+a, td(7))
-        eq(-b, td(-1, 24 * 3600 - 60))
-        eq(-c, td(-1, 24 * 3600 - 1, 999000))
-        eq(abs(a), a)
-        eq(abs(-a), a)
-        eq(td(6, 24 * 3600), a)
-        eq(td(0, 0, 60 * 1000000), b)
-        eq(a * 10, td(70))
-        eq(a * 10, 10 * a)
-        eq(a * 10, 10 * a)
-        eq(b * 10, td(0, 600))
-        eq(10 * b, td(0, 600))
-        eq(b * 10, td(0, 600))
-        eq(c * 10, td(0, 0, 10000))
-        eq(10 * c, td(0, 0, 10000))
-        eq(c * 10, td(0, 0, 10000))
-        eq(a * -1, -a)
-        eq(b * -2, -b - b)
-        eq(c * -2, -c + -c)
-        eq(b * (60 * 24), (b * 60) * 24)
-        eq(b * (60 * 24), (60 * b) * 24)
-        eq(c * 1000, td(0, 1))
-        eq(1000 * c, td(0, 1))
-        eq(a // 7, td(1))
-        eq(b // 10, td(0, 6))
-        eq(c // 1000, td(0, 0, 1))
-        eq(a // 10, td(0, 7 * 24 * 360))
-        eq(a // 3600000, td(0, 0, 7 * 24 * 1000))
-        eq(a / 0.5, td(14))
-        eq(b / 0.5, td(0, 120))
-        eq(a / 7, td(1))
-        eq(b / 10, td(0, 6))
-        eq(c / 1000, td(0, 0, 1))
-        eq(a / 10, td(0, 7 * 24 * 360))
-        eq(a / 3600000, td(0, 0, 7 * 24 * 1000))
-
-        # Multiplication by float
-        us = td(microseconds=1)
-        eq((3 * us) * 0.5, 2 * us)
-        eq((5 * us) * 0.5, 2 * us)
-        eq(0.5 * (3 * us), 2 * us)
-        eq(0.5 * (5 * us), 2 * us)
-        eq((-3 * us) * 0.5, -2 * us)
-        eq((-5 * us) * 0.5, -2 * us)
-
-        # Division by int and float
-        eq((3 * us) / 2, 2 * us)
-        eq((5 * us) / 2, 2 * us)
-        eq((-3 * us) / 2.0, -2 * us)
-        eq((-5 * us) / 2.0, -2 * us)
-        eq((3 * us) / -2, -2 * us)
-        eq((5 * us) / -2, -2 * us)
-        eq((3 * us) / -2.0, -2 * us)
-        eq((5 * us) / -2.0, -2 * us)
-        for i in range(-10, 10):
-            eq((i * us / 3) // us, round(i / 3))
-        for i in range(-10, 10):
-            eq((i * us / -3) // us, round(i / -3))
-
-        # Issue #11576
-        eq(td(999999999, 86399, 999999) - td(999999999, 86399, 999998), td(0, 0, 1))
-        eq(td(999999999, 1, 1) - td(999999999, 1, 0), td(0, 0, 1))
-
-    def test_disallowed_computations(self):
-        a = timedelta(42)
-
-        # Add/sub ints or floats should be illegal
-        for i in 1, 1.0:
-            self.assertRaises(TypeError, lambda: a + i)
-            self.assertRaises(TypeError, lambda: a - i)
-            self.assertRaises(TypeError, lambda: i + a)
-            self.assertRaises(TypeError, lambda: i - a)
-
-        # Division of int by timedelta doesn't make sense.
-        # Division by zero doesn't make sense.
-        zero = 0
-        self.assertRaises(TypeError, lambda: zero // a)
-        self.assertRaises(ZeroDivisionError, lambda: a // zero)
-        self.assertRaises(ZeroDivisionError, lambda: a / zero)
-        self.assertRaises(ZeroDivisionError, lambda: a / 0.0)
-        self.assertRaises(TypeError, lambda: a / "")
-
-    @support.requires_IEEE_754
-    def test_disallowed_special(self):
-        a = timedelta(42)
-        self.assertRaises(ValueError, a.__mul__, NAN)
-        self.assertRaises(ValueError, a.__truediv__, NAN)
-
-    def test_basic_attributes(self):
-        days, seconds, us = 1, 7, 31
-        td = timedelta(days, seconds, us)
-        self.assertEqual(td.days, days)
-        self.assertEqual(td.seconds, seconds)
-        self.assertEqual(td.microseconds, us)
-
-    def test_total_seconds(self):
-        td = timedelta(days=365)
-        self.assertEqual(td.total_seconds(), 31536000.0)
-        for total_seconds in [123456.789012, -123456.789012, 0.123456, 0, 1e6]:
-            td = timedelta(seconds=total_seconds)
-            self.assertEqual(td.total_seconds(), total_seconds)
-        # Issue8644: Test that td.total_seconds() has the same
-        # accuracy as td / timedelta(seconds=1).
-        for ms in [-1, -2, -123]:
-            td = timedelta(microseconds=ms)
-            self.assertEqual(td.total_seconds(), td / timedelta(seconds=1))
-
-    def test_carries(self):
-        t1 = timedelta(
-            days=100,
-            weeks=-7,
-            hours=-24 * (100 - 49),
-            minutes=-3,
-            seconds=12,
-            microseconds=(3 * 60 - 12) * 1e6 + 1,
-        )
-        t2 = timedelta(microseconds=1)
-        self.assertEqual(t1, t2)
-
-    def test_hash_equality(self):
-        t1 = timedelta(
-            days=100,
-            weeks=-7,
-            hours=-24 * (100 - 49),
-            minutes=-3,
-            seconds=12,
-            microseconds=(3 * 60 - 12) * 1000000,
-        )
-        t2 = timedelta()
-        self.assertEqual(hash(t1), hash(t2))
-
-        t1 += timedelta(weeks=7)
-        t2 += timedelta(days=7 * 7)
-        self.assertEqual(t1, t2)
-        self.assertEqual(hash(t1), hash(t2))
-
-        d = {t1: 1}
-        d[t2] = 2
-        self.assertEqual(len(d), 1)
-        self.assertEqual(d[t1], 2)
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_pickling(self):
-        args = 12, 34, 56
-        orig = timedelta(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def test_compare(self):
-        t1 = timedelta(2, 3, 4)
-        t2 = timedelta(2, 3, 4)
-        self.assertEqual(t1, t2)
-        self.assertTrue(t1 <= t2)
-        self.assertTrue(t1 >= t2)
-        self.assertTrue(not t1 != t2)
-        self.assertTrue(not t1 < t2)
-        self.assertTrue(not t1 > t2)
-
-        for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
-            t2 = timedelta(*args)  # this is larger than t1
-            self.assertTrue(t1 < t2)
-            self.assertTrue(t2 > t1)
-            self.assertTrue(t1 <= t2)
-            self.assertTrue(t2 >= t1)
-            self.assertTrue(t1 != t2)
-            self.assertTrue(t2 != t1)
-            self.assertTrue(not t1 == t2)
-            self.assertTrue(not t2 == t1)
-            self.assertTrue(not t1 > t2)
-            self.assertTrue(not t2 < t1)
-            self.assertTrue(not t1 >= t2)
-            self.assertTrue(not t2 <= t1)
-
-        for badarg in OTHERSTUFF:
-            self.assertEqual(t1 == badarg, False)
-            self.assertEqual(t1 != badarg, True)
-            self.assertEqual(badarg == t1, False)
-            self.assertEqual(badarg != t1, True)
-
-            self.assertRaises(TypeError, lambda: t1 <= badarg)
-            self.assertRaises(TypeError, lambda: t1 < badarg)
-            self.assertRaises(TypeError, lambda: t1 > badarg)
-            self.assertRaises(TypeError, lambda: t1 >= badarg)
-            self.assertRaises(TypeError, lambda: badarg <= t1)
-            self.assertRaises(TypeError, lambda: badarg < t1)
-            self.assertRaises(TypeError, lambda: badarg > t1)
-            self.assertRaises(TypeError, lambda: badarg >= t1)
-
-    def test_str(self):
-        td = timedelta
-        eq = self.assertEqual
-
-        eq(str(td(1)), "1 day, 0:00:00")
-        eq(str(td(-1)), "-1 day, 0:00:00")
-        eq(str(td(2)), "2 days, 0:00:00")
-        eq(str(td(-2)), "-2 days, 0:00:00")
-
-        eq(str(td(hours=12, minutes=58, seconds=59)), "12:58:59")
-        eq(str(td(hours=2, minutes=3, seconds=4)), "2:03:04")
-        eq(str(td(weeks=-30, hours=23, minutes=12, seconds=34)), "-210 days, 23:12:34")
-
-        eq(str(td(milliseconds=1)), "0:00:00.001000")
-        eq(str(td(microseconds=3)), "0:00:00.000003")
-
-        eq(
-            str(td(days=999999999, hours=23, minutes=59, seconds=59, microseconds=999999)),
-            "999999999 days, 23:59:59.999999",
-        )
-
-    def test_repr(self):
-        name = "datetime." + self.theclass.__name__
-        self.assertEqual(repr(self.theclass(1)), "%s(1)" % name)
-        self.assertEqual(repr(self.theclass(10, 2)), "%s(10, 2)" % name)
-        self.assertEqual(repr(self.theclass(-10, 2, 400000)), "%s(-10, 2, 400000)" % name)
-
-    def test_roundtrip(self):
-        for td in (
-            timedelta(days=999999999, hours=23, minutes=59, seconds=59, microseconds=999999),
-            timedelta(days=-999999999),
-            timedelta(days=-999999999, seconds=1),
-            timedelta(days=1, seconds=2, microseconds=3),
-        ):
-
-            # Verify td -> string -> td identity.
-            s = repr(td)
-            self.assertTrue(s.startswith("datetime."))
-            s = s[9:]
-            td2 = eval(s)
-            self.assertEqual(td, td2)
-
-            # Verify identity via reconstructing from pieces.
-            td2 = timedelta(td.days, td.seconds, td.microseconds)
-            self.assertEqual(td, td2)
-
-    def test_resolution_info(self):
-        self.assertIsInstance(timedelta.min, timedelta)
-        self.assertIsInstance(timedelta.max, timedelta)
-        self.assertIsInstance(timedelta.resolution, timedelta)
-        self.assertTrue(timedelta.max > timedelta.min)
-        self.assertEqual(timedelta.min, timedelta(-999999999))
-        self.assertEqual(timedelta.max, timedelta(999999999, 24 * 3600 - 1, 1e6 - 1))
-        self.assertEqual(timedelta.resolution, timedelta(0, 0, 1))
-
-    def test_overflow(self):
-        tiny = timedelta.resolution
-
-        td = timedelta.min + tiny
-        td -= tiny  # no problem
-        self.assertRaises(OverflowError, td.__sub__, tiny)
-        self.assertRaises(OverflowError, td.__add__, -tiny)
-
-        td = timedelta.max - tiny
-        td += tiny  # no problem
-        self.assertRaises(OverflowError, td.__add__, tiny)
-        self.assertRaises(OverflowError, td.__sub__, -tiny)
-
-        self.assertRaises(OverflowError, lambda: -timedelta.max)
-
-        day = timedelta(1)
-        self.assertRaises(OverflowError, day.__mul__, 10**9)
-        self.assertRaises(OverflowError, day.__mul__, 1e9)
-        self.assertRaises(OverflowError, day.__truediv__, 1e-20)
-        self.assertRaises(OverflowError, day.__truediv__, 1e-10)
-        self.assertRaises(OverflowError, day.__truediv__, 9e-10)
-
-    @support.requires_IEEE_754
-    def _test_overflow_special(self):
-        day = timedelta(1)
-        self.assertRaises(OverflowError, day.__mul__, INF)
-        self.assertRaises(OverflowError, day.__mul__, -INF)
-
-    def test_microsecond_rounding(self):
-        td = timedelta
-        eq = self.assertEqual
-
-        # Single-field rounding.
-        eq(td(milliseconds=0.4 / 1000), td(0))  # rounds to 0
-        eq(td(milliseconds=-0.4 / 1000), td(0))  # rounds to 0
-        eq(td(milliseconds=0.6 / 1000), td(microseconds=1))
-        eq(td(milliseconds=-0.6 / 1000), td(microseconds=-1))
-
-        # Rounding due to contributions from more than one field.
-        us_per_hour = 3600e6
-        us_per_day = us_per_hour * 24
-        eq(td(days=0.4 / us_per_day), td(0))
-        eq(td(hours=0.2 / us_per_hour), td(0))
-        eq(td(days=0.4 / us_per_day, hours=0.2 / us_per_hour), td(microseconds=1))
-
-        eq(td(days=-0.4 / us_per_day), td(0))
-        eq(td(hours=-0.2 / us_per_hour), td(0))
-        eq(td(days=-0.4 / us_per_day, hours=-0.2 / us_per_hour), td(microseconds=-1))
-
-    def test_massive_normalization(self):
-        td = timedelta(microseconds=-1)
-        self.assertEqual((td.days, td.seconds, td.microseconds), (-1, 24 * 3600 - 1, 999999))
-
-    def test_bool(self):
-        self.assertTrue(timedelta(1))
-        self.assertTrue(timedelta(0, 1))
-        self.assertTrue(timedelta(0, 0, 1))
-        self.assertTrue(timedelta(microseconds=1))
-        self.assertTrue(not timedelta(0))
-
-    def test_subclass_timedelta(self):
-        class T(timedelta):
-            @staticmethod
-            def from_td(td):
-                return T(td.days, td.seconds, td.microseconds)
-
-            def as_hours(self):
-                sum = self.days * 24 + self.seconds / 3600.0 + self.microseconds / 3600e6
-                return round(sum)
-
-        t1 = T(days=1)
-        self.assertTrue(type(t1) is T)
-        self.assertEqual(t1.as_hours(), 24)
-
-        t2 = T(days=-1, seconds=-3600)
-        self.assertTrue(type(t2) is T)
-        self.assertEqual(t2.as_hours(), -25)
-
-        t3 = t1 + t2
-        self.assertTrue(type(t3) is timedelta)
-        t4 = T.from_td(t3)
-        self.assertTrue(type(t4) is T)
-        self.assertEqual(t3.days, t4.days)
-        self.assertEqual(t3.seconds, t4.seconds)
-        self.assertEqual(t3.microseconds, t4.microseconds)
-        self.assertEqual(str(t3), str(t4))
-        self.assertEqual(t4.as_hours(), -1)
-
-    def test_division(self):
-        t = timedelta(hours=1, minutes=24, seconds=19)
-        second = timedelta(seconds=1)
-        self.assertEqual(t / second, 5059.0)
-        self.assertEqual(t // second, 5059)
-
-        t = timedelta(minutes=2, seconds=30)
-        minute = timedelta(minutes=1)
-        self.assertEqual(t / minute, 2.5)
-        self.assertEqual(t // minute, 2)
-
-        zerotd = timedelta(0)
-        self.assertRaises(ZeroDivisionError, truediv, t, zerotd)
-        self.assertRaises(ZeroDivisionError, floordiv, t, zerotd)
-
-        # self.assertRaises(TypeError, truediv, t, 2)
-        # note: floor division of a timedelta by an integer *is*
-        # currently permitted.
-
-    def test_remainder(self):
-        t = timedelta(minutes=2, seconds=30)
-        minute = timedelta(minutes=1)
-        r = t % minute
-        self.assertEqual(r, timedelta(seconds=30))
-
-        t = timedelta(minutes=-2, seconds=30)
-        r = t % minute
-        self.assertEqual(r, timedelta(seconds=30))
-
-        zerotd = timedelta(0)
-        self.assertRaises(ZeroDivisionError, mod, t, zerotd)
-
-        self.assertRaises(TypeError, mod, t, 10)
-
-    def test_divmod(self):
-        t = timedelta(minutes=2, seconds=30)
-        minute = timedelta(minutes=1)
-        q, r = divmod(t, minute)
-        self.assertEqual(q, 2)
-        self.assertEqual(r, timedelta(seconds=30))
-
-        t = timedelta(minutes=-2, seconds=30)
-        q, r = divmod(t, minute)
-        self.assertEqual(q, -2)
-        self.assertEqual(r, timedelta(seconds=30))
-
-        zerotd = timedelta(0)
-        self.assertRaises(ZeroDivisionError, divmod, t, zerotd)
-
-        self.assertRaises(TypeError, divmod, t, 10)
-
-
-#############################################################################
-# date tests
-
-
-class TestDateOnly(unittest.TestCase):
-    # Tests here won't pass if also run on datetime objects, so don't
-    # subclass this to test datetimes too.
-
-    def test_delta_non_days_ignored(self):
-        dt = date(2000, 1, 2)
-        delta = timedelta(days=1, hours=2, minutes=3, seconds=4, microseconds=5)
-        days = timedelta(delta.days)
-        self.assertEqual(days, timedelta(1))
-
-        dt2 = dt + delta
-        self.assertEqual(dt2, dt + days)
-
-        dt2 = delta + dt
-        self.assertEqual(dt2, dt + days)
-
-        dt2 = dt - delta
-        self.assertEqual(dt2, dt - days)
-
-        delta = -delta
-        days = timedelta(delta.days)
-        self.assertEqual(days, timedelta(-2))
-
-        dt2 = dt + delta
-        self.assertEqual(dt2, dt + days)
-
-        dt2 = delta + dt
-        self.assertEqual(dt2, dt + days)
-
-        dt2 = dt - delta
-        self.assertEqual(dt2, dt - days)
-
-
-class SubclassDate(date):
-    sub_var = 1
-
-
-class TestDate(HarmlessMixedComparison, unittest.TestCase):
-    # Tests here should pass for both dates and datetimes, except for a
-    # few tests that TestDateTime overrides.
-
-    theclass = date
-
-    def test_basic_attributes(self):
-        dt = self.theclass(2002, 3, 1)
-        self.assertEqual(dt.year, 2002)
-        self.assertEqual(dt.month, 3)
-        self.assertEqual(dt.day, 1)
-
-    def test_roundtrip(self):
-        for dt in (self.theclass(1, 2, 3), self.theclass.today()):
-            # Verify dt -> string -> date identity.
-            s = repr(dt)
-            self.assertTrue(s.startswith("datetime."))
-            s = s[9:]
-            dt2 = eval(s)
-            self.assertEqual(dt, dt2)
-
-            # Verify identity via reconstructing from pieces.
-            dt2 = self.theclass(dt.year, dt.month, dt.day)
-            self.assertEqual(dt, dt2)
-
-    def test_ordinal_conversions(self):
-        # Check some fixed values.
-        for y, m, d, n in [
-            (1, 1, 1, 1),  # calendar origin
-            (1, 12, 31, 365),
-            (2, 1, 1, 366),
-            # first example from "Calendrical Calculations"
-            (1945, 11, 12, 710347),
-        ]:
-            d = self.theclass(y, m, d)
-            self.assertEqual(n, d.toordinal())
-            fromord = self.theclass.fromordinal(n)
-            self.assertEqual(d, fromord)
-            if hasattr(fromord, "hour"):
-                # if we're checking something fancier than a date, verify
-                # the extra fields have been zeroed out
-                self.assertEqual(fromord.hour, 0)
-                self.assertEqual(fromord.minute, 0)
-                self.assertEqual(fromord.second, 0)
-                self.assertEqual(fromord.microsecond, 0)
-
-        # Check first and last days of year spottily across the whole
-        # range of years supported.
-        for year in range(MINYEAR, MAXYEAR + 1, 7):
-            # Verify (year, 1, 1) -> ordinal -> y, m, d is identity.
-            d = self.theclass(year, 1, 1)
-            n = d.toordinal()
-            d2 = self.theclass.fromordinal(n)
-            self.assertEqual(d, d2)
-            # Verify that moving back a day gets to the end of year-1.
-            if year > 1:
-                d = self.theclass.fromordinal(n - 1)
-                d2 = self.theclass(year - 1, 12, 31)
-                self.assertEqual(d, d2)
-                self.assertEqual(d2.toordinal(), n - 1)
-
-        # Test every day in a leap-year and a non-leap year.
-        dim = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-        for year, isleap in (2000, True), (2002, False):
-            n = self.theclass(year, 1, 1).toordinal()
-            for month, maxday in zip(range(1, 13), dim):
-                if month == 2 and isleap:
-                    maxday += 1
-                for day in range(1, maxday + 1):
-                    d = self.theclass(year, month, day)
-                    self.assertEqual(d.toordinal(), n)
-                    self.assertEqual(d, self.theclass.fromordinal(n))
-                    n += 1
-
-    def test_extreme_ordinals(self):
-        a = self.theclass.min
-        a = self.theclass(a.year, a.month, a.day)  # get rid of time parts
-        aord = a.toordinal()
-        b = a.fromordinal(aord)
-        self.assertEqual(a, b)
-
-        self.assertRaises(ValueError, lambda: a.fromordinal(aord - 1))
-
-        b = a + timedelta(days=1)
-        self.assertEqual(b.toordinal(), aord + 1)
-        self.assertEqual(b, self.theclass.fromordinal(aord + 1))
-
-        a = self.theclass.max
-        a = self.theclass(a.year, a.month, a.day)  # get rid of time parts
-        aord = a.toordinal()
-        b = a.fromordinal(aord)
-        self.assertEqual(a, b)
-
-        self.assertRaises(ValueError, lambda: a.fromordinal(aord + 1))
-
-        b = a - timedelta(days=1)
-        self.assertEqual(b.toordinal(), aord - 1)
-        self.assertEqual(b, self.theclass.fromordinal(aord - 1))
-
-    def test_bad_constructor_arguments(self):
-        # bad years
-        self.theclass(MINYEAR, 1, 1)  # no exception
-        self.theclass(MAXYEAR, 1, 1)  # no exception
-        self.assertRaises(ValueError, self.theclass, MINYEAR - 1, 1, 1)
-        self.assertRaises(ValueError, self.theclass, MAXYEAR + 1, 1, 1)
-        # bad months
-        self.theclass(2000, 1, 1)  # no exception
-        self.theclass(2000, 12, 1)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 0, 1)
-        self.assertRaises(ValueError, self.theclass, 2000, 13, 1)
-        # bad days
-        self.theclass(2000, 2, 29)  # no exception
-        self.theclass(2004, 2, 29)  # no exception
-        self.theclass(2400, 2, 29)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 2, 30)
-        self.assertRaises(ValueError, self.theclass, 2001, 2, 29)
-        self.assertRaises(ValueError, self.theclass, 2100, 2, 29)
-        self.assertRaises(ValueError, self.theclass, 1900, 2, 29)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 0)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 32)
-
-    def test_hash_equality(self):
-        d = self.theclass(2000, 12, 31)
-        # same thing
-        e = self.theclass(2000, 12, 31)
-        self.assertEqual(d, e)
-        self.assertEqual(hash(d), hash(e))
-
-        dic = {d: 1}
-        dic[e] = 2
-        self.assertEqual(len(dic), 1)
-        self.assertEqual(dic[d], 2)
-        self.assertEqual(dic[e], 2)
-
-        d = self.theclass(2001, 1, 1)
-        # same thing
-        e = self.theclass(2001, 1, 1)
-        self.assertEqual(d, e)
-        self.assertEqual(hash(d), hash(e))
-
-        dic = {d: 1}
-        dic[e] = 2
-        self.assertEqual(len(dic), 1)
-        self.assertEqual(dic[d], 2)
-        self.assertEqual(dic[e], 2)
-
-    def test_computations(self):
-        a = self.theclass(2002, 1, 31)
-        b = self.theclass(1956, 1, 31)
-        c = self.theclass(2001, 2, 1)
-
-        diff = a - b
-        self.assertEqual(diff.days, 46 * 365 + len(range(1956, 2002, 4)))
-        self.assertEqual(diff.seconds, 0)
-        self.assertEqual(diff.microseconds, 0)
-
-        day = timedelta(1)
-        week = timedelta(7)
-        a = self.theclass(2002, 3, 2)
-        self.assertEqual(a + day, self.theclass(2002, 3, 3))
-        self.assertEqual(day + a, self.theclass(2002, 3, 3))
-        self.assertEqual(a - day, self.theclass(2002, 3, 1))
-        self.assertEqual(-day + a, self.theclass(2002, 3, 1))
-        self.assertEqual(a + week, self.theclass(2002, 3, 9))
-        self.assertEqual(a - week, self.theclass(2002, 2, 23))
-        self.assertEqual(a + 52 * week, self.theclass(2003, 3, 1))
-        self.assertEqual(a - 52 * week, self.theclass(2001, 3, 3))
-        self.assertEqual((a + week) - a, week)
-        self.assertEqual((a + day) - a, day)
-        self.assertEqual((a - week) - a, -week)
-        self.assertEqual((a - day) - a, -day)
-        self.assertEqual(a - (a + week), -week)
-        self.assertEqual(a - (a + day), -day)
-        self.assertEqual(a - (a - week), week)
-        self.assertEqual(a - (a - day), day)
-        self.assertEqual(c - (c - day), day)
-
-        # Add/sub ints or floats should be illegal
-        for i in 1, 1.0:
-            self.assertRaises(TypeError, lambda: a + i)
-            self.assertRaises(TypeError, lambda: a - i)
-            self.assertRaises(TypeError, lambda: i + a)
-            self.assertRaises(TypeError, lambda: i - a)
-
-        # delta - date is senseless.
-        self.assertRaises(TypeError, lambda: day - a)
-        # mixing date and (delta or date) via * or // is senseless
-        self.assertRaises(TypeError, lambda: day * a)
-        self.assertRaises(TypeError, lambda: a * day)
-        self.assertRaises(TypeError, lambda: day // a)
-        self.assertRaises(TypeError, lambda: a // day)
-        self.assertRaises(TypeError, lambda: a * a)
-        self.assertRaises(TypeError, lambda: a // a)
-        # date + date is senseless
-        self.assertRaises(TypeError, lambda: a + a)
-
-    def test_overflow(self):
-        tiny = self.theclass.resolution
-
-        for delta in [tiny, timedelta(1), timedelta(2)]:
-            dt = self.theclass.min + delta
-            dt -= delta  # no problem
-            self.assertRaises(OverflowError, dt.__sub__, delta)
-            self.assertRaises(OverflowError, dt.__add__, -delta)
-
-            dt = self.theclass.max - delta
-            dt += delta  # no problem
-            self.assertRaises(OverflowError, dt.__add__, delta)
-            self.assertRaises(OverflowError, dt.__sub__, -delta)
-
-    def test_fromtimestamp(self):
-        import time
-
-        # Try an arbitrary fixed value.
-        year, month, day = 1999, 9, 19
-        ts = time.mktime((year, month, day, 0, 0, 0, 0, 0, -1))
-        d = self.theclass.fromtimestamp(ts)
-        self.assertEqual(d.year, year)
-        self.assertEqual(d.month, month)
-        self.assertEqual(d.day, day)
-
-    @unittest.skip("Skip for MicroPython")
-    def test_insane_fromtimestamp(self):
-        # It's possible that some platform maps time_t to double,
-        # and that this test will fail there.  This test should
-        # exempt such platforms (provided they return reasonable
-        # results!).
-        for insane in -1e200, 1e200:
-            self.assertRaises(OverflowError, self.theclass.fromtimestamp, insane)
-
-    def test_today(self):
-        import time
-
-        # We claim that today() is like fromtimestamp(time.time()), so
-        # prove it.
-        for dummy in range(3):
-            today = self.theclass.today()
-            ts = time.time()
-            todayagain = self.theclass.fromtimestamp(ts)
-            if today == todayagain:
-                break
-            # There are several legit reasons that could fail:
-            # 1. It recently became midnight, between the today() and the
-            #    time() calls.
-            # 2. The platform time() has such fine resolution that we'll
-            #    never get the same value twice.
-            # 3. The platform time() has poor resolution, and we just
-            #    happened to call today() right before a resolution quantum
-            #    boundary.
-            # 4. The system clock got fiddled between calls.
-            # In any case, wait a little while and try again.
-            time.sleep(0.1)
-
-        # It worked or it didn't.  If it didn't, assume it's reason #2, and
-        # let the test pass if they're within half a second of each other.
-        self.assertTrue(today == todayagain or abs(todayagain - today) < timedelta(seconds=0.5))
-
-    def test_weekday(self):
-        for i in range(7):
-            # March 4, 2002 is a Monday
-            self.assertEqual(self.theclass(2002, 3, 4 + i).weekday(), i)
-            self.assertEqual(self.theclass(2002, 3, 4 + i).isoweekday(), i + 1)
-            # January 2, 1956 is a Monday
-            self.assertEqual(self.theclass(1956, 1, 2 + i).weekday(), i)
-            self.assertEqual(self.theclass(1956, 1, 2 + i).isoweekday(), i + 1)
-
-    def test_isocalendar(self):
-        # Check examples from
-        # http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
-        for i in range(7):
-            d = self.theclass(2003, 12, 22 + i)
-            self.assertEqual(d.isocalendar(), (2003, 52, i + 1))
-            d = self.theclass(2003, 12, 29) + timedelta(i)
-            self.assertEqual(d.isocalendar(), (2004, 1, i + 1))
-            d = self.theclass(2004, 1, 5 + i)
-            self.assertEqual(d.isocalendar(), (2004, 2, i + 1))
-            d = self.theclass(2009, 12, 21 + i)
-            self.assertEqual(d.isocalendar(), (2009, 52, i + 1))
-            d = self.theclass(2009, 12, 28) + timedelta(i)
-            self.assertEqual(d.isocalendar(), (2009, 53, i + 1))
-            d = self.theclass(2010, 1, 4 + i)
-            self.assertEqual(d.isocalendar(), (2010, 1, i + 1))
-
-    def test_iso_long_years(self):
-        # Calculate long ISO years and compare to table from
-        # http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
-        ISO_LONG_YEARS_TABLE = """
-              4   32   60   88
-              9   37   65   93
-             15   43   71   99
-             20   48   76
-             26   54   82
-
-            105  133  161  189
-            111  139  167  195
-            116  144  172
-            122  150  178
-            128  156  184
-
-            201  229  257  285
-            207  235  263  291
-            212  240  268  296
-            218  246  274
-            224  252  280
-
-            303  331  359  387
-            308  336  364  392
-            314  342  370  398
-            320  348  376
-            325  353  381
-        """
-        iso_long_years = sorted(map(int, ISO_LONG_YEARS_TABLE.split()))
-        L = []
-        for i in range(400):
-            d = self.theclass(2000 + i, 12, 31)
-            d1 = self.theclass(1600 + i, 12, 31)
-            self.assertEqual(d.isocalendar()[1:], d1.isocalendar()[1:])
-            if d.isocalendar()[1] == 53:
-                L.append(i)
-        self.assertEqual(L, iso_long_years)
-
-    def test_isoformat(self):
-        t = self.theclass(2, 3, 2)
-        self.assertEqual(t.isoformat(), "0002-03-02")
-
-    def test_ctime(self):
-        t = self.theclass(2002, 3, 2)
-        self.assertEqual(t.ctime(), "Sat Mar  2 00:00:00 2002")
-
-    def test_strftime(self):
-        t = self.theclass(2005, 3, 2)
-        self.assertEqual(t.strftime("m:%m d:%d y:%y"), "m:03 d:02 y:05")
-        self.assertEqual(t.strftime(""), "")  # SF bug #761337
-        #        self.assertEqual(t.strftime('x'*1000), 'x'*1000) # SF bug #1556784
-
-        self.assertRaises(TypeError, t.strftime)  # needs an arg
-        self.assertRaises(TypeError, t.strftime, "one", "two")  # too many args
-        self.assertRaises(TypeError, t.strftime, 42)  # arg wrong type
-
-        # test that unicode input is allowed (issue 2782)
-        self.assertEqual(t.strftime("%m"), "03")
-
-        # A naive object replaces %z and %Z w/ empty strings.
-        self.assertEqual(t.strftime("'%z' '%Z'"), "'' ''")
-
-        # make sure that invalid format specifiers are handled correctly
-        # self.assertRaises(ValueError, t.strftime, "%e")
-        # self.assertRaises(ValueError, t.strftime, "%")
-        # self.assertRaises(ValueError, t.strftime, "%#")
-
-        # oh well, some systems just ignore those invalid ones.
-        # at least, excercise them to make sure that no crashes
-        # are generated
-        for f in ["%e", "%", "%#"]:
-            try:
-                t.strftime(f)
-            except ValueError:
-                pass
-
-        # check that this standard extension works
-        t.strftime("%f")
-
-    def test_format(self):
-        dt = self.theclass(2007, 9, 10)
-        self.assertEqual(dt.__format__(""), str(dt))
-
-        # check that a derived class's __str__() gets called
-        class A(self.theclass):
-            def __str__(self):
-                return "A"
-
-        a = A(2007, 9, 10)
-        self.assertEqual(a.__format__(""), "A")
-
-        # check that a derived class's strftime gets called
-        class B(self.theclass):
-            def strftime(self, format_spec):
-                return "B"
-
-        b = B(2007, 9, 10)
-        self.assertEqual(b.__format__(""), str(dt))
-
-        for fmt in [
-            "m:%m d:%d y:%y",
-            "m:%m d:%d y:%y H:%H M:%M S:%S",
-            "%z %Z",
-        ]:
-            self.assertEqual(dt.__format__(fmt), dt.strftime(fmt))
-            self.assertEqual(a.__format__(fmt), dt.strftime(fmt))
-            self.assertEqual(b.__format__(fmt), "B")
-
-    def test_resolution_info(self):
-        # XXX: Should min and max respect subclassing?
-        if issubclass(self.theclass, datetime):
-            expected_class = datetime
-        else:
-            expected_class = date
-        self.assertIsInstance(self.theclass.min, expected_class)
-        self.assertIsInstance(self.theclass.max, expected_class)
-        self.assertIsInstance(self.theclass.resolution, timedelta)
-        self.assertTrue(self.theclass.max > self.theclass.min)
-
-    def test_extreme_timedelta(self):
-        big = self.theclass.max - self.theclass.min
-        # 3652058 days, 23 hours, 59 minutes, 59 seconds, 999999 microseconds
-        n = (big.days * 24 * 3600 + big.seconds) * 1000000 + big.microseconds
-        # n == 315537897599999999 ~= 2**58.13
-        justasbig = timedelta(0, 0, n)
-        self.assertEqual(big, justasbig)
-        self.assertEqual(self.theclass.min + big, self.theclass.max)
-        self.assertEqual(self.theclass.max - big, self.theclass.min)
-
-    def test_timetuple(self):
-        for i in range(7):
-            # January 2, 1956 is a Monday (0)
-            d = self.theclass(1956, 1, 2 + i)
-            t = d.timetuple()
-            self.assertEqual(t, (1956, 1, 2 + i, 0, 0, 0, i, 2 + i, -1))
-            # February 1, 1956 is a Wednesday (2)
-            d = self.theclass(1956, 2, 1 + i)
-            t = d.timetuple()
-            self.assertEqual(t, (1956, 2, 1 + i, 0, 0, 0, (2 + i) % 7, 32 + i, -1))
-            # March 1, 1956 is a Thursday (3), and is the 31+29+1 = 61st day
-            # of the year.
-            d = self.theclass(1956, 3, 1 + i)
-            t = d.timetuple()
-            self.assertEqual(t, (1956, 3, 1 + i, 0, 0, 0, (3 + i) % 7, 61 + i, -1))
-            self.assertEqual(t.tm_year, 1956)
-            self.assertEqual(t.tm_mon, 3)
-            self.assertEqual(t.tm_mday, 1 + i)
-            self.assertEqual(t.tm_hour, 0)
-            self.assertEqual(t.tm_min, 0)
-            self.assertEqual(t.tm_sec, 0)
-            self.assertEqual(t.tm_wday, (3 + i) % 7)
-            self.assertEqual(t.tm_yday, 61 + i)
-            self.assertEqual(t.tm_isdst, -1)
-
-    def test_pickling(self):
-        args = 6, 7, 23
-        orig = self.theclass(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def test_compare(self):
-        t1 = self.theclass(2, 3, 4)
-        t2 = self.theclass(2, 3, 4)
-        self.assertEqual(t1, t2)
-        self.assertTrue(t1 <= t2)
-        self.assertTrue(t1 >= t2)
-        self.assertTrue(not t1 != t2)
-        self.assertTrue(not t1 < t2)
-        self.assertTrue(not t1 > t2)
-
-        for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
-            t2 = self.theclass(*args)  # this is larger than t1
-            self.assertTrue(t1 < t2)
-            self.assertTrue(t2 > t1)
-            self.assertTrue(t1 <= t2)
-            self.assertTrue(t2 >= t1)
-            self.assertTrue(t1 != t2)
-            self.assertTrue(t2 != t1)
-            self.assertTrue(not t1 == t2)
-            self.assertTrue(not t2 == t1)
-            self.assertTrue(not t1 > t2)
-            self.assertTrue(not t2 < t1)
-            self.assertTrue(not t1 >= t2)
-            self.assertTrue(not t2 <= t1)
-
-        for badarg in OTHERSTUFF:
-            self.assertEqual(t1 == badarg, False)
-            self.assertEqual(t1 != badarg, True)
-            self.assertEqual(badarg == t1, False)
-            self.assertEqual(badarg != t1, True)
-
-            self.assertRaises(TypeError, lambda: t1 < badarg)
-            self.assertRaises(TypeError, lambda: t1 > badarg)
-            self.assertRaises(TypeError, lambda: t1 >= badarg)
-            self.assertRaises(TypeError, lambda: badarg <= t1)
-            self.assertRaises(TypeError, lambda: badarg < t1)
-            self.assertRaises(TypeError, lambda: badarg > t1)
-            self.assertRaises(TypeError, lambda: badarg >= t1)
-
-    def test_mixed_compare(self):
-        our = self.theclass(2000, 4, 5)
-
-        # Our class can be compared for equality to other classes
-        self.assertEqual(our == 1, False)
-        self.assertEqual(1 == our, False)
-        self.assertEqual(our != 1, True)
-        self.assertEqual(1 != our, True)
-
-        # But the ordering is undefined
-        self.assertRaises(TypeError, lambda: our < 1)
-        self.assertRaises(TypeError, lambda: 1 < our)
-
-        # Repeat those tests with a different class
-
-        class SomeClass:
-            pass
-
-        their = SomeClass()
-        self.assertEqual(our == their, False)
-        self.assertEqual(their == our, False)
-        self.assertEqual(our != their, True)
-        self.assertEqual(their != our, True)
-        self.assertRaises(TypeError, lambda: our < their)
-        self.assertRaises(TypeError, lambda: their < our)
-
-        # However, if the other class explicitly defines ordering
-        # relative to our class, it is allowed to do so
-
-        class LargerThanAnything:
-            def __lt__(self, other):
-                return False
-
-            def __le__(self, other):
-                return isinstance(other, LargerThanAnything)
-
-            def __eq__(self, other):
-                return isinstance(other, LargerThanAnything)
-
-            def __ne__(self, other):
-                return not isinstance(other, LargerThanAnything)
-
-            def __gt__(self, other):
-                return not isinstance(other, LargerThanAnything)
-
-            def __ge__(self, other):
-                return True
-
-        their = LargerThanAnything()
-        self.assertEqual(our == their, False)
-        self.assertEqual(their == our, False)
-        self.assertEqual(our != their, True)
-        self.assertEqual(their != our, True)
-        #        self.assertEqual(our < their, True)
-        self.assertEqual(their < our, False)
-
-    def test_bool(self):
-        # All dates are considered true.
-        self.assertTrue(self.theclass.min)
-        self.assertTrue(self.theclass.max)
-
-    def test_strftime_y2k(self):
-        for y in (1, 49, 70, 99, 100, 999, 1000, 1970):
-            d = self.theclass(y, 1, 1)
-            # Issue 13305:  For years < 1000, the value is not always
-            # padded to 4 digits across platforms.  The C standard
-            # assumes year >= 1900, so it does not specify the number
-            # of digits.
-            if d.strftime("%Y") != "%04d" % y:
-                # Year 42 returns '42', not padded
-                self.assertEqual(d.strftime("%Y"), "%d" % y)
-                # '0042' is obtained anyway
-                self.assertEqual(d.strftime("%4Y"), "%04d" % y)
-
-    def test_replace(self):
-        cls = self.theclass
-        args = [1, 2, 3]
-        base = cls(*args)
-        self.assertEqual(base, base.replace())
-
-        i = 0
-        for name, newval in (("year", 2), ("month", 3), ("day", 4)):
-            newargs = args[:]
-            newargs[i] = newval
-            expected = cls(*newargs)
-            got = base.replace(**{name: newval})
-            self.assertEqual(expected, got)
-            i += 1
-
-        # Out of bounds.
-        base = cls(2000, 2, 29)
-        self.assertRaises(ValueError, base.replace, year=2001)
-
-    def test_subclass_date(self):
-        class C(self.theclass):
-            theAnswer = 42
-
-            def __new__(cls, *args, **kws):
-                temp = kws.copy()
-                extra = temp.pop("extra")
-                result = self.theclass.__new__(cls, *args, **temp)
-                result.extra = extra
-                return result
-
-            def newmeth(self, start):
-                return start + self.year + self.month
-
-        args = 2003, 4, 14
-
-        dt1 = self.theclass(*args)
-        dt2 = C(*args, **{"extra": 7})
-
-        self.assertEqual(dt2.__class__, C)
-        self.assertEqual(dt2.theAnswer, 42)
-        self.assertEqual(dt2.extra, 7)
-        self.assertEqual(dt1.toordinal(), dt2.toordinal())
-        self.assertEqual(dt2.newmeth(-7), dt1.year + dt1.month - 7)
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_pickling_subclass_date(self):
-
-        args = 6, 7, 23
-        orig = SubclassDate(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def test_backdoor_resistance(self):
-        # For fast unpickling, the constructor accepts a pickle byte string.
-        # This is a low-overhead backdoor.  A user can (by intent or
-        # mistake) pass a string directly, which (if it's the right length)
-        # will get treated like a pickle, and bypass the normal sanity
-        # checks in the constructor.  This can create insane objects.
-        # The constructor doesn't want to burn the time to validate all
-        # fields, but does check the month field.  This stops, e.g.,
-        # datetime.datetime('1995-03-25') from yielding an insane object.
-        base = b"1995-03-25"
-        if not issubclass(self.theclass, datetime):
-            base = base[:4]
-        for month_byte in b"9", b"\0", b"\r", b"\xff":
-            self.assertRaises(TypeError, self.theclass, base[:2] + month_byte + base[3:])
-        # Good bytes, but bad tzinfo:
-        self.assertRaises(TypeError, self.theclass, bytes([1] * len(base)), "EST")
-
-        for ord_byte in range(1, 13):
-            # This shouldn't blow up because of the month byte alone.  If
-            # the implementation changes to do more-careful checking, it may
-            # blow up because other fields are insane.
-            self.theclass(base[:2] + bytes([ord_byte]) + base[3:])
-
-
-#############################################################################
-# datetime tests
-
-
-class SubclassDatetime(datetime):
-    sub_var = 1
-
-
-class TestDateTime(TestDate):
-
-    theclass = datetime
-
-    def test_basic_attributes(self):
-        dt = self.theclass(2002, 3, 1, 12, 0)
-        self.assertEqual(dt.year, 2002)
-        self.assertEqual(dt.month, 3)
-        self.assertEqual(dt.day, 1)
-        self.assertEqual(dt.hour, 12)
-        self.assertEqual(dt.minute, 0)
-        self.assertEqual(dt.second, 0)
-        self.assertEqual(dt.microsecond, 0)
-
-    def test_basic_attributes_nonzero(self):
-        # Make sure all attributes are non-zero so bugs in
-        # bit-shifting access show up.
-        dt = self.theclass(2002, 3, 1, 12, 59, 59, 8000)
-        self.assertEqual(dt.year, 2002)
-        self.assertEqual(dt.month, 3)
-        self.assertEqual(dt.day, 1)
-        self.assertEqual(dt.hour, 12)
-        self.assertEqual(dt.minute, 59)
-        self.assertEqual(dt.second, 59)
-        self.assertEqual(dt.microsecond, 8000)
-
-    def test_roundtrip(self):
-        for dt in (self.theclass(1, 2, 3, 4, 5, 6, 7), self.theclass.now()):
-            # Verify dt -> string -> datetime identity.
-            s = repr(dt)
-            self.assertTrue(s.startswith("datetime."))
-            s = s[9:]
-            dt2 = eval(s)
-            self.assertEqual(dt, dt2)
-
-            # Verify identity via reconstructing from pieces.
-            dt2 = self.theclass(
-                dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.microsecond
-            )
-            self.assertEqual(dt, dt2)
-
-    def test_isoformat(self):
-        t = self.theclass(2, 3, 2, 4, 5, 1, 123)
-        self.assertEqual(t.isoformat(), "0002-03-02T04:05:01.000123")
-        self.assertEqual(t.isoformat("T"), "0002-03-02T04:05:01.000123")
-        self.assertEqual(t.isoformat(" "), "0002-03-02 04:05:01.000123")
-        self.assertEqual(t.isoformat("\x00"), "0002-03-02\x0004:05:01.000123")
-        # str is ISO format with the separator forced to a blank.
-        self.assertEqual(str(t), "0002-03-02 04:05:01.000123")
-
-        t = self.theclass(2, 3, 2)
-        self.assertEqual(t.isoformat(), "0002-03-02T00:00:00")
-        self.assertEqual(t.isoformat("T"), "0002-03-02T00:00:00")
-        self.assertEqual(t.isoformat(" "), "0002-03-02 00:00:00")
-        # str is ISO format with the separator forced to a blank.
-        self.assertEqual(str(t), "0002-03-02 00:00:00")
-
-    def test_format(self):
-        dt = self.theclass(2007, 9, 10, 4, 5, 1, 123)
-        self.assertEqual(dt.__format__(""), str(dt))
-
-        # check that a derived class's __str__() gets called
-        class A(self.theclass):
-            def __str__(self):
-                return "A"
-
-        a = A(2007, 9, 10, 4, 5, 1, 123)
-        self.assertEqual(a.__format__(""), "A")
-
-        # check that a derived class's strftime gets called
-        class B(self.theclass):
-            def strftime(self, format_spec):
-                return "B"
-
-        b = B(2007, 9, 10, 4, 5, 1, 123)
-        self.assertEqual(b.__format__(""), str(dt))
-
-        for fmt in [
-            "m:%m d:%d y:%y",
-            "m:%m d:%d y:%y H:%H M:%M S:%S",
-            "%z %Z",
-        ]:
-            self.assertEqual(dt.__format__(fmt), dt.strftime(fmt))
-            self.assertEqual(a.__format__(fmt), dt.strftime(fmt))
-            self.assertEqual(b.__format__(fmt), "B")
-
-    @unittest.skip("no time.ctime")
-    def test_more_ctime(self):
-        # Test fields that TestDate doesn't touch.
-        import time
-
-        t = self.theclass(2002, 3, 2, 18, 3, 5, 123)
-        self.assertEqual(t.ctime(), "Sat Mar  2 18:03:05 2002")
-        # Oops!  The next line fails on Win2K under MSVC 6, so it's commented
-        # out.  The difference is that t.ctime() produces " 2" for the day,
-        # but platform ctime() produces "02" for the day.  According to
-        # C99, t.ctime() is correct here.
-        # self.assertEqual(t.ctime(), time.ctime(time.mktime(t.timetuple())))
-
-        # So test a case where that difference doesn't matter.
-        t = self.theclass(2002, 3, 22, 18, 3, 5, 123)
-        self.assertEqual(t.ctime(), time.ctime(time.mktime(t.timetuple())))
-
-    def test_tz_independent_comparing(self):
-        dt1 = self.theclass(2002, 3, 1, 9, 0, 0)
-        dt2 = self.theclass(2002, 3, 1, 10, 0, 0)
-        dt3 = self.theclass(2002, 3, 1, 9, 0, 0)
-        self.assertEqual(dt1, dt3)
-        self.assertTrue(dt2 > dt3)
-
-        # Make sure comparison doesn't forget microseconds, and isn't done
-        # via comparing a float timestamp (an IEEE double doesn't have enough
-        # precision to span microsecond resolution across years 1 thru 9999,
-        # so comparing via timestamp necessarily calls some distinct values
-        # equal).
-        dt1 = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999998)
-        us = timedelta(microseconds=1)
-        dt2 = dt1 + us
-        self.assertEqual(dt2 - dt1, us)
-        self.assertTrue(dt1 < dt2)
-
-    def test_strftime_with_bad_tzname_replace(self):
-        # verify ok if tzinfo.tzname().replace() returns a non-string
-        class MyTzInfo(FixedOffset):
-            def tzname(self, dt):
-                class MyStr(str):
-                    def replace(self, *args):
-                        return None
-
-                return MyStr("name")
-
-        t = self.theclass(2005, 3, 2, 0, 0, 0, 0, MyTzInfo(3, "name"))
-        self.assertRaises(TypeError, t.strftime, "%Z")
-
-    def test_bad_constructor_arguments(self):
-        # bad years
-        self.theclass(MINYEAR, 1, 1)  # no exception
-        self.theclass(MAXYEAR, 1, 1)  # no exception
-        self.assertRaises(ValueError, self.theclass, MINYEAR - 1, 1, 1)
-        self.assertRaises(ValueError, self.theclass, MAXYEAR + 1, 1, 1)
-        # bad months
-        self.theclass(2000, 1, 1)  # no exception
-        self.theclass(2000, 12, 1)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 0, 1)
-        self.assertRaises(ValueError, self.theclass, 2000, 13, 1)
-        # bad days
-        self.theclass(2000, 2, 29)  # no exception
-        self.theclass(2004, 2, 29)  # no exception
-        self.theclass(2400, 2, 29)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 2, 30)
-        self.assertRaises(ValueError, self.theclass, 2001, 2, 29)
-        self.assertRaises(ValueError, self.theclass, 2100, 2, 29)
-        self.assertRaises(ValueError, self.theclass, 1900, 2, 29)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 0)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 32)
-        # bad hours
-        self.theclass(2000, 1, 31, 0)  # no exception
-        self.theclass(2000, 1, 31, 23)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, -1)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 24)
-        # bad minutes
-        self.theclass(2000, 1, 31, 23, 0)  # no exception
-        self.theclass(2000, 1, 31, 23, 59)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, -1)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 60)
-        # bad seconds
-        self.theclass(2000, 1, 31, 23, 59, 0)  # no exception
-        self.theclass(2000, 1, 31, 23, 59, 59)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, -1)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, 60)
-        # bad microseconds
-        self.theclass(2000, 1, 31, 23, 59, 59, 0)  # no exception
-        self.theclass(2000, 1, 31, 23, 59, 59, 999999)  # no exception
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, 59, -1)
-        self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, 59, 1000000)
-
-    def test_hash_equality(self):
-        d = self.theclass(2000, 12, 31, 23, 30, 17)
-        e = self.theclass(2000, 12, 31, 23, 30, 17)
-        self.assertEqual(d, e)
-        self.assertEqual(hash(d), hash(e))
-
-        dic = {d: 1}
-        dic[e] = 2
-        self.assertEqual(len(dic), 1)
-        self.assertEqual(dic[d], 2)
-        self.assertEqual(dic[e], 2)
-
-        d = self.theclass(2001, 1, 1, 0, 5, 17)
-        e = self.theclass(2001, 1, 1, 0, 5, 17)
-        self.assertEqual(d, e)
-        self.assertEqual(hash(d), hash(e))
-
-        dic = {d: 1}
-        dic[e] = 2
-        self.assertEqual(len(dic), 1)
-        self.assertEqual(dic[d], 2)
-        self.assertEqual(dic[e], 2)
-
-    def test_computations(self):
-        a = self.theclass(2002, 1, 31)
-        b = self.theclass(1956, 1, 31)
-        diff = a - b
-        self.assertEqual(diff.days, 46 * 365 + len(range(1956, 2002, 4)))
-        self.assertEqual(diff.seconds, 0)
-        self.assertEqual(diff.microseconds, 0)
-        a = self.theclass(2002, 3, 2, 17, 6)
-        millisec = timedelta(0, 0, 1000)
-        hour = timedelta(0, 3600)
-        day = timedelta(1)
-        week = timedelta(7)
-        self.assertEqual(a + hour, self.theclass(2002, 3, 2, 18, 6))
-        self.assertEqual(hour + a, self.theclass(2002, 3, 2, 18, 6))
-        self.assertEqual(a + 10 * hour, self.theclass(2002, 3, 3, 3, 6))
-        self.assertEqual(a - hour, self.theclass(2002, 3, 2, 16, 6))
-        self.assertEqual(-hour + a, self.theclass(2002, 3, 2, 16, 6))
-        self.assertEqual(a - hour, a + -hour)
-        self.assertEqual(a - 20 * hour, self.theclass(2002, 3, 1, 21, 6))
-        self.assertEqual(a + day, self.theclass(2002, 3, 3, 17, 6))
-        self.assertEqual(a - day, self.theclass(2002, 3, 1, 17, 6))
-        self.assertEqual(a + week, self.theclass(2002, 3, 9, 17, 6))
-        self.assertEqual(a - week, self.theclass(2002, 2, 23, 17, 6))
-        self.assertEqual(a + 52 * week, self.theclass(2003, 3, 1, 17, 6))
-        self.assertEqual(a - 52 * week, self.theclass(2001, 3, 3, 17, 6))
-        self.assertEqual((a + week) - a, week)
-        self.assertEqual((a + day) - a, day)
-        self.assertEqual((a + hour) - a, hour)
-        self.assertEqual((a + millisec) - a, millisec)
-        self.assertEqual((a - week) - a, -week)
-        self.assertEqual((a - day) - a, -day)
-        self.assertEqual((a - hour) - a, -hour)
-        self.assertEqual((a - millisec) - a, -millisec)
-        self.assertEqual(a - (a + week), -week)
-        self.assertEqual(a - (a + day), -day)
-        self.assertEqual(a - (a + hour), -hour)
-        self.assertEqual(a - (a + millisec), -millisec)
-        self.assertEqual(a - (a - week), week)
-        self.assertEqual(a - (a - day), day)
-        self.assertEqual(a - (a - hour), hour)
-        self.assertEqual(a - (a - millisec), millisec)
-        self.assertEqual(
-            a + (week + day + hour + millisec), self.theclass(2002, 3, 10, 18, 6, 0, 1000)
-        )
-        self.assertEqual(
-            a + (week + day + hour + millisec), (((a + week) + day) + hour) + millisec
-        )
-        self.assertEqual(
-            a - (week + day + hour + millisec), self.theclass(2002, 2, 22, 16, 5, 59, 999000)
-        )
-        self.assertEqual(
-            a - (week + day + hour + millisec), (((a - week) - day) - hour) - millisec
-        )
-        # Add/sub ints or floats should be illegal
-        for i in 1, 1.0:
-            self.assertRaises(TypeError, lambda: a + i)
-            self.assertRaises(TypeError, lambda: a - i)
-            self.assertRaises(TypeError, lambda: i + a)
-            self.assertRaises(TypeError, lambda: i - a)
-
-        # delta - datetime is senseless.
-        self.assertRaises(TypeError, lambda: day - a)
-        # mixing datetime and (delta or datetime) via * or // is senseless
-        self.assertRaises(TypeError, lambda: day * a)
-        self.assertRaises(TypeError, lambda: a * day)
-        self.assertRaises(TypeError, lambda: day // a)
-        self.assertRaises(TypeError, lambda: a // day)
-        self.assertRaises(TypeError, lambda: a * a)
-        self.assertRaises(TypeError, lambda: a // a)
-        # datetime + datetime is senseless
-        self.assertRaises(TypeError, lambda: a + a)
-
-    def test_pickling(self):
-        args = 6, 7, 23, 20, 59, 1, 64**2
-        orig = self.theclass(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def test_more_pickling(self):
-        a = self.theclass(2003, 2, 7, 16, 48, 37, 444116)
-        s = pickle.dumps(a)
-        b = pickle.loads(s)
-        self.assertEqual(b.year, 2003)
-        self.assertEqual(b.month, 2)
-        self.assertEqual(b.day, 7)
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_pickling_subclass_datetime(self):
-        args = 6, 7, 23, 20, 59, 1, 64**2
-        orig = SubclassDatetime(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def test_more_compare(self):
-        # The test_compare() inherited from TestDate covers the error cases.
-        # We just want to test lexicographic ordering on the members datetime
-        # has that date lacks.
-        args = [2000, 11, 29, 20, 58, 16, 999998]
-        t1 = self.theclass(*args)
-        t2 = self.theclass(*args)
-        self.assertEqual(t1, t2)
-        self.assertTrue(t1 <= t2)
-        self.assertTrue(t1 >= t2)
-        self.assertTrue(not t1 != t2)
-        self.assertTrue(not t1 < t2)
-        self.assertTrue(not t1 > t2)
-
-        for i in range(len(args)):
-            newargs = args[:]
-            newargs[i] = args[i] + 1
-            t2 = self.theclass(*newargs)  # this is larger than t1
-            self.assertTrue(t1 < t2)
-            self.assertTrue(t2 > t1)
-            self.assertTrue(t1 <= t2)
-            self.assertTrue(t2 >= t1)
-            self.assertTrue(t1 != t2)
-            self.assertTrue(t2 != t1)
-            self.assertTrue(not t1 == t2)
-            self.assertTrue(not t2 == t1)
-            self.assertTrue(not t1 > t2)
-            self.assertTrue(not t2 < t1)
-            self.assertTrue(not t1 >= t2)
-            self.assertTrue(not t2 <= t1)
-
-    # A helper for timestamp constructor tests.
-    def verify_field_equality(self, expected, got):
-        self.assertEqual(expected.tm_year, got.year)
-        self.assertEqual(expected.tm_mon, got.month)
-        self.assertEqual(expected.tm_mday, got.day)
-        self.assertEqual(expected.tm_hour, got.hour)
-        self.assertEqual(expected.tm_min, got.minute)
-        self.assertEqual(expected.tm_sec, got.second)
-
-    def test_fromtimestamp(self):
-        import time
-
-        ts = time.time()
-        expected = time.localtime(ts)
-        got = self.theclass.fromtimestamp(ts)
-        self.verify_field_equality(expected, got)
-
-    def test_utcfromtimestamp(self):
-        import time
-
-        ts = time.time()
-        expected = time.gmtime(ts)
-        got = self.theclass.utcfromtimestamp(ts)
-        self.verify_field_equality(expected, got)
-
-    # Run with US-style DST rules: DST begins 2 a.m. on second Sunday in
-    # March (M3.2.0) and ends 2 a.m. on first Sunday in November (M11.1.0).
-    #    @support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
-    @unittest.skip("no support.run_with_tz")
-    def test_timestamp_naive(self):
-        t = self.theclass(1970, 1, 1)
-        self.assertEqual(t.timestamp(), 18000.0)
-        t = self.theclass(1970, 1, 1, 1, 2, 3, 4)
-        self.assertEqual(t.timestamp(), 18000.0 + 3600 + 2 * 60 + 3 + 4 * 1e-6)
-        # Missing hour may produce platform-dependent result
-        t = self.theclass(2012, 3, 11, 2, 30)
-        self.assertIn(
-            self.theclass.fromtimestamp(t.timestamp()),
-            [t - timedelta(hours=1), t + timedelta(hours=1)],
-        )
-        # Ambiguous hour defaults to DST
-        t = self.theclass(2012, 11, 4, 1, 30)
-        self.assertEqual(self.theclass.fromtimestamp(t.timestamp()), t)
-
-        # Timestamp may raise an overflow error on some platforms
-        for t in [self.theclass(1, 1, 1), self.theclass(9999, 12, 12)]:
-            try:
-                s = t.timestamp()
-            except OverflowError:
-                pass
-            else:
-                self.assertEqual(self.theclass.fromtimestamp(s), t)
-
-    def test_timestamp_aware(self):
-        t = self.theclass(1970, 1, 1, tzinfo=timezone.utc)
-        self.assertEqual(t.timestamp(), 0.0)
-        t = self.theclass(1970, 1, 1, 1, 2, 3, 4, tzinfo=timezone.utc)
-        self.assertEqual(t.timestamp(), 3600 + 2 * 60 + 3 + 4 * 1e-6)
-        t = self.theclass(1970, 1, 1, 1, 2, 3, 4, tzinfo=timezone(timedelta(hours=-5), "EST"))
-        self.assertEqual(t.timestamp(), 18000 + 3600 + 2 * 60 + 3 + 4 * 1e-6)
-
-    def test_microsecond_rounding(self):
-        for fts in [self.theclass.fromtimestamp, self.theclass.utcfromtimestamp]:
-            zero = fts(0)
-            self.assertEqual(zero.second, 0)
-            self.assertEqual(zero.microsecond, 0)
-            try:
-                minus_one = fts(-1e-6)
-            except OSError:
-                # localtime(-1) and gmtime(-1) is not supported on Windows
-                pass
-            else:
-                self.assertEqual(minus_one.second, 59)
-                self.assertEqual(minus_one.microsecond, 999999)
-
-                t = fts(-1e-8)
-                self.assertEqual(t, minus_one)
-                t = fts(-9e-7)
-                self.assertEqual(t, minus_one)
-                t = fts(-1e-7)
-                self.assertEqual(t, minus_one)
-
-            t = fts(1e-7)
-            self.assertEqual(t, zero)
-            t = fts(9e-7)
-            self.assertEqual(t, zero)
-            t = fts(0.99999949)
-            self.assertEqual(t.second, 0)
-            self.assertEqual(t.microsecond, 999999)
-            t = fts(0.9999999)
-            self.assertEqual(t.second, 0)
-            self.assertEqual(t.microsecond, 999999)
-
-    @unittest.skip("Skip for MicroPython")
-    def test_insane_fromtimestamp(self):
-        # It's possible that some platform maps time_t to double,
-        # and that this test will fail there.  This test should
-        # exempt such platforms (provided they return reasonable
-        # results!).
-        for insane in -1e200, 1e200:
-            self.assertRaises(OverflowError, self.theclass.fromtimestamp, insane)
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_insane_utcfromtimestamp(self):
-        # It's possible that some platform maps time_t to double,
-        # and that this test will fail there.  This test should
-        # exempt such platforms (provided they return reasonable
-        # results!).
-        for insane in -1e200, 1e200:
-            self.assertRaises(OverflowError, self.theclass.utcfromtimestamp, insane)
-
-    @unittest.skipIf(sys.platform == "win32", "Windows doesn't accept negative timestamps")
-    def test_negative_float_fromtimestamp(self):
-        # The result is tz-dependent; at least test that this doesn't
-        # fail (like it did before bug 1646728 was fixed).
-        self.theclass.fromtimestamp(-1.05)
-
-    @unittest.skipIf(sys.platform == "win32", "Windows doesn't accept negative timestamps")
-    def test_negative_float_utcfromtimestamp(self):
-        d = self.theclass.utcfromtimestamp(-1.05)
-        self.assertEqual(d, self.theclass(1969, 12, 31, 23, 59, 58, 950000))
-
-    def test_utcnow(self):
-        import time
-
-        # Call it a success if utcnow() and utcfromtimestamp() are within
-        # a second of each other.
-        tolerance = timedelta(seconds=1)
-        for dummy in range(3):
-            from_now = self.theclass.utcnow()
-            from_timestamp = self.theclass.utcfromtimestamp(time.time())
-            if abs(from_timestamp - from_now) <= tolerance:
-                break
-            # Else try again a few times.
-        self.assertTrue(abs(from_timestamp - from_now) <= tolerance)
-
-    @unittest.skip("no _strptime module")
-    def test_strptime(self):
-        string = "2004-12-01 13:02:47.197"
-        format = "%Y-%m-%d %H:%M:%S.%f"
-        expected = _strptime._strptime_datetime(self.theclass, string, format)
-        got = self.theclass.strptime(string, format)
-        self.assertEqual(expected, got)
-        self.assertIs(type(expected), self.theclass)
-        self.assertIs(type(got), self.theclass)
-
-        strptime = self.theclass.strptime
-        self.assertEqual(strptime("+0002", "%z").utcoffset(), 2 * MINUTE)
-        self.assertEqual(strptime("-0002", "%z").utcoffset(), -2 * MINUTE)
-        # Only local timezone and UTC are supported
-        for tzseconds, tzname in ((0, "UTC"), (0, "GMT"), (-_time.timezone, _time.tzname[0])):
-            if tzseconds < 0:
-                sign = "-"
-                seconds = -tzseconds
-            else:
-                sign = "+"
-                seconds = tzseconds
-            hours, minutes = divmod(seconds // 60, 60)
-            dtstr = "{}{:02d}{:02d} {}".format(sign, hours, minutes, tzname)
-            dt = strptime(dtstr, "%z %Z")
-            self.assertEqual(dt.utcoffset(), timedelta(seconds=tzseconds))
-            self.assertEqual(dt.tzname(), tzname)
-        # Can produce inconsistent datetime
-        dtstr, fmt = "+1234 UTC", "%z %Z"
-        dt = strptime(dtstr, fmt)
-        self.assertEqual(dt.utcoffset(), 12 * HOUR + 34 * MINUTE)
-        self.assertEqual(dt.tzname(), "UTC")
-        # yet will roundtrip
-        self.assertEqual(dt.strftime(fmt), dtstr)
-
-        # Produce naive datetime if no %z is provided
-        self.assertEqual(strptime("UTC", "%Z").tzinfo, None)
-
-        with self.assertRaises(ValueError):
-            strptime("-2400", "%z")
-        with self.assertRaises(ValueError):
-            strptime("-000", "%z")
-
-    def test_more_timetuple(self):
-        # This tests fields beyond those tested by the TestDate.test_timetuple.
-        t = self.theclass(2004, 12, 31, 6, 22, 33)
-        self.assertEqual(t.timetuple(), (2004, 12, 31, 6, 22, 33, 4, 366, -1))
-        self.assertEqual(
-            t.timetuple(),
-            (
-                t.year,
-                t.month,
-                t.day,
-                t.hour,
-                t.minute,
-                t.second,
-                t.weekday(),
-                t.toordinal() - date(t.year, 1, 1).toordinal() + 1,
-                -1,
-            ),
-        )
-        tt = t.timetuple()
-        self.assertEqual(tt.tm_year, t.year)
-        self.assertEqual(tt.tm_mon, t.month)
-        self.assertEqual(tt.tm_mday, t.day)
-        self.assertEqual(tt.tm_hour, t.hour)
-        self.assertEqual(tt.tm_min, t.minute)
-        self.assertEqual(tt.tm_sec, t.second)
-        self.assertEqual(tt.tm_wday, t.weekday())
-        self.assertEqual(tt.tm_yday, t.toordinal() - date(t.year, 1, 1).toordinal() + 1)
-        self.assertEqual(tt.tm_isdst, -1)
-
-    def test_more_strftime(self):
-        # This tests fields beyond those tested by the TestDate.test_strftime.
-        t = self.theclass(2004, 12, 31, 6, 22, 33, 47)
-        self.assertEqual(t.strftime("%m %d %y %f %S %M %H %j"), "12 31 04 000047 33 22 06 366")
-
-    def test_extract(self):
-        dt = self.theclass(2002, 3, 4, 18, 45, 3, 1234)
-        self.assertEqual(dt.date(), date(2002, 3, 4))
-        self.assertEqual(dt.time(), time(18, 45, 3, 1234))
-
-    def test_combine(self):
-        d = date(2002, 3, 4)
-        t = time(18, 45, 3, 1234)
-        expected = self.theclass(2002, 3, 4, 18, 45, 3, 1234)
-        combine = self.theclass.combine
-        dt = combine(d, t)
-        self.assertEqual(dt, expected)
-
-        dt = combine(time=t, date=d)
-        self.assertEqual(dt, expected)
-
-        self.assertEqual(d, dt.date())
-        self.assertEqual(t, dt.time())
-        self.assertEqual(dt, combine(dt.date(), dt.time()))
-
-        self.assertRaises(TypeError, combine)  # need an arg
-        self.assertRaises(TypeError, combine, d)  # need two args
-        self.assertRaises(TypeError, combine, t, d)  # args reversed
-        self.assertRaises(TypeError, combine, d, t, 1)  # too many args
-        self.assertRaises(TypeError, combine, "date", "time")  # wrong types
-        self.assertRaises(TypeError, combine, d, "time")  # wrong type
-        self.assertRaises(TypeError, combine, "date", t)  # wrong type
-
-    def test_replace(self):
-        cls = self.theclass
-        args = [1, 2, 3, 4, 5, 6, 7]
-        base = cls(*args)
-        self.assertEqual(base, base.replace())
-
-        i = 0
-        for name, newval in (
-            ("year", 2),
-            ("month", 3),
-            ("day", 4),
-            ("hour", 5),
-            ("minute", 6),
-            ("second", 7),
-            ("microsecond", 8),
-        ):
-            newargs = args[:]
-            newargs[i] = newval
-            expected = cls(*newargs)
-            got = base.replace(**{name: newval})
-            self.assertEqual(expected, got)
-            i += 1
-
-        # Out of bounds.
-        base = cls(2000, 2, 29)
-        self.assertRaises(ValueError, base.replace, year=2001)
-
-    def test_astimezone(self):
-        # Pretty boring!  The TZ test is more interesting here.  astimezone()
-        # simply can't be applied to a naive object.
-        dt = self.theclass.now()
-        f = FixedOffset(44, "")
-        self.assertRaises(ValueError, dt.astimezone)  # naive
-        self.assertRaises(TypeError, dt.astimezone, f, f)  # too many args
-        self.assertRaises(TypeError, dt.astimezone, dt)  # arg wrong type
-        self.assertRaises(ValueError, dt.astimezone, f)  # naive
-        self.assertRaises(ValueError, dt.astimezone, tz=f)  # naive
-
-        class Bogus(tzinfo):
-            def utcoffset(self, dt):
-                return None
-
-            def dst(self, dt):
-                return timedelta(0)
-
-        bog = Bogus()
-        self.assertRaises(ValueError, dt.astimezone, bog)  # naive
-        self.assertRaises(ValueError, dt.replace(tzinfo=bog).astimezone, f)
-
-        class AlsoBogus(tzinfo):
-            def utcoffset(self, dt):
-                return timedelta(0)
-
-            def dst(self, dt):
-                return None
-
-        alsobog = AlsoBogus()
-        self.assertRaises(ValueError, dt.astimezone, alsobog)  # also naive
-
-    def test_subclass_datetime(self):
-        class C(self.theclass):
-            theAnswer = 42
-
-            def __new__(cls, *args, **kws):
-                temp = kws.copy()
-                extra = temp.pop("extra")
-                result = self.theclass.__new__(cls, *args, **temp)
-                result.extra = extra
-                return result
-
-            def newmeth(self, start):
-                return start + self.year + self.month + self.second
-
-        args = 2003, 4, 14, 12, 13, 41
-
-        dt1 = self.theclass(*args)
-        dt2 = C(*args, **{"extra": 7})
-
-        self.assertEqual(dt2.__class__, C)
-        self.assertEqual(dt2.theAnswer, 42)
-        self.assertEqual(dt2.extra, 7)
-        self.assertEqual(dt1.toordinal(), dt2.toordinal())
-        self.assertEqual(dt2.newmeth(-7), dt1.year + dt1.month + dt1.second - 7)
-
-
-class TestSubclassDateTime(TestDateTime):
-    theclass = SubclassDatetime
-    # Override tests not designed for subclass
-    def test_roundtrip(self):
-        pass
-
-
-class SubclassTime(time):
-    sub_var = 1
-
-
-class TestTime(HarmlessMixedComparison, unittest.TestCase):
-
-    theclass = time
-
-    def test_basic_attributes(self):
-        t = self.theclass(12, 0)
-        self.assertEqual(t.hour, 12)
-        self.assertEqual(t.minute, 0)
-        self.assertEqual(t.second, 0)
-        self.assertEqual(t.microsecond, 0)
-
-    def test_basic_attributes_nonzero(self):
-        # Make sure all attributes are non-zero so bugs in
-        # bit-shifting access show up.
-        t = self.theclass(12, 59, 59, 8000)
-        self.assertEqual(t.hour, 12)
-        self.assertEqual(t.minute, 59)
-        self.assertEqual(t.second, 59)
-        self.assertEqual(t.microsecond, 8000)
-
-    def test_roundtrip(self):
-        t = self.theclass(1, 2, 3, 4)
-
-        # Verify t -> string -> time identity.
-        s = repr(t)
-        self.assertTrue(s.startswith("datetime."))
-        s = s[9:]
-        t2 = eval(s)
-        self.assertEqual(t, t2)
-
-        # Verify identity via reconstructing from pieces.
-        t2 = self.theclass(t.hour, t.minute, t.second, t.microsecond)
-        self.assertEqual(t, t2)
-
-    def test_comparing(self):
-        args = [1, 2, 3, 4]
-        t1 = self.theclass(*args)
-        t2 = self.theclass(*args)
-        self.assertEqual(t1, t2)
-        self.assertTrue(t1 <= t2)
-        self.assertTrue(t1 >= t2)
-        self.assertTrue(not t1 != t2)
-        self.assertTrue(not t1 < t2)
-        self.assertTrue(not t1 > t2)
-
-        for i in range(len(args)):
-            newargs = args[:]
-            newargs[i] = args[i] + 1
-            t2 = self.theclass(*newargs)  # this is larger than t1
-            self.assertTrue(t1 < t2)
-            self.assertTrue(t2 > t1)
-            self.assertTrue(t1 <= t2)
-            self.assertTrue(t2 >= t1)
-            self.assertTrue(t1 != t2)
-            self.assertTrue(t2 != t1)
-            self.assertTrue(not t1 == t2)
-            self.assertTrue(not t2 == t1)
-            self.assertTrue(not t1 > t2)
-            self.assertTrue(not t2 < t1)
-            self.assertTrue(not t1 >= t2)
-            self.assertTrue(not t2 <= t1)
-
-        for badarg in OTHERSTUFF:
-            self.assertEqual(t1 == badarg, False)
-            self.assertEqual(t1 != badarg, True)
-            self.assertEqual(badarg == t1, False)
-            self.assertEqual(badarg != t1, True)
-
-            self.assertRaises(TypeError, lambda: t1 <= badarg)
-            self.assertRaises(TypeError, lambda: t1 < badarg)
-            self.assertRaises(TypeError, lambda: t1 > badarg)
-            self.assertRaises(TypeError, lambda: t1 >= badarg)
-            self.assertRaises(TypeError, lambda: badarg <= t1)
-            self.assertRaises(TypeError, lambda: badarg < t1)
-            self.assertRaises(TypeError, lambda: badarg > t1)
-            self.assertRaises(TypeError, lambda: badarg >= t1)
-
-    def test_bad_constructor_arguments(self):
-        # bad hours
-        self.theclass(0, 0)  # no exception
-        self.theclass(23, 0)  # no exception
-        self.assertRaises(ValueError, self.theclass, -1, 0)
-        self.assertRaises(ValueError, self.theclass, 24, 0)
-        # bad minutes
-        self.theclass(23, 0)  # no exception
-        self.theclass(23, 59)  # no exception
-        self.assertRaises(ValueError, self.theclass, 23, -1)
-        self.assertRaises(ValueError, self.theclass, 23, 60)
-        # bad seconds
-        self.theclass(23, 59, 0)  # no exception
-        self.theclass(23, 59, 59)  # no exception
-        self.assertRaises(ValueError, self.theclass, 23, 59, -1)
-        self.assertRaises(ValueError, self.theclass, 23, 59, 60)
-        # bad microseconds
-        self.theclass(23, 59, 59, 0)  # no exception
-        self.theclass(23, 59, 59, 999999)  # no exception
-        self.assertRaises(ValueError, self.theclass, 23, 59, 59, -1)
-        self.assertRaises(ValueError, self.theclass, 23, 59, 59, 1000000)
-
-    def test_hash_equality(self):
-        d = self.theclass(23, 30, 17)
-        e = self.theclass(23, 30, 17)
-        self.assertEqual(d, e)
-        self.assertEqual(hash(d), hash(e))
-
-        dic = {d: 1}
-        dic[e] = 2
-        self.assertEqual(len(dic), 1)
-        self.assertEqual(dic[d], 2)
-        self.assertEqual(dic[e], 2)
-
-        d = self.theclass(0, 5, 17)
-        e = self.theclass(0, 5, 17)
-        self.assertEqual(d, e)
-        self.assertEqual(hash(d), hash(e))
-
-        dic = {d: 1}
-        dic[e] = 2
-        self.assertEqual(len(dic), 1)
-        self.assertEqual(dic[d], 2)
-        self.assertEqual(dic[e], 2)
-
-    def test_isoformat(self):
-        t = self.theclass(4, 5, 1, 123)
-        self.assertEqual(t.isoformat(), "04:05:01.000123")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass()
-        self.assertEqual(t.isoformat(), "00:00:00")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass(microsecond=1)
-        self.assertEqual(t.isoformat(), "00:00:00.000001")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass(microsecond=10)
-        self.assertEqual(t.isoformat(), "00:00:00.000010")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass(microsecond=100)
-        self.assertEqual(t.isoformat(), "00:00:00.000100")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass(microsecond=1000)
-        self.assertEqual(t.isoformat(), "00:00:00.001000")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass(microsecond=10000)
-        self.assertEqual(t.isoformat(), "00:00:00.010000")
-        self.assertEqual(t.isoformat(), str(t))
-
-        t = self.theclass(microsecond=100000)
-        self.assertEqual(t.isoformat(), "00:00:00.100000")
-        self.assertEqual(t.isoformat(), str(t))
-
-    def test_1653736(self):
-        # verify it doesn't accept extra keyword arguments
-        t = self.theclass(second=1)
-        self.assertRaises(TypeError, t.isoformat, foo=3)
-
-    def test_strftime(self):
-        t = self.theclass(1, 2, 3, 4)
-        self.assertEqual(t.strftime("%H %M %S %f"), "01 02 03 000004")
-        # A naive object replaces %z and %Z with empty strings.
-        self.assertEqual(t.strftime("'%z' '%Z'"), "'' ''")
-
-    def test_format(self):
-        t = self.theclass(1, 2, 3, 4)
-        self.assertEqual(t.__format__(""), str(t))
-
-        # check that a derived class's __str__() gets called
-        class A(self.theclass):
-            def __str__(self):
-                return "A"
-
-        a = A(1, 2, 3, 4)
-        self.assertEqual(a.__format__(""), "A")
-
-        # check that a derived class's strftime gets called
-        class B(self.theclass):
-            def strftime(self, format_spec):
-                return "B"
-
-        b = B(1, 2, 3, 4)
-        self.assertEqual(b.__format__(""), str(t))
-
-        for fmt in [
-            "%H %M %S",
-        ]:
-            self.assertEqual(t.__format__(fmt), t.strftime(fmt))
-            self.assertEqual(a.__format__(fmt), t.strftime(fmt))
-            self.assertEqual(b.__format__(fmt), "B")
-
-    def test_str(self):
-        self.assertEqual(str(self.theclass(1, 2, 3, 4)), "01:02:03.000004")
-        self.assertEqual(str(self.theclass(10, 2, 3, 4000)), "10:02:03.004000")
-        self.assertEqual(str(self.theclass(0, 2, 3, 400000)), "00:02:03.400000")
-        self.assertEqual(str(self.theclass(12, 2, 3, 0)), "12:02:03")
-        self.assertEqual(str(self.theclass(23, 15, 0, 0)), "23:15:00")
-
-    def test_repr(self):
-        name = "datetime." + self.theclass.__name__
-        self.assertEqual(repr(self.theclass(1, 2, 3, 4)), "%s(1, 2, 3, 4)" % name)
-        self.assertEqual(repr(self.theclass(10, 2, 3, 4000)), "%s(10, 2, 3, 4000)" % name)
-        self.assertEqual(repr(self.theclass(0, 2, 3, 400000)), "%s(0, 2, 3, 400000)" % name)
-        self.assertEqual(repr(self.theclass(12, 2, 3, 0)), "%s(12, 2, 3)" % name)
-        self.assertEqual(repr(self.theclass(23, 15, 0, 0)), "%s(23, 15)" % name)
-
-    def test_resolution_info(self):
-        self.assertIsInstance(self.theclass.min, self.theclass)
-        self.assertIsInstance(self.theclass.max, self.theclass)
-        self.assertIsInstance(self.theclass.resolution, timedelta)
-        self.assertTrue(self.theclass.max > self.theclass.min)
-
-    def test_pickling(self):
-        args = 20, 59, 16, 64**2
-        orig = self.theclass(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    @unittest.skip("Skip pickling for MicroPython")
-    def test_pickling_subclass_time(self):
-        args = 20, 59, 16, 64**2
-        orig = SubclassTime(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def test_bool(self):
-        cls = self.theclass
-        self.assertTrue(cls(1))
-        self.assertTrue(cls(0, 1))
-        self.assertTrue(cls(0, 0, 1))
-        self.assertTrue(cls(0, 0, 0, 1))
-        self.assertTrue(not cls(0))
-        self.assertTrue(not cls())
-
-    def test_replace(self):
-        cls = self.theclass
-        args = [1, 2, 3, 4]
-        base = cls(*args)
-        self.assertEqual(base, base.replace())
-
-        i = 0
-        for name, newval in (("hour", 5), ("minute", 6), ("second", 7), ("microsecond", 8)):
-            newargs = args[:]
-            newargs[i] = newval
-            expected = cls(*newargs)
-            got = base.replace(**{name: newval})
-            self.assertEqual(expected, got)
-            i += 1
-
-        # Out of bounds.
-        base = cls(1)
-        self.assertRaises(ValueError, base.replace, hour=24)
-        self.assertRaises(ValueError, base.replace, minute=-1)
-        self.assertRaises(ValueError, base.replace, second=100)
-        self.assertRaises(ValueError, base.replace, microsecond=1000000)
-
-    def test_subclass_time(self):
-        class C(self.theclass):
-            theAnswer = 42
-
-            def __new__(cls, *args, **kws):
-                temp = kws.copy()
-                extra = temp.pop("extra")
-                result = self.theclass.__new__(cls, *args, **temp)
-                result.extra = extra
-                return result
-
-            def newmeth(self, start):
-                return start + self.hour + self.second
-
-        args = 4, 5, 6
-
-        dt1 = self.theclass(*args)
-        dt2 = C(*args, **{"extra": 7})
-
-        self.assertEqual(dt2.__class__, C)
-        self.assertEqual(dt2.theAnswer, 42)
-        self.assertEqual(dt2.extra, 7)
-        self.assertEqual(dt1.isoformat(), dt2.isoformat())
-        self.assertEqual(dt2.newmeth(-7), dt1.hour + dt1.second - 7)
-
-    def test_backdoor_resistance(self):
-        # see TestDate.test_backdoor_resistance().
-        base = "2:59.0"
-        for hour_byte in " ", "9", chr(24), "\xff":
-            self.assertRaises(TypeError, self.theclass, hour_byte + base[1:])
-
-
-# A mixin for classes with a tzinfo= argument.  Subclasses must define
-# theclass as a class atribute, and theclass(1, 1, 1, tzinfo=whatever)
-# must be legit (which is true for time and datetime).
-class TZInfoBase:
-    def test_argument_passing(self):
-        cls = self.theclass
-        # A datetime passes itself on, a time passes None.
-        class introspective(tzinfo):
-            def tzname(self, dt):
-                return dt and "real" or "none"
-
-            def utcoffset(self, dt):
-                return timedelta(minutes=dt and 42 or -42)
-
-            dst = utcoffset
-
-        obj = cls(1, 2, 3, tzinfo=introspective())
-
-        expected = cls is time and "none" or "real"
-        self.assertEqual(obj.tzname(), expected)
-
-        expected = timedelta(minutes=(cls is time and -42 or 42))
-        self.assertEqual(obj.utcoffset(), expected)
-        self.assertEqual(obj.dst(), expected)
-
-    def test_bad_tzinfo_classes(self):
-        cls = self.theclass
-        self.assertRaises(TypeError, cls, 1, 1, 1, tzinfo=12)
-
-        class NiceTry(object):
-            def __init__(self):
-                pass
-
-            def utcoffset(self, dt):
-                pass
-
-        self.assertRaises(TypeError, cls, 1, 1, 1, tzinfo=NiceTry)
-
-        class BetterTry(tzinfo):
-            def __init__(self):
-                pass
-
-            def utcoffset(self, dt):
-                pass
-
-        b = BetterTry()
-        t = cls(1, 1, 1, tzinfo=b)
-        self.assertTrue(t.tzinfo is b)
-
-    def test_utc_offset_out_of_bounds(self):
-        class Edgy(tzinfo):
-            def __init__(self, offset):
-                self.offset = timedelta(minutes=offset)
-
-            def utcoffset(self, dt):
-                return self.offset
-
-        cls = self.theclass
-        for offset, legit in ((-1440, False), (-1439, True), (1439, True), (1440, False)):
-            if cls is time:
-                t = cls(1, 2, 3, tzinfo=Edgy(offset))
-            elif cls is datetime:
-                t = cls(6, 6, 6, 1, 2, 3, tzinfo=Edgy(offset))
-            else:
-                assert 0, "impossible"
-            if legit:
-                aofs = abs(offset)
-                h, m = divmod(aofs, 60)
-                tag = "%c%02d:%02d" % (offset < 0 and "-" or "+", h, m)
-                if isinstance(t, datetime):
-                    t = t.timetz()
-                self.assertEqual(str(t), "01:02:03" + tag)
-            else:
-                self.assertRaises(ValueError, str, t)
-
-    def test_tzinfo_classes(self):
-        cls = self.theclass
-
-        class C1(tzinfo):
-            def utcoffset(self, dt):
-                return None
-
-            def dst(self, dt):
-                return None
-
-            def tzname(self, dt):
-                return None
-
-        for t in (cls(1, 1, 1), cls(1, 1, 1, tzinfo=None), cls(1, 1, 1, tzinfo=C1())):
-            self.assertTrue(t.utcoffset() is None)
-            self.assertTrue(t.dst() is None)
-            self.assertTrue(t.tzname() is None)
-
-        class C3(tzinfo):
-            def utcoffset(self, dt):
-                return timedelta(minutes=-1439)
-
-            def dst(self, dt):
-                return timedelta(minutes=1439)
-
-            def tzname(self, dt):
-                return "aname"
-
-        t = cls(1, 1, 1, tzinfo=C3())
-        self.assertEqual(t.utcoffset(), timedelta(minutes=-1439))
-        self.assertEqual(t.dst(), timedelta(minutes=1439))
-        self.assertEqual(t.tzname(), "aname")
-
-        # Wrong types.
-        class C4(tzinfo):
-            def utcoffset(self, dt):
-                return "aname"
-
-            def dst(self, dt):
-                return 7
-
-            def tzname(self, dt):
-                return 0
-
-        t = cls(1, 1, 1, tzinfo=C4())
-        self.assertRaises(TypeError, t.utcoffset)
-        self.assertRaises(TypeError, t.dst)
-        self.assertRaises(TypeError, t.tzname)
-
-        # Offset out of range.
-        class C6(tzinfo):
-            def utcoffset(self, dt):
-                return timedelta(hours=-24)
-
-            def dst(self, dt):
-                return timedelta(hours=24)
-
-        t = cls(1, 1, 1, tzinfo=C6())
-        self.assertRaises(ValueError, t.utcoffset)
-        self.assertRaises(ValueError, t.dst)
-
-        # Not a whole number of minutes.
-        class C7(tzinfo):
-            def utcoffset(self, dt):
-                return timedelta(seconds=61)
-
-            def dst(self, dt):
-                return timedelta(microseconds=-81)
-
-        t = cls(1, 1, 1, tzinfo=C7())
-        self.assertRaises(ValueError, t.utcoffset)
-        self.assertRaises(ValueError, t.dst)
-
-    def test_aware_compare(self):
-        cls = self.theclass
-
-        # Ensure that utcoffset() gets ignored if the comparands have
-        # the same tzinfo member.
-        class OperandDependentOffset(tzinfo):
-            def utcoffset(self, t):
-                if t.minute < 10:
-                    # d0 and d1 equal after adjustment
-                    return timedelta(minutes=t.minute)
-                else:
-                    # d2 off in the weeds
-                    return timedelta(minutes=59)
-
-        base = cls(8, 9, 10, tzinfo=OperandDependentOffset())
-        d0 = base.replace(minute=3)
-        d1 = base.replace(minute=9)
-        d2 = base.replace(minute=11)
-        for x in d0, d1, d2:
-            for y in d0, d1, d2:
-                for op in lt, le, gt, ge, eq, ne:
-                    got = op(x, y)
-                    expected = op(x.minute, y.minute)
-                    self.assertEqual(got, expected)
-
-        # However, if they're different members, uctoffset is not ignored.
-        # Note that a time can't actually have an operand-depedent offset,
-        # though (and time.utcoffset() passes None to tzinfo.utcoffset()),
-        # so skip this test for time.
-        if cls is not time:
-            d0 = base.replace(minute=3, tzinfo=OperandDependentOffset())
-            d1 = base.replace(minute=9, tzinfo=OperandDependentOffset())
-            d2 = base.replace(minute=11, tzinfo=OperandDependentOffset())
-            for x in d0, d1, d2:
-                for y in d0, d1, d2:
-                    got = (x > y) - (x < y)
-                    if (x is d0 or x is d1) and (y is d0 or y is d1):
-                        expected = 0
-                    elif x is y is d2:
-                        expected = 0
-                    elif x is d2:
-                        expected = -1
-                    else:
-                        assert y is d2
-                        expected = 1
-                    self.assertEqual(got, expected)
-
-
-# Testing time objects with a non-None tzinfo.
-class TestTimeTZ(TestTime, TZInfoBase, unittest.TestCase):
-    theclass = time
-
-    def test_empty(self):
-        t = self.theclass()
-        self.assertEqual(t.hour, 0)
-        self.assertEqual(t.minute, 0)
-        self.assertEqual(t.second, 0)
-        self.assertEqual(t.microsecond, 0)
-        self.assertTrue(t.tzinfo is None)
-
-    def test_zones(self):
-        est = FixedOffset(-300, "EST", 1)
-        utc = FixedOffset(0, "UTC", -2)
-        met = FixedOffset(60, "MET", 3)
-        t1 = time(7, 47, tzinfo=est)
-        t2 = time(12, 47, tzinfo=utc)
-        t3 = time(13, 47, tzinfo=met)
-        t4 = time(microsecond=40)
-        t5 = time(microsecond=40, tzinfo=utc)
-
-        self.assertEqual(t1.tzinfo, est)
-        self.assertEqual(t2.tzinfo, utc)
-        self.assertEqual(t3.tzinfo, met)
-        self.assertTrue(t4.tzinfo is None)
-        self.assertEqual(t5.tzinfo, utc)
-
-        self.assertEqual(t1.utcoffset(), timedelta(minutes=-300))
-        self.assertEqual(t2.utcoffset(), timedelta(minutes=0))
-        self.assertEqual(t3.utcoffset(), timedelta(minutes=60))
-        self.assertTrue(t4.utcoffset() is None)
-        self.assertRaises(TypeError, t1.utcoffset, "no args")
-
-        self.assertEqual(t1.tzname(), "EST")
-        self.assertEqual(t2.tzname(), "UTC")
-        self.assertEqual(t3.tzname(), "MET")
-        self.assertTrue(t4.tzname() is None)
-        self.assertRaises(TypeError, t1.tzname, "no args")
-
-        self.assertEqual(t1.dst(), timedelta(minutes=1))
-        self.assertEqual(t2.dst(), timedelta(minutes=-2))
-        self.assertEqual(t3.dst(), timedelta(minutes=3))
-        self.assertTrue(t4.dst() is None)
-        self.assertRaises(TypeError, t1.dst, "no args")
-
-        self.assertEqual(hash(t1), hash(t2))
-        self.assertEqual(hash(t1), hash(t3))
-        self.assertEqual(hash(t2), hash(t3))
-
-        self.assertEqual(t1, t2)
-        self.assertEqual(t1, t3)
-        self.assertEqual(t2, t3)
-        self.assertNotEqual(t4, t5)  # mixed tz-aware & naive
-        self.assertRaises(TypeError, lambda: t4 < t5)  # mixed tz-aware & naive
-        self.assertRaises(TypeError, lambda: t5 < t4)  # mixed tz-aware & naive
-
-        self.assertEqual(str(t1), "07:47:00-05:00")
-        self.assertEqual(str(t2), "12:47:00+00:00")
-        self.assertEqual(str(t3), "13:47:00+01:00")
-        self.assertEqual(str(t4), "00:00:00.000040")
-        self.assertEqual(str(t5), "00:00:00.000040+00:00")
-
-        self.assertEqual(t1.isoformat(), "07:47:00-05:00")
-        self.assertEqual(t2.isoformat(), "12:47:00+00:00")
-        self.assertEqual(t3.isoformat(), "13:47:00+01:00")
-        self.assertEqual(t4.isoformat(), "00:00:00.000040")
-        self.assertEqual(t5.isoformat(), "00:00:00.000040+00:00")
-
-        d = "datetime.time"
-        self.assertEqual(repr(t1), d + "(7, 47, tzinfo=est)")
-        self.assertEqual(repr(t2), d + "(12, 47, tzinfo=utc)")
-        self.assertEqual(repr(t3), d + "(13, 47, tzinfo=met)")
-        self.assertEqual(repr(t4), d + "(0, 0, 0, 40)")
-        self.assertEqual(repr(t5), d + "(0, 0, 0, 40, tzinfo=utc)")
-
-        self.assertEqual(t1.strftime("%H:%M:%S %%Z=%Z %%z=%z"), "07:47:00 %Z=EST %z=-0500")
-        self.assertEqual(t2.strftime("%H:%M:%S %Z %z"), "12:47:00 UTC +0000")
-        self.assertEqual(t3.strftime("%H:%M:%S %Z %z"), "13:47:00 MET +0100")
-
-        yuck = FixedOffset(-1439, "%z %Z %%z%%Z")
-        t1 = time(23, 59, tzinfo=yuck)
-        #        self.assertEqual(t1.strftime("%H:%M %%Z='%Z' %%z='%z'"),
-        #                                     "23:59 %Z='%z %Z %%z%%Z' %z='-2359'")
-
-        # Check that an invalid tzname result raises an exception.
-        class Badtzname(tzinfo):
-            tz = 42
-
-            def tzname(self, dt):
-                return self.tz
-
-        t = time(2, 3, 4, tzinfo=Badtzname())
-        self.assertEqual(t.strftime("%H:%M:%S"), "02:03:04")
-        self.assertRaises(TypeError, t.strftime, "%Z")
-
-        # Issue #6697:
-        if "_Fast" in str(type(self)):
-            Badtzname.tz = "\ud800"
-            self.assertRaises(ValueError, t.strftime, "%Z")
-
-    def test_hash_edge_cases(self):
-        # Offsets that overflow a basic time.
-        t1 = self.theclass(0, 1, 2, 3, tzinfo=FixedOffset(1439, ""))
-        t2 = self.theclass(0, 0, 2, 3, tzinfo=FixedOffset(1438, ""))
-        self.assertEqual(hash(t1), hash(t2))
-
-        t1 = self.theclass(23, 58, 6, 100, tzinfo=FixedOffset(-1000, ""))
-        t2 = self.theclass(23, 48, 6, 100, tzinfo=FixedOffset(-1010, ""))
-        self.assertEqual(hash(t1), hash(t2))
-
-    def test_pickling(self):
-        # Try one without a tzinfo.
-        args = 20, 59, 16, 64**2
-        orig = self.theclass(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def _test_pickling2(self):
-        # Try one with a tzinfo.
-        tinfo = PicklableFixedOffset(-300, "cookie")
-        orig = self.theclass(5, 6, 7, tzinfo=tinfo)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-            self.assertIsInstance(derived.tzinfo, PicklableFixedOffset)
-            self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
-            self.assertEqual(derived.tzname(), "cookie")
-
-    def test_more_bool(self):
-        # Test cases with non-None tzinfo.
-        cls = self.theclass
-
-        t = cls(0, tzinfo=FixedOffset(-300, ""))
-        self.assertTrue(t)
-
-        t = cls(5, tzinfo=FixedOffset(-300, ""))
-        self.assertTrue(t)
-
-        t = cls(5, tzinfo=FixedOffset(300, ""))
-        self.assertTrue(not t)
-
-        t = cls(23, 59, tzinfo=FixedOffset(23 * 60 + 59, ""))
-        self.assertTrue(not t)
-
-        # Mostly ensuring this doesn't overflow internally.
-        t = cls(0, tzinfo=FixedOffset(23 * 60 + 59, ""))
-        self.assertTrue(t)
-
-        # But this should yield a value error -- the utcoffset is bogus.
-        t = cls(0, tzinfo=FixedOffset(24 * 60, ""))
-        self.assertRaises(ValueError, lambda: bool(t))
-
-        # Likewise.
-        t = cls(0, tzinfo=FixedOffset(-24 * 60, ""))
-        self.assertRaises(ValueError, lambda: bool(t))
-
-    def test_replace(self):
-        cls = self.theclass
-        z100 = FixedOffset(100, "+100")
-        zm200 = FixedOffset(timedelta(minutes=-200), "-200")
-        args = [1, 2, 3, 4, z100]
-        base = cls(*args)
-        self.assertEqual(base, base.replace())
-
-        i = 0
-        for name, newval in (
-            ("hour", 5),
-            ("minute", 6),
-            ("second", 7),
-            ("microsecond", 8),
-            ("tzinfo", zm200),
-        ):
-            newargs = args[:]
-            newargs[i] = newval
-            expected = cls(*newargs)
-            got = base.replace(**{name: newval})
-            self.assertEqual(expected, got)
-            i += 1
-
-        # Ensure we can get rid of a tzinfo.
-        self.assertEqual(base.tzname(), "+100")
-        base2 = base.replace(tzinfo=None)
-        self.assertTrue(base2.tzinfo is None)
-        self.assertTrue(base2.tzname() is None)
-
-        # Ensure we can add one.
-        base3 = base2.replace(tzinfo=z100)
-        self.assertEqual(base, base3)
-        self.assertTrue(base.tzinfo is base3.tzinfo)
-
-        # Out of bounds.
-        base = cls(1)
-        self.assertRaises(ValueError, base.replace, hour=24)
-        self.assertRaises(ValueError, base.replace, minute=-1)
-        self.assertRaises(ValueError, base.replace, second=100)
-        self.assertRaises(ValueError, base.replace, microsecond=1000000)
-
-    def test_mixed_compare(self):
-        t1 = time(1, 2, 3)
-        t2 = time(1, 2, 3)
-        self.assertEqual(t1, t2)
-        t2 = t2.replace(tzinfo=None)
-        self.assertEqual(t1, t2)
-        t2 = t2.replace(tzinfo=FixedOffset(None, ""))
-        self.assertEqual(t1, t2)
-        t2 = t2.replace(tzinfo=FixedOffset(0, ""))
-        self.assertNotEqual(t1, t2)
-
-        # In time w/ identical tzinfo objects, utcoffset is ignored.
-        class Varies(tzinfo):
-            def __init__(self):
-                self.offset = timedelta(minutes=22)
-
-            def utcoffset(self, t):
-                self.offset += timedelta(minutes=1)
-                return self.offset
-
-        v = Varies()
-        t1 = t2.replace(tzinfo=v)
-        t2 = t2.replace(tzinfo=v)
-        self.assertEqual(t1.utcoffset(), timedelta(minutes=23))
-        self.assertEqual(t2.utcoffset(), timedelta(minutes=24))
-        self.assertEqual(t1, t2)
-
-        # But if they're not identical, it isn't ignored.
-        t2 = t2.replace(tzinfo=Varies())
-        self.assertTrue(t1 < t2)  # t1's offset counter still going up
-
-    def test_subclass_timetz(self):
-        class C(self.theclass):
-            theAnswer = 42
-
-            def __new__(cls, *args, **kws):
-                temp = kws.copy()
-                extra = temp.pop("extra")
-                result = self.theclass.__new__(cls, *args, **temp)
-                result.extra = extra
-                return result
-
-            def newmeth(self, start):
-                return start + self.hour + self.second
-
-        args = 4, 5, 6, 500, FixedOffset(-300, "EST", 1)
-
-        dt1 = self.theclass(*args)
-        dt2 = C(*args, **{"extra": 7})
-
-        self.assertEqual(dt2.__class__, C)
-        self.assertEqual(dt2.theAnswer, 42)
-        self.assertEqual(dt2.extra, 7)
-        self.assertEqual(dt1.utcoffset(), dt2.utcoffset())
-        self.assertEqual(dt2.newmeth(-7), dt1.hour + dt1.second - 7)
-
-
-# Testing datetime objects with a non-None tzinfo.
-
-
-class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase):
-    theclass = datetime
-
-    def test_trivial(self):
-        dt = self.theclass(1, 2, 3, 4, 5, 6, 7)
-        self.assertEqual(dt.year, 1)
-        self.assertEqual(dt.month, 2)
-        self.assertEqual(dt.day, 3)
-        self.assertEqual(dt.hour, 4)
-        self.assertEqual(dt.minute, 5)
-        self.assertEqual(dt.second, 6)
-        self.assertEqual(dt.microsecond, 7)
-        self.assertEqual(dt.tzinfo, None)
-
-    def test_even_more_compare(self):
-        # The test_compare() and test_more_compare() inherited from TestDate
-        # and TestDateTime covered non-tzinfo cases.
-
-        # Smallest possible after UTC adjustment.
-        t1 = self.theclass(1, 1, 1, tzinfo=FixedOffset(1439, ""))
-        # Largest possible after UTC adjustment.
-        t2 = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999999, tzinfo=FixedOffset(-1439, ""))
-
-        # Make sure those compare correctly, and w/o overflow.
-        self.assertTrue(t1 < t2)
-        self.assertTrue(t1 != t2)
-        self.assertTrue(t2 > t1)
-
-        self.assertEqual(t1, t1)
-        self.assertEqual(t2, t2)
-
-        # Equal afer adjustment.
-        t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""))
-        t2 = self.theclass(2, 1, 1, 3, 13, tzinfo=FixedOffset(3 * 60 + 13 + 2, ""))
-        self.assertEqual(t1, t2)
-
-        # Change t1 not to subtract a minute, and t1 should be larger.
-        t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(0, ""))
-        self.assertTrue(t1 > t2)
-
-        # Change t1 to subtract 2 minutes, and t1 should be smaller.
-        t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(2, ""))
-        self.assertTrue(t1 < t2)
-
-        # Back to the original t1, but make seconds resolve it.
-        t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""), second=1)
-        self.assertTrue(t1 > t2)
-
-        # Likewise, but make microseconds resolve it.
-        t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""), microsecond=1)
-        self.assertTrue(t1 > t2)
-
-        # Make t2 naive and it should differ.
-        t2 = self.theclass.min
-        self.assertNotEqual(t1, t2)
-        self.assertEqual(t2, t2)
-
-        # It's also naive if it has tzinfo but tzinfo.utcoffset() is None.
-        class Naive(tzinfo):
-            def utcoffset(self, dt):
-                return None
-
-        t2 = self.theclass(5, 6, 7, tzinfo=Naive())
-        self.assertNotEqual(t1, t2)
-        self.assertEqual(t2, t2)
-
-        # OTOH, it's OK to compare two of these mixing the two ways of being
-        # naive.
-        t1 = self.theclass(5, 6, 7)
-        self.assertEqual(t1, t2)
-
-        # Try a bogus uctoffset.
-        class Bogus(tzinfo):
-            def utcoffset(self, dt):
-                return timedelta(minutes=1440)  # out of bounds
-
-        t1 = self.theclass(2, 2, 2, tzinfo=Bogus())
-        t2 = self.theclass(2, 2, 2, tzinfo=FixedOffset(0, ""))
-        self.assertRaises(ValueError, lambda: t1 == t2)
-
-    def test_pickling(self):
-        # Try one without a tzinfo.
-        args = 6, 7, 23, 20, 59, 1, 64**2
-        orig = self.theclass(*args)
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-
-    def _test_pickling2(self):
-        # Try one with a tzinfo.
-        tinfo = PicklableFixedOffset(-300, "cookie")
-        orig = self.theclass(*args, **{"tzinfo": tinfo})
-        derived = self.theclass(1, 1, 1, tzinfo=FixedOffset(0, "", 0))
-        for pickler, unpickler, proto in pickle_choices:
-            green = pickler.dumps(orig, proto)
-            derived = unpickler.loads(green)
-            self.assertEqual(orig, derived)
-            self.assertIsInstance(derived.tzinfo, PicklableFixedOffset)
-            self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
-            self.assertEqual(derived.tzname(), "cookie")
-
-    def test_extreme_hashes(self):
-        # If an attempt is made to hash these via subtracting the offset
-        # then hashing a datetime object, OverflowError results.  The
-        # Python implementation used to blow up here.
-        t = self.theclass(1, 1, 1, tzinfo=FixedOffset(1439, ""))
-        hash(t)
-        t = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999999, tzinfo=FixedOffset(-1439, ""))
-        hash(t)
-
-        # OTOH, an OOB offset should blow up.
-        t = self.theclass(5, 5, 5, tzinfo=FixedOffset(-1440, ""))
-        self.assertRaises(ValueError, hash, t)
-
-    def test_zones(self):
-        est = FixedOffset(-300, "EST")
-        utc = FixedOffset(0, "UTC")
-        met = FixedOffset(60, "MET")
-        t1 = datetime(2002, 3, 19, 7, 47, tzinfo=est)
-        t2 = datetime(2002, 3, 19, 12, 47, tzinfo=utc)
-        t3 = datetime(2002, 3, 19, 13, 47, tzinfo=met)
-        self.assertEqual(t1.tzinfo, est)
-        self.assertEqual(t2.tzinfo, utc)
-        self.assertEqual(t3.tzinfo, met)
-        self.assertEqual(t1.utcoffset(), timedelta(minutes=-300))
-        self.assertEqual(t2.utcoffset(), timedelta(minutes=0))
-        self.assertEqual(t3.utcoffset(), timedelta(minutes=60))
-        self.assertEqual(t1.tzname(), "EST")
-        self.assertEqual(t2.tzname(), "UTC")
-        self.assertEqual(t3.tzname(), "MET")
-        self.assertEqual(hash(t1), hash(t2))
-        self.assertEqual(hash(t1), hash(t3))
-        self.assertEqual(hash(t2), hash(t3))
-        self.assertEqual(t1, t2)
-        self.assertEqual(t1, t3)
-        self.assertEqual(t2, t3)
-        self.assertEqual(str(t1), "2002-03-19 07:47:00-05:00")
-        self.assertEqual(str(t2), "2002-03-19 12:47:00+00:00")
-        self.assertEqual(str(t3), "2002-03-19 13:47:00+01:00")
-        d = "datetime.datetime(2002, 3, 19, "
-        self.assertEqual(repr(t1), d + "7, 47, tzinfo=est)")
-        self.assertEqual(repr(t2), d + "12, 47, tzinfo=utc)")
-        self.assertEqual(repr(t3), d + "13, 47, tzinfo=met)")
-
-    def test_combine(self):
-        met = FixedOffset(60, "MET")
-        d = date(2002, 3, 4)
-        tz = time(18, 45, 3, 1234, tzinfo=met)
-        dt = datetime.combine(d, tz)
-        self.assertEqual(dt, datetime(2002, 3, 4, 18, 45, 3, 1234, tzinfo=met))
-
-    def test_extract(self):
-        met = FixedOffset(60, "MET")
-        dt = self.theclass(2002, 3, 4, 18, 45, 3, 1234, tzinfo=met)
-        self.assertEqual(dt.date(), date(2002, 3, 4))
-        self.assertEqual(dt.time(), time(18, 45, 3, 1234))
-        self.assertEqual(dt.timetz(), time(18, 45, 3, 1234, tzinfo=met))
-
-    def test_tz_aware_arithmetic(self):
-        import random
-
-        now = self.theclass.now()
-        tz55 = FixedOffset(-330, "west 5:30")
-        timeaware = now.time().replace(tzinfo=tz55)
-        nowaware = self.theclass.combine(now.date(), timeaware)
-        self.assertTrue(nowaware.tzinfo is tz55)
-        self.assertEqual(nowaware.timetz(), timeaware)
-
-        # Can't mix aware and non-aware.
-        self.assertRaises(TypeError, lambda: now - nowaware)
-        self.assertRaises(TypeError, lambda: nowaware - now)
-
-        # And adding datetime's doesn't make sense, aware or not.
-        self.assertRaises(TypeError, lambda: now + nowaware)
-        self.assertRaises(TypeError, lambda: nowaware + now)
-        self.assertRaises(TypeError, lambda: nowaware + nowaware)
-
-        # Subtracting should yield 0.
-        self.assertEqual(now - now, timedelta(0))
-        self.assertEqual(nowaware - nowaware, timedelta(0))
-
-        # Adding a delta should preserve tzinfo.
-        delta = timedelta(weeks=1, minutes=12, microseconds=5678)
-        nowawareplus = nowaware + delta
-        self.assertTrue(nowaware.tzinfo is tz55)
-        nowawareplus2 = delta + nowaware
-        self.assertTrue(nowawareplus2.tzinfo is tz55)
-        self.assertEqual(nowawareplus, nowawareplus2)
-
-        # that - delta should be what we started with, and that - what we
-        # started with should be delta.
-        diff = nowawareplus - delta
-        self.assertTrue(diff.tzinfo is tz55)
-        self.assertEqual(nowaware, diff)
-        self.assertRaises(TypeError, lambda: delta - nowawareplus)
-        self.assertEqual(nowawareplus - nowaware, delta)
-
-        # Make up a random timezone.
-        tzr = FixedOffset(random.randrange(-1439, 1440), "randomtimezone")
-        # Attach it to nowawareplus.
-        nowawareplus = nowawareplus.replace(tzinfo=tzr)
-        self.assertTrue(nowawareplus.tzinfo is tzr)
-        # Make sure the difference takes the timezone adjustments into account.
-        got = nowaware - nowawareplus
-        # Expected:  (nowaware base - nowaware offset) -
-        #            (nowawareplus base - nowawareplus offset) =
-        #            (nowaware base - nowawareplus base) +
-        #            (nowawareplus offset - nowaware offset) =
-        #            -delta + nowawareplus offset - nowaware offset
-        expected = nowawareplus.utcoffset() - nowaware.utcoffset() - delta
-        self.assertEqual(got, expected)
-
-        # Try max possible difference.
-        min = self.theclass(1, 1, 1, tzinfo=FixedOffset(1439, "min"))
-        max = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999999, tzinfo=FixedOffset(-1439, "max"))
-        maxdiff = max - min
-        self.assertEqual(
-            maxdiff, self.theclass.max - self.theclass.min + timedelta(minutes=2 * 1439)
-        )
-        # Different tzinfo, but the same offset
-        tza = timezone(HOUR, "A")
-        tzb = timezone(HOUR, "B")
-        delta = min.replace(tzinfo=tza) - max.replace(tzinfo=tzb)
-        self.assertEqual(delta, self.theclass.min - self.theclass.max)
-
-    def test_tzinfo_now(self):
-        meth = self.theclass.now
-        # Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
-        base = meth()
-        # Try with and without naming the keyword.
-        off42 = FixedOffset(42, "42")
-        another = meth(off42)
-        again = meth(tz=off42)
-        self.assertTrue(another.tzinfo is again.tzinfo)
-        self.assertEqual(another.utcoffset(), timedelta(minutes=42))
-        # Bad argument with and w/o naming the keyword.
-        self.assertRaises(TypeError, meth, 16)
-        self.assertRaises(TypeError, meth, tzinfo=16)
-        # Bad keyword name.
-        self.assertRaises(TypeError, meth, tinfo=off42)
-        # Too many args.
-        self.assertRaises(TypeError, meth, off42, off42)
-
-        # We don't know which time zone we're in, and don't have a tzinfo
-        # class to represent it, so seeing whether a tz argument actually
-        # does a conversion is tricky.
-        utc = FixedOffset(0, "utc", 0)
-        for weirdtz in [
-            FixedOffset(timedelta(hours=15, minutes=58), "weirdtz", 0),
-            timezone(timedelta(hours=15, minutes=58), "weirdtz"),
-        ]:
-            for dummy in range(3):
-                now = datetime.now(weirdtz)
-                self.assertTrue(now.tzinfo is weirdtz)
-                utcnow = datetime.utcnow().replace(tzinfo=utc)
-                now2 = utcnow.astimezone(weirdtz)
-                if abs(now - now2) < timedelta(seconds=30):
-                    break
-                # Else the code is broken, or more than 30 seconds passed between
-                # calls; assuming the latter, just try again.
-            else:
-                # Three strikes and we're out.
-                self.fail("utcnow(), now(tz), or astimezone() may be broken")
-
-    def test_tzinfo_fromtimestamp(self):
-        import time
-
-        meth = self.theclass.fromtimestamp
-        ts = time.time()
-        # Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
-        base = meth(ts)
-        # Try with and without naming the keyword.
-        off42 = FixedOffset(42, "42")
-        another = meth(ts, off42)
-        again = meth(ts, tz=off42)
-        self.assertTrue(another.tzinfo is again.tzinfo)
-        self.assertEqual(another.utcoffset(), timedelta(minutes=42))
-        # Bad argument with and w/o naming the keyword.
-        self.assertRaises(TypeError, meth, ts, 16)
-        self.assertRaises(TypeError, meth, ts, tzinfo=16)
-        # Bad keyword name.
-        self.assertRaises(TypeError, meth, ts, tinfo=off42)
-        # Too many args.
-        self.assertRaises(TypeError, meth, ts, off42, off42)
-        # Too few args.
-        self.assertRaises(TypeError, meth)
-
-        # Try to make sure tz= actually does some conversion.
-        timestamp = 1000000000
-        utcdatetime = datetime.utcfromtimestamp(timestamp)
-        # In POSIX (epoch 1970), that's 2001-09-09 01:46:40 UTC, give or take.
-        # But on some flavor of Mac, it's nowhere near that.  So we can't have
-        # any idea here what time that actually is, we can only test that
-        # relative changes match.
-        utcoffset = timedelta(hours=-15, minutes=39)  # arbitrary, but not zero
-        tz = FixedOffset(utcoffset, "tz", 0)
-        expected = utcdatetime + utcoffset
-        got = datetime.fromtimestamp(timestamp, tz)
-        self.assertEqual(expected, got.replace(tzinfo=None))
-
-    def test_tzinfo_utcnow(self):
-        meth = self.theclass.utcnow
-        # Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
-        base = meth()
-        # Try with and without naming the keyword; for whatever reason,
-        # utcnow() doesn't accept a tzinfo argument.
-        off42 = FixedOffset(42, "42")
-        self.assertRaises(TypeError, meth, off42)
-        self.assertRaises(TypeError, meth, tzinfo=off42)
-
-    def test_tzinfo_utcfromtimestamp(self):
-        import time
-
-        meth = self.theclass.utcfromtimestamp
-        ts = time.time()
-        # Ensure it doesn't require tzinfo (i.e., that this doesn't blow up).
-        base = meth(ts)
-        # Try with and without naming the keyword; for whatever reason,
-        # utcfromtimestamp() doesn't accept a tzinfo argument.
-        off42 = FixedOffset(42, "42")
-        self.assertRaises(TypeError, meth, ts, off42)
-        self.assertRaises(TypeError, meth, ts, tzinfo=off42)
-
-    def test_tzinfo_timetuple(self):
-        # TestDateTime tested most of this.  datetime adds a twist to the
-        # DST flag.
-        class DST(tzinfo):
-            def __init__(self, dstvalue):
-                if isinstance(dstvalue, int):
-                    dstvalue = timedelta(minutes=dstvalue)
-                self.dstvalue = dstvalue
-
-            def dst(self, dt):
-                return self.dstvalue
-
-        cls = self.theclass
-        for dstvalue, flag in (-33, 1), (33, 1), (0, 0), (None, -1):
-            d = cls(1, 1, 1, 10, 20, 30, 40, tzinfo=DST(dstvalue))
-            t = d.timetuple()
-            self.assertEqual(1, t.tm_year)
-            self.assertEqual(1, t.tm_mon)
-            self.assertEqual(1, t.tm_mday)
-            self.assertEqual(10, t.tm_hour)
-            self.assertEqual(20, t.tm_min)
-            self.assertEqual(30, t.tm_sec)
-            self.assertEqual(0, t.tm_wday)
-            self.assertEqual(1, t.tm_yday)
-            self.assertEqual(flag, t.tm_isdst)
-
-        # dst() returns wrong type.
-        self.assertRaises(TypeError, cls(1, 1, 1, tzinfo=DST("x")).timetuple)
-
-        # dst() at the edge.
-        self.assertEqual(cls(1, 1, 1, tzinfo=DST(1439)).timetuple().tm_isdst, 1)
-        self.assertEqual(cls(1, 1, 1, tzinfo=DST(-1439)).timetuple().tm_isdst, 1)
-
-        # dst() out of range.
-        self.assertRaises(ValueError, cls(1, 1, 1, tzinfo=DST(1440)).timetuple)
-        self.assertRaises(ValueError, cls(1, 1, 1, tzinfo=DST(-1440)).timetuple)
-
-    def test_utctimetuple(self):
-        class DST(tzinfo):
-            def __init__(self, dstvalue=0):
-                if isinstance(dstvalue, int):
-                    dstvalue = timedelta(minutes=dstvalue)
-                self.dstvalue = dstvalue
-
-            def dst(self, dt):
-                return self.dstvalue
-
-        cls = self.theclass
-        # This can't work:  DST didn't implement utcoffset.
-        self.assertRaises(NotImplementedError, cls(1, 1, 1, tzinfo=DST(0)).utcoffset)
-
-        class UOFS(DST):
-            def __init__(self, uofs, dofs=None):
-                DST.__init__(self, dofs)
-                self.uofs = timedelta(minutes=uofs)
-
-            def utcoffset(self, dt):
-                return self.uofs
-
-        for dstvalue in -33, 33, 0, None:
-            d = cls(1, 2, 3, 10, 20, 30, 40, tzinfo=UOFS(-53, dstvalue))
-            t = d.utctimetuple()
-            self.assertEqual(d.year, t.tm_year)
-            self.assertEqual(d.month, t.tm_mon)
-            self.assertEqual(d.day, t.tm_mday)
-            self.assertEqual(11, t.tm_hour)  # 20mm + 53mm = 1hn + 13mm
-            self.assertEqual(13, t.tm_min)
-            self.assertEqual(d.second, t.tm_sec)
-            self.assertEqual(d.weekday(), t.tm_wday)
-            self.assertEqual(d.toordinal() - date(1, 1, 1).toordinal() + 1, t.tm_yday)
-            # Ensure tm_isdst is 0 regardless of what dst() says: DST
-            # is never in effect for a UTC time.
-            self.assertEqual(0, t.tm_isdst)
-
-        # For naive datetime, utctimetuple == timetuple except for isdst
-        d = cls(1, 2, 3, 10, 20, 30, 40)
-        t = d.utctimetuple()
-        self.assertEqual(t[:-1], d.timetuple()[:-1])
-        self.assertEqual(0, t.tm_isdst)
-        # Same if utcoffset is None
-        class NOFS(DST):
-            def utcoffset(self, dt):
-                return None
-
-        d = cls(1, 2, 3, 10, 20, 30, 40, tzinfo=NOFS())
-        t = d.utctimetuple()
-        self.assertEqual(t[:-1], d.timetuple()[:-1])
-        self.assertEqual(0, t.tm_isdst)
-        # Check that bad tzinfo is detected
-        class BOFS(DST):
-            def utcoffset(self, dt):
-                return "EST"
-
-        d = cls(1, 2, 3, 10, 20, 30, 40, tzinfo=BOFS())
-        self.assertRaises(TypeError, d.utctimetuple)
-
-        # Check that utctimetuple() is the same as
-        # astimezone(utc).timetuple()
-        d = cls(2010, 11, 13, 14, 15, 16, 171819)
-        for tz in [timezone.min, timezone.utc, timezone.max]:
-            dtz = d.replace(tzinfo=tz)
-            self.assertEqual(
-                dtz.utctimetuple()[:-1], dtz.astimezone(timezone.utc).timetuple()[:-1]
-            )
-        # At the edges, UTC adjustment can produce years out-of-range
-        # for a datetime object.  Ensure that an OverflowError is
-        # raised.
-        tiny = cls(MINYEAR, 1, 1, 0, 0, 37, tzinfo=UOFS(1439))
-        # That goes back 1 minute less than a full day.
-        self.assertRaises(OverflowError, tiny.utctimetuple)
-
-        huge = cls(MAXYEAR, 12, 31, 23, 59, 37, 999999, tzinfo=UOFS(-1439))
-        # That goes forward 1 minute less than a full day.
-        self.assertRaises(OverflowError, huge.utctimetuple)
-        # More overflow cases
-        tiny = cls.min.replace(tzinfo=timezone(MINUTE))
-        self.assertRaises(OverflowError, tiny.utctimetuple)
-        huge = cls.max.replace(tzinfo=timezone(-MINUTE))
-        self.assertRaises(OverflowError, huge.utctimetuple)
-
-    def test_tzinfo_isoformat(self):
-        zero = FixedOffset(0, "+00:00")
-        plus = FixedOffset(220, "+03:40")
-        minus = FixedOffset(-231, "-03:51")
-        unknown = FixedOffset(None, "")
-
-        cls = self.theclass
-        datestr = "0001-02-03"
-        for ofs in None, zero, plus, minus, unknown:
-            for us in 0, 987001:
-                d = cls(1, 2, 3, 4, 5, 59, us, tzinfo=ofs)
-                timestr = "04:05:59" + (us and ".987001" or "")
-                ofsstr = ofs is not None and d.tzname() or ""
-                tailstr = timestr + ofsstr
-                iso = d.isoformat()
-                self.assertEqual(iso, datestr + "T" + tailstr)
-                self.assertEqual(iso, d.isoformat("T"))
-                self.assertEqual(d.isoformat("k"), datestr + "k" + tailstr)
-                self.assertEqual(d.isoformat("\u1234"), datestr + "\u1234" + tailstr)
-                self.assertEqual(str(d), datestr + " " + tailstr)
-
-    def test_replace(self):
-        cls = self.theclass
-        z100 = FixedOffset(100, "+100")
-        zm200 = FixedOffset(timedelta(minutes=-200), "-200")
-        args = [1, 2, 3, 4, 5, 6, 7, z100]
-        base = cls(*args)
-        self.assertEqual(base, base.replace())
-
-        i = 0
-        for name, newval in (
-            ("year", 2),
-            ("month", 3),
-            ("day", 4),
-            ("hour", 5),
-            ("minute", 6),
-            ("second", 7),
-            ("microsecond", 8),
-            ("tzinfo", zm200),
-        ):
-            newargs = args[:]
-            newargs[i] = newval
-            expected = cls(*newargs)
-            got = base.replace(**{name: newval})
-            self.assertEqual(expected, got)
-            i += 1
-
-        # Ensure we can get rid of a tzinfo.
-        self.assertEqual(base.tzname(), "+100")
-        base2 = base.replace(tzinfo=None)
-        self.assertTrue(base2.tzinfo is None)
-        self.assertTrue(base2.tzname() is None)
-
-        # Ensure we can add one.
-        base3 = base2.replace(tzinfo=z100)
-        self.assertEqual(base, base3)
-        self.assertTrue(base.tzinfo is base3.tzinfo)
-
-        # Out of bounds.
-        base = cls(2000, 2, 29)
-        self.assertRaises(ValueError, base.replace, year=2001)
-
-    def test_more_astimezone(self):
-        # The inherited test_astimezone covered some trivial and error cases.
-        fnone = FixedOffset(None, "None")
-        f44m = FixedOffset(44, "44")
-        fm5h = FixedOffset(-timedelta(hours=5), "m300")
-
-        dt = self.theclass.now(tz=f44m)
-        self.assertTrue(dt.tzinfo is f44m)
-        # Replacing with degenerate tzinfo raises an exception.
-        self.assertRaises(ValueError, dt.astimezone, fnone)
-        # Replacing with same tzinfo makes no change.
-        x = dt.astimezone(dt.tzinfo)
-        self.assertTrue(x.tzinfo is f44m)
-        self.assertEqual(x.date(), dt.date())
-        self.assertEqual(x.time(), dt.time())
-
-        # Replacing with different tzinfo does adjust.
-        got = dt.astimezone(fm5h)
-        self.assertTrue(got.tzinfo is fm5h)
-        self.assertEqual(got.utcoffset(), timedelta(hours=-5))
-        expected = dt - dt.utcoffset()  # in effect, convert to UTC
-        expected += fm5h.utcoffset(dt)  # and from there to local time
-        expected = expected.replace(tzinfo=fm5h)  # and attach new tzinfo
-        self.assertEqual(got.date(), expected.date())
-        self.assertEqual(got.time(), expected.time())
-        self.assertEqual(got.timetz(), expected.timetz())
-        self.assertTrue(got.tzinfo is expected.tzinfo)
-        self.assertEqual(got, expected)
-
-    #    @support.run_with_tz('UTC')
-    def test_astimezone_default_utc(self):
-        dt = self.theclass.now(timezone.utc)
-        self.assertEqual(dt.astimezone(None), dt)
-        self.assertEqual(dt.astimezone(), dt)
-
-    # Note that offset in TZ variable has the opposite sign to that
-    # produced by %z directive.
-    #    @support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
-    @unittest.skip("no support.run_with_tz")
-    def test_astimezone_default_eastern(self):
-        dt = self.theclass(2012, 11, 4, 6, 30, tzinfo=timezone.utc)
-        local = dt.astimezone()
-        self.assertEqual(dt, local)
-        self.assertEqual(local.strftime("%z %Z"), "-0500 EST")
-        dt = self.theclass(2012, 11, 4, 5, 30, tzinfo=timezone.utc)
-        local = dt.astimezone()
-        self.assertEqual(dt, local)
-        self.assertEqual(local.strftime("%z %Z"), "-0400 EDT")
-
-    def test_aware_subtract(self):
-        cls = self.theclass
-
-        # Ensure that utcoffset() is ignored when the operands have the
-        # same tzinfo member.
-        class OperandDependentOffset(tzinfo):
-            def utcoffset(self, t):
-                if t.minute < 10:
-                    # d0 and d1 equal after adjustment
-                    return timedelta(minutes=t.minute)
-                else:
-                    # d2 off in the weeds
-                    return timedelta(minutes=59)
-
-        base = cls(8, 9, 10, 11, 12, 13, 14, tzinfo=OperandDependentOffset())
-        d0 = base.replace(minute=3)
-        d1 = base.replace(minute=9)
-        d2 = base.replace(minute=11)
-        for x in d0, d1, d2:
-            for y in d0, d1, d2:
-                got = x - y
-                expected = timedelta(minutes=x.minute - y.minute)
-                self.assertEqual(got, expected)
-
-        # OTOH, if the tzinfo members are distinct, utcoffsets aren't
-        # ignored.
-        base = cls(8, 9, 10, 11, 12, 13, 14)
-        d0 = base.replace(minute=3, tzinfo=OperandDependentOffset())
-        d1 = base.replace(minute=9, tzinfo=OperandDependentOffset())
-        d2 = base.replace(minute=11, tzinfo=OperandDependentOffset())
-        for x in d0, d1, d2:
-            for y in d0, d1, d2:
-                got = x - y
-                if (x is d0 or x is d1) and (y is d0 or y is d1):
-                    expected = timedelta(0)
-                elif x is y is d2:
-                    expected = timedelta(0)
-                elif x is d2:
-                    expected = timedelta(minutes=(11 - 59) - 0)
-                else:
-                    assert y is d2
-                    expected = timedelta(minutes=0 - (11 - 59))
-                self.assertEqual(got, expected)
-
-    def test_mixed_compare(self):
-        t1 = datetime(1, 2, 3, 4, 5, 6, 7)
-        t2 = datetime(1, 2, 3, 4, 5, 6, 7)
-        self.assertEqual(t1, t2)
-        t2 = t2.replace(tzinfo=None)
-        self.assertEqual(t1, t2)
-        t2 = t2.replace(tzinfo=FixedOffset(None, ""))
-        self.assertEqual(t1, t2)
-        t2 = t2.replace(tzinfo=FixedOffset(0, ""))
-        self.assertNotEqual(t1, t2)
-
-        # In datetime w/ identical tzinfo objects, utcoffset is ignored.
-        class Varies(tzinfo):
-            def __init__(self):
-                self.offset = timedelta(minutes=22)
-
-            def utcoffset(self, t):
-                self.offset += timedelta(minutes=1)
-                return self.offset
-
-        v = Varies()
-        t1 = t2.replace(tzinfo=v)
-        t2 = t2.replace(tzinfo=v)
-        self.assertEqual(t1.utcoffset(), timedelta(minutes=23))
-        self.assertEqual(t2.utcoffset(), timedelta(minutes=24))
-        self.assertEqual(t1, t2)
-
-        # But if they're not identical, it isn't ignored.
-        t2 = t2.replace(tzinfo=Varies())
-        self.assertTrue(t1 < t2)  # t1's offset counter still going up
-
-    def test_subclass_datetimetz(self):
-        class C(self.theclass):
-            theAnswer = 42
-
-            def __new__(cls, *args, **kws):
-                temp = kws.copy()
-                extra = temp.pop("extra")
-                result = self.theclass.__new__(cls, *args, **temp)
-                result.extra = extra
-                return result
-
-            def newmeth(self, start):
-                return start + self.hour + self.year
-
-        args = 2002, 12, 31, 4, 5, 6, 500, FixedOffset(-300, "EST", 1)
-
-        dt1 = self.theclass(*args)
-        dt2 = C(*args, **{"extra": 7})
-
-        self.assertEqual(dt2.__class__, C)
-        self.assertEqual(dt2.theAnswer, 42)
-        self.assertEqual(dt2.extra, 7)
-        self.assertEqual(dt1.utcoffset(), dt2.utcoffset())
-        self.assertEqual(dt2.newmeth(-7), dt1.hour + dt1.year - 7)
-
-
-# Pain to set up DST-aware tzinfo classes.
-
-
-def first_sunday_on_or_after(dt):
-    days_to_go = 6 - dt.weekday()
-    if days_to_go:
-        dt += timedelta(days_to_go)
-    return dt
-
-
-ZERO = timedelta(0)
-MINUTE = timedelta(minutes=1)
-HOUR = timedelta(hours=1)
-DAY = timedelta(days=1)
-# In the US, DST starts at 2am (standard time) on the first Sunday in April.
-DSTSTART = datetime(1, 4, 1, 2)
-# and ends at 2am (DST time; 1am standard time) on the last Sunday of Oct,
-# which is the first Sunday on or after Oct 25.  Because we view 1:MM as
-# being standard time on that day, there is no spelling in local time of
-# the last hour of DST (that's 1:MM DST, but 1:MM is taken as standard time).
-DSTEND = datetime(1, 10, 25, 1)
-
-
-class USTimeZone(tzinfo):
-    def __init__(self, hours, reprname, stdname, dstname):
-        self.stdoffset = timedelta(hours=hours)
-        self.reprname = reprname
-        self.stdname = stdname
-        self.dstname = dstname
-
-    def __repr__(self):
-        return self.reprname
-
-    def tzname(self, dt):
-        if self.dst(dt):
-            return self.dstname
-        else:
-            return self.stdname
-
-    def utcoffset(self, dt):
-        return self.stdoffset + self.dst(dt)
-
-    def dst(self, dt):
-        if dt is None or dt.tzinfo is None:
-            # An exception instead may be sensible here, in one or more of
-            # the cases.
-            return ZERO
-        assert dt.tzinfo is self
-
-        # Find first Sunday in April.
-        start = first_sunday_on_or_after(DSTSTART.replace(year=dt.year))
-        assert start.weekday() == 6 and start.month == 4 and start.day <= 7
-
-        # Find last Sunday in October.
-        end = first_sunday_on_or_after(DSTEND.replace(year=dt.year))
-        assert end.weekday() == 6 and end.month == 10 and end.day >= 25
-
-        # Can't compare naive to aware objects, so strip the timezone from
-        # dt first.
-        if start <= dt.replace(tzinfo=None) < end:
-            return HOUR
-        else:
-            return ZERO
-
-
-Eastern = USTimeZone(-5, "Eastern", "EST", "EDT")
-Central = USTimeZone(-6, "Central", "CST", "CDT")
-Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
-Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
-utc_real = FixedOffset(0, "UTC", 0)
-# For better test coverage, we want another flavor of UTC that's west of
-# the Eastern and Pacific timezones.
-utc_fake = FixedOffset(-12 * 60, "UTCfake", 0)
-
-
-class TestTimezoneConversions(unittest.TestCase):
-    # The DST switch times for 2002, in std time.
-    dston = datetime(2002, 4, 7, 2)
-    dstoff = datetime(2002, 10, 27, 1)
-
-    theclass = datetime
-
-    # Check a time that's inside DST.
-    def checkinside(self, dt, tz, utc, dston, dstoff):
-        self.assertEqual(dt.dst(), HOUR)
-
-        # Conversion to our own timezone is always an identity.
-        self.assertEqual(dt.astimezone(tz), dt)
-
-        asutc = dt.astimezone(utc)
-        there_and_back = asutc.astimezone(tz)
-
-        # Conversion to UTC and back isn't always an identity here,
-        # because there are redundant spellings (in local time) of
-        # UTC time when DST begins:  the clock jumps from 1:59:59
-        # to 3:00:00, and a local time of 2:MM:SS doesn't really
-        # make sense then.  The classes above treat 2:MM:SS as
-        # daylight time then (it's "after 2am"), really an alias
-        # for 1:MM:SS standard time.  The latter form is what
-        # conversion back from UTC produces.
-        if dt.date() == dston.date() and dt.hour == 2:
-            # We're in the redundant hour, and coming back from
-            # UTC gives the 1:MM:SS standard-time spelling.
-            self.assertEqual(there_and_back + HOUR, dt)
-            # Although during was considered to be in daylight
-            # time, there_and_back is not.
-            self.assertEqual(there_and_back.dst(), ZERO)
-            # They're the same times in UTC.
-            self.assertEqual(there_and_back.astimezone(utc), dt.astimezone(utc))
-        else:
-            # We're not in the redundant hour.
-            self.assertEqual(dt, there_and_back)
-
-        # Because we have a redundant spelling when DST begins, there is
-        # (unfortunately) an hour when DST ends that can't be spelled at all in
-        # local time.  When DST ends, the clock jumps from 1:59 back to 1:00
-        # again.  The hour 1:MM DST has no spelling then:  1:MM is taken to be
-        # standard time.  1:MM DST == 0:MM EST, but 0:MM is taken to be
-        # daylight time.  The hour 1:MM daylight == 0:MM standard can't be
-        # expressed in local time.  Nevertheless, we want conversion back
-        # from UTC to mimic the local clock's "repeat an hour" behavior.
-        nexthour_utc = asutc + HOUR
-        nexthour_tz = nexthour_utc.astimezone(tz)
-        if dt.date() == dstoff.date() and dt.hour == 0:
-            # We're in the hour before the last DST hour.  The last DST hour
-            # is ineffable.  We want the conversion back to repeat 1:MM.
-            self.assertEqual(nexthour_tz, dt.replace(hour=1))
-            nexthour_utc += HOUR
-            nexthour_tz = nexthour_utc.astimezone(tz)
-            self.assertEqual(nexthour_tz, dt.replace(hour=1))
-        else:
-            self.assertEqual(nexthour_tz - dt, HOUR)
-
-    # Check a time that's outside DST.
-    def checkoutside(self, dt, tz, utc):
-        self.assertEqual(dt.dst(), ZERO)
-
-        # Conversion to our own timezone is always an identity.
-        self.assertEqual(dt.astimezone(tz), dt)
-
-        # Converting to UTC and back is an identity too.
-        asutc = dt.astimezone(utc)
-        there_and_back = asutc.astimezone(tz)
-        self.assertEqual(dt, there_and_back)
-
-    def convert_between_tz_and_utc(self, tz, utc):
-        dston = self.dston.replace(tzinfo=tz)
-        # Because 1:MM on the day DST ends is taken as being standard time,
-        # there is no spelling in tz for the last hour of daylight time.
-        # For purposes of the test, the last hour of DST is 0:MM, which is
-        # taken as being daylight time (and 1:MM is taken as being standard
-        # time).
-        dstoff = self.dstoff.replace(tzinfo=tz)
-        for delta in (
-            timedelta(weeks=13),
-            DAY,
-            HOUR,
-            timedelta(minutes=1),
-            timedelta(microseconds=1),
-        ):
-
-            self.checkinside(dston, tz, utc, dston, dstoff)
-            for during in dston + delta, dstoff - delta:
-                self.checkinside(during, tz, utc, dston, dstoff)
-
-            self.checkoutside(dstoff, tz, utc)
-            for outside in dston - delta, dstoff + delta:
-                self.checkoutside(outside, tz, utc)
-
-    def test_easy(self):
-        # Despite the name of this test, the endcases are excruciating.
-        self.convert_between_tz_and_utc(Eastern, utc_real)
-        self.convert_between_tz_and_utc(Pacific, utc_real)
-        self.convert_between_tz_and_utc(Eastern, utc_fake)
-        self.convert_between_tz_and_utc(Pacific, utc_fake)
-        # The next is really dancing near the edge.  It works because
-        # Pacific and Eastern are far enough apart that their "problem
-        # hours" don't overlap.
-        self.convert_between_tz_and_utc(Eastern, Pacific)
-        self.convert_between_tz_and_utc(Pacific, Eastern)
-        # OTOH, these fail!  Don't enable them.  The difficulty is that
-        # the edge case tests assume that every hour is representable in
-        # the "utc" class.  This is always true for a fixed-offset tzinfo
-        # class (lke utc_real and utc_fake), but not for Eastern or Central.
-        # For these adjacent DST-aware time zones, the range of time offsets
-        # tested ends up creating hours in the one that aren't representable
-        # in the other.  For the same reason, we would see failures in the
-        # Eastern vs Pacific tests too if we added 3*HOUR to the list of
-        # offset deltas in convert_between_tz_and_utc().
-        #
-        # self.convert_between_tz_and_utc(Eastern, Central)  # can't work
-        # self.convert_between_tz_and_utc(Central, Eastern)  # can't work
-
-    def test_tricky(self):
-        # 22:00 on day before daylight starts.
-        fourback = self.dston - timedelta(hours=4)
-        ninewest = FixedOffset(-9 * 60, "-0900", 0)
-        fourback = fourback.replace(tzinfo=ninewest)
-        # 22:00-0900 is 7:00 UTC == 2:00 EST == 3:00 DST.  Since it's "after
-        # 2", we should get the 3 spelling.
-        # If we plug 22:00 the day before into Eastern, it "looks like std
-        # time", so its offset is returned as -5, and -5 - -9 = 4.  Adding 4
-        # to 22:00 lands on 2:00, which makes no sense in local time (the
-        # local clock jumps from 1 to 3).  The point here is to make sure we
-        # get the 3 spelling.
-        expected = self.dston.replace(hour=3)
-        got = fourback.astimezone(Eastern).replace(tzinfo=None)
-        self.assertEqual(expected, got)
-
-        # Similar, but map to 6:00 UTC == 1:00 EST == 2:00 DST.  In that
-        # case we want the 1:00 spelling.
-        sixutc = self.dston.replace(hour=6, tzinfo=utc_real)
-        # Now 6:00 "looks like daylight", so the offset wrt Eastern is -4,
-        # and adding -4-0 == -4 gives the 2:00 spelling.  We want the 1:00 EST
-        # spelling.
-        expected = self.dston.replace(hour=1)
-        got = sixutc.astimezone(Eastern).replace(tzinfo=None)
-        self.assertEqual(expected, got)
-
-        # Now on the day DST ends, we want "repeat an hour" behavior.
-        #  UTC  4:MM  5:MM  6:MM  7:MM  checking these
-        #  EST 23:MM  0:MM  1:MM  2:MM
-        #  EDT  0:MM  1:MM  2:MM  3:MM
-        # wall  0:MM  1:MM  1:MM  2:MM  against these
-        for utc in utc_real, utc_fake:
-            for tz in Eastern, Pacific:
-                first_std_hour = self.dstoff - timedelta(hours=2)  # 23:MM
-                # Convert that to UTC.
-                first_std_hour -= tz.utcoffset(None)
-                # Adjust for possibly fake UTC.
-                asutc = first_std_hour + utc.utcoffset(None)
-                # First UTC hour to convert; this is 4:00 when utc=utc_real &
-                # tz=Eastern.
-                asutcbase = asutc.replace(tzinfo=utc)
-                for tzhour in (0, 1, 1, 2):
-                    expectedbase = self.dstoff.replace(hour=tzhour)
-                    for minute in 0, 30, 59:
-                        expected = expectedbase.replace(minute=minute)
-                        asutc = asutcbase.replace(minute=minute)
-                        astz = asutc.astimezone(tz)
-                        self.assertEqual(astz.replace(tzinfo=None), expected)
-                    asutcbase += HOUR
-
-    def test_bogus_dst(self):
-        class ok(tzinfo):
-            def utcoffset(self, dt):
-                return HOUR
-
-            def dst(self, dt):
-                return HOUR
-
-        now = self.theclass.now().replace(tzinfo=utc_real)
-        # Doesn't blow up.
-        now.astimezone(ok())
-
-        # Does blow up.
-        class notok(ok):
-            def dst(self, dt):
-                return None
-
-        self.assertRaises(ValueError, now.astimezone, notok())
-
-        # Sometimes blow up. In the following, tzinfo.dst()
-        # implementation may return None or not None depending on
-        # whether DST is assumed to be in effect.  In this situation,
-        # a ValueError should be raised by astimezone().
-        class tricky_notok(ok):
-            def dst(self, dt):
-                if dt.year == 2000:
-                    return None
-                else:
-                    return 10 * HOUR
-
-        dt = self.theclass(2001, 1, 1).replace(tzinfo=utc_real)
-        self.assertRaises(ValueError, dt.astimezone, tricky_notok())
-
-    def test_fromutc(self):
-        self.assertRaises(TypeError, Eastern.fromutc)  # not enough args
-        now = datetime.utcnow().replace(tzinfo=utc_real)
-        self.assertRaises(ValueError, Eastern.fromutc, now)  # wrong tzinfo
-        now = now.replace(tzinfo=Eastern)  # insert correct tzinfo
-        enow = Eastern.fromutc(now)  # doesn't blow up
-        self.assertEqual(enow.tzinfo, Eastern)  # has right tzinfo member
-        self.assertRaises(TypeError, Eastern.fromutc, now, now)  # too many args
-        self.assertRaises(TypeError, Eastern.fromutc, date.today())  # wrong type
-
-        # Always converts UTC to standard time.
-        class FauxUSTimeZone(USTimeZone):
-            def fromutc(self, dt):
-                return dt + self.stdoffset
-
-        FEastern = FauxUSTimeZone(-5, "FEastern", "FEST", "FEDT")
-
-        #  UTC  4:MM  5:MM  6:MM  7:MM  8:MM  9:MM
-        #  EST 23:MM  0:MM  1:MM  2:MM  3:MM  4:MM
-        #  EDT  0:MM  1:MM  2:MM  3:MM  4:MM  5:MM
-
-        # Check around DST start.
-        start = self.dston.replace(hour=4, tzinfo=Eastern)
-        fstart = start.replace(tzinfo=FEastern)
-        for wall in 23, 0, 1, 3, 4, 5:
-            expected = start.replace(hour=wall)
-            if wall == 23:
-                expected -= timedelta(days=1)
-            got = Eastern.fromutc(start)
-            self.assertEqual(expected, got)
-
-            expected = fstart + FEastern.stdoffset
-            got = FEastern.fromutc(fstart)
-            self.assertEqual(expected, got)
-
-            # Ensure astimezone() calls fromutc() too.
-            got = fstart.replace(tzinfo=utc_real).astimezone(FEastern)
-            self.assertEqual(expected, got)
-
-            start += HOUR
-            fstart += HOUR
-
-        # Check around DST end.
-        start = self.dstoff.replace(hour=4, tzinfo=Eastern)
-        fstart = start.replace(tzinfo=FEastern)
-        for wall in 0, 1, 1, 2, 3, 4:
-            expected = start.replace(hour=wall)
-            got = Eastern.fromutc(start)
-            self.assertEqual(expected, got)
-
-            expected = fstart + FEastern.stdoffset
-            got = FEastern.fromutc(fstart)
-            self.assertEqual(expected, got)
-
-            # Ensure astimezone() calls fromutc() too.
-            got = fstart.replace(tzinfo=utc_real).astimezone(FEastern)
-            self.assertEqual(expected, got)
-
-            start += HOUR
-            fstart += HOUR
-
-
-#############################################################################
-# oddballs
-
-
-class Oddballs(unittest.TestCase):
-    @unittest.skip(
-        "MicroPython doesn't implement special subclass handling from https://docs.python.org/3/reference/datamodel.html#object.__ror"
-    )
-    def test_bug_1028306(self):
-        # Trying to compare a date to a datetime should act like a mixed-
-        # type comparison, despite that datetime is a subclass of date.
-        as_date = date.today()
-        as_datetime = datetime.combine(as_date, time())
-        self.assertTrue(as_date != as_datetime)
-        self.assertTrue(as_datetime != as_date)
-        self.assertTrue(not as_date == as_datetime)
-        self.assertTrue(not as_datetime == as_date)
-        self.assertRaises(TypeError, lambda: as_date < as_datetime)
-        self.assertRaises(TypeError, lambda: as_datetime < as_date)
-        self.assertRaises(TypeError, lambda: as_date <= as_datetime)
-        self.assertRaises(TypeError, lambda: as_datetime <= as_date)
-        self.assertRaises(TypeError, lambda: as_date > as_datetime)
-        self.assertRaises(TypeError, lambda: as_datetime > as_date)
-        self.assertRaises(TypeError, lambda: as_date >= as_datetime)
-        self.assertRaises(TypeError, lambda: as_datetime >= as_date)
-
-        # Neverthelss, comparison should work with the base-class (date)
-        # projection if use of a date method is forced.
-        self.assertEqual(as_date.__eq__(as_datetime), True)
-        different_day = (as_date.day + 1) % 20 + 1
-        as_different = as_datetime.replace(day=different_day)
-        self.assertEqual(as_date.__eq__(as_different), False)
-
-        # And date should compare with other subclasses of date.  If a
-        # subclass wants to stop this, it's up to the subclass to do so.
-        date_sc = SubclassDate(as_date.year, as_date.month, as_date.day)
-        self.assertEqual(as_date, date_sc)
-        self.assertEqual(date_sc, as_date)
-
-        # Ditto for datetimes.
-        datetime_sc = SubclassDatetime(as_datetime.year, as_datetime.month, as_date.day, 0, 0, 0)
-        self.assertEqual(as_datetime, datetime_sc)
-        self.assertEqual(datetime_sc, as_datetime)
-
-
-def test_main():
-    support.run_unittest(__name__)
-
-
-if __name__ == "__main__":
-    test_main()

From ab1e6231dcfa031376e6b60e95ca24868311588d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 22 Mar 2022 08:39:03 +1100
Subject: [PATCH 003/343] tools/codeformat: By default only check/update on
 current git branch.

It can be difficult using the codeformat.py tool when there are other files
in the repository not currently matching the standard.

For developers, running over the entire repo can throw up a large list of
changes in a local git which can lead to inclusion of unrelated changes in
commits if they're added accidentally.  If the files arg is used to trim
down the list of files scanned, it runs a risk of missing some files
they've modified.  In CI, it means that PR's can fail on codeformat for
issues that aren't related to that PR.

This change adds a git query in the codeformat tool by default to only work
on the list of files that have been modified in the current branch.  This
can still be overridden by the files arg to run over all files still, eg.
python3 tools/codeformat.py -v '**'.
---
 tools/codeformat.py | 56 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index a722785a1..372436bb2 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -54,6 +54,10 @@
 PY_EXTS = (".py",)
 
 
+MAIN_BRANCH = "master"
+BASE_BRANCH = os.environ.get("GITHUB_BASE_REF", MAIN_BRANCH)
+
+
 def list_files(paths, exclusions=None, prefix=""):
     files = set()
     for pattern in paths:
@@ -105,12 +109,58 @@ def fixup_c(filename):
         assert not dedent_stack, filename
 
 
+def query_git_files(verbose):
+    def cmd_result_set(cmd):
+        ret = subprocess.run(cmd, capture_output=True).stdout.strip().decode()
+        if not ret:
+            return set()
+        return {f.strip() for f in ret.split("\n")}
+
+    try:
+        ret = set()
+
+        # Check locally modified files
+        dirty = cmd_result_set(["git", "status", "--porcelain"])
+        ret = {line.split(" ", 1)[-1] for line in dirty}
+
+        # Current commit and branch
+        current_commit = (
+            subprocess.run(["git", "rev-parse", "HEAD"], capture_output=True)
+            .stdout.strip()
+            .decode()
+        )
+        current_branches = cmd_result_set(["git", "branch", "--contains", current_commit])
+        if MAIN_BRANCH in current_branches:
+            if ret:
+                if verbose:
+                    print("Local changes detected, only scanning them.")
+                return ret
+
+            # We're on clean master, run on entire repo
+            if verbose:
+                print("Scanning whole repository")
+            return None
+
+        # List the files modified on current branch
+        if verbose:
+            print("Scanning changes from current branch and any local changes")
+        ret |= cmd_result_set(["git", "diff", "--relative", "--name-only", BASE_BRANCH])
+        return ret
+    except:
+        # Git not available, run on entire repo
+        return None
+
+
 def main():
     cmd_parser = argparse.ArgumentParser(description="Auto-format C and Python files.")
     cmd_parser.add_argument("-c", action="store_true", help="Format C code only")
     cmd_parser.add_argument("-p", action="store_true", help="Format Python code only")
     cmd_parser.add_argument("-v", action="store_true", help="Enable verbose output")
-    cmd_parser.add_argument("files", nargs="*", help="Run on specific globs")
+    cmd_parser.add_argument(
+        "files",
+        nargs="*",
+        help="Run on specific globs. If not specied current branch changes will be used",
+    )
     args = cmd_parser.parse_args()
 
     # Setting only one of -c or -p disables the other. If both or neither are set, then do both.
@@ -122,7 +172,9 @@ def main():
     if args.files:
         files = list_files(args.files)
     else:
-        files = list_files(PATHS, EXCLUSIONS, TOP)
+        files = query_git_files(verbose=args.v)
+        if not files:
+            files = list_files(PATHS, EXCLUSIONS, TOP)
 
     # Extract files matching a specific language.
     def lang_files(exts):

From 22cd7fdd64767adaaaf1a321fd26f701392970bf Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 23 Mar 2022 11:40:20 +1100
Subject: [PATCH 004/343] tools/codeformat: Fix compatibility running from
 subfolder in repo.

---
 tools/codeformat.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 372436bb2..63c9c5988 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -116,12 +116,23 @@ def cmd_result_set(cmd):
             return set()
         return {f.strip() for f in ret.split("\n")}
 
+    def rel_paths(files, root):
+        return {os.path.relpath(os.path.join(root, f.strip()), ".") for f in files}
+
     try:
         ret = set()
 
+        # get path to root of repository
+        root_dir = (
+            subprocess.run(["git", "rev-parse", "--show-toplevel"], capture_output=True)
+            .stdout.strip()
+            .decode()
+        )
+
         # Check locally modified files
-        dirty = cmd_result_set(["git", "status", "--porcelain"])
-        ret = {line.split(" ", 1)[-1] for line in dirty}
+        status = cmd_result_set(["git", "status", "--porcelain"])
+        dirty_files = rel_paths({line.split(" ", 1)[-1] for line in status}, root_dir)
+        ret |= dirty_files
 
         # Current commit and branch
         current_commit = (
@@ -144,7 +155,10 @@ def cmd_result_set(cmd):
         # List the files modified on current branch
         if verbose:
             print("Scanning changes from current branch and any local changes")
-        ret |= cmd_result_set(["git", "diff", "--relative", "--name-only", BASE_BRANCH])
+        files_on_branch = rel_paths(
+            cmd_result_set(["git", "diff", "--name-only", BASE_BRANCH]), root_dir
+        )
+        ret |= files_on_branch
         return ret
     except:
         # Git not available, run on entire repo

From 760bfefd9dff84be4b22379ea51f03413a49ff4b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 22 Feb 2022 18:04:44 +0100
Subject: [PATCH 005/343] micropython/upysh: Add the cp() function and improve
 ls and rm.

- cp() copies a file. If the target is a directory, the file is copied
  into that directory.  It uses a small buffer, so it's not fast.
- ls uses ilistdir and creates a sorted output with directories listed as
  the first group.
- rm optionally deletes recursive, if the target is a directory.
---
 micropython/upysh/upysh.py | 74 +++++++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/micropython/upysh/upysh.py b/micropython/upysh/upysh.py
index e46d395c9..0f0ad65ba 100644
--- a/micropython/upysh/upysh.py
+++ b/micropython/upysh/upysh.py
@@ -8,14 +8,22 @@ def __repr__(self):
         return ""
 
     def __call__(self, path="."):
-        l = os.listdir(path)
+        l = list(os.ilistdir(path))
         l.sort()
         for f in l:
-            st = os.stat("%s/%s" % (path, f))
-            if st[0] & 0x4000:  # stat.S_IFDIR
-                print("   <dir> %s" % f)
-            else:
-                print("% 8d %s" % (st[6], f))
+            if f[1] == 0x4000:  # stat.S_IFDIR
+                print("    <dir> %s" % f[0])
+        for f in l:
+            if f[1] != 0x4000:
+                if len(f) > 3:
+                    print("% 9d %s" % (f[3], f[0]))
+                else:
+                    print("          %s" % f[0])
+        try:
+            st = os.statvfs(path)
+            print("\n{:,d}k free".format(st[1] * st[3] // 1024))
+        except:
+            pass
 
 
 class PWD:
@@ -34,17 +42,6 @@ def __call__(self):
         return self.__repr__()
 
 
-pwd = PWD()
-ls = LS()
-clear = CLEAR()
-
-cd = os.chdir
-mkdir = os.mkdir
-mv = os.rename
-rm = os.remove
-rmdir = os.rmdir
-
-
 def head(f, n=10):
     with open(f) as f:
         for i in range(n):
@@ -58,6 +55,22 @@ def cat(f):
     head(f, 1 << 30)
 
 
+def cp(s, t):
+    try:
+        if os.stat(t)[0] & 0x4000:  # is directory
+            t = t.rstrip("/") + "/" + s
+    except OSError:
+        pass
+    buf = bytearray(512)
+    buf_mv = memoryview(buf)
+    with open(s, "rb") as s, open(t, "wb") as t:
+        while True:
+            n = s.readinto(buf)
+            if n <= 0:
+                break
+            t.write(buf_mv[:n])
+
+
 def newfile(path):
     print("Type file contents line by line, finish with EOF (Ctrl+D).")
     with open(path, "w") as f:
@@ -70,6 +83,19 @@ def newfile(path):
             f.write("\n")
 
 
+def rm(d, recursive=False):  # Remove file or tree
+    try:
+        if (os.stat(d)[0] & 0x4000) and recursive:  # Dir
+            for f in os.ilistdir(d):
+                if f[0] != "." and f[0] != "..":
+                    rm("/".join((d, f[0])))  # File or Dir
+            os.rmdir(d)
+        else:  # File
+            os.remove(d)
+    except:
+        print("rm of '%s' failed" % d)
+
+
 class Man:
     def __repr__(self):
         return """
@@ -79,12 +105,20 @@ def __repr__(self):
 To see this help text again, type "man".
 
 upysh commands:
-pwd, cd("new_dir"), ls, ls(...), head(...), cat(...)
-newfile(...), mv("old", "new"), rm(...), mkdir(...), rmdir(...),
-clear
+clear, ls, ls(...), head(...), cat(...), newfile(...)
+cp('src', 'dest'), mv('old', 'new'), rm(...)
+pwd, cd(...), mkdir(...), rmdir(...)
 """
 
 
 man = Man()
+pwd = PWD()
+ls = LS()
+clear = CLEAR()
+
+cd = os.chdir
+mkdir = os.mkdir
+mv = os.rename
+rmdir = os.rmdir
 
 print(man)

From 0c31e0b3d712fcd21982daec8bfca48ad5527a72 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matthew.trentini@planetinnovation.com.au>
Date: Tue, 4 Jan 2022 16:23:58 +1100
Subject: [PATCH 006/343] micropython/aioble: Prioritise services in
 advertisement payload.

A number of fields (services, appearance, manufacturer, name) can appear
when a scan is requested.  However there is only so much space in the
header so, if a user has configured multiple fields, some may be 'pushed'
into the active scan response which requires additional communication.

When iOS scans for BLE devices it can filter by services, and so services
must be in the advertising (as opposed to scan response) payload.
---
 micropython/bluetooth/aioble/aioble/peripheral.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/peripheral.py b/micropython/bluetooth/aioble/aioble/peripheral.py
index 0b89c4871..099f2c557 100644
--- a/micropython/bluetooth/aioble/aioble/peripheral.py
+++ b/micropython/bluetooth/aioble/aioble/peripheral.py
@@ -126,9 +126,8 @@ async def advertise(
             struct.pack("B", (0x01 if limited_disc else 0x02) + (0x18 if br_edr else 0x04)),
         )
 
-        if name:
-            resp_data = _append(adv_data, resp_data, _ADV_TYPE_NAME, name)
-
+        # Services are prioritised to go in the advertising data because iOS supports
+        # filtering scan results by service only, so services must come first.
         if services:
             for uuid in services:
                 b = bytes(uuid)
@@ -139,6 +138,9 @@ async def advertise(
                 elif len(b) == 16:
                     resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID128_COMPLETE, b)
 
+        if name:
+            resp_data = _append(adv_data, resp_data, _ADV_TYPE_NAME, name)
+
         if appearance:
             # See org.bluetooth.characteristic.gap.appearance.xml
             resp_data = _append(

From dcdac1f552d2684751ff0f75d20030b12e97407f Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 18 Mar 2022 12:41:10 +1100
Subject: [PATCH 007/343] fnmatch: Add ure compatibility.

Removes dependency on re-pcre which is only available on unix port.
---
 python-stdlib/fnmatch/fnmatch.py      | 18 +++++++++++++++++-
 python-stdlib/fnmatch/metadata.txt    |  2 +-
 python-stdlib/fnmatch/setup.py        |  2 +-
 python-stdlib/fnmatch/test_fnmatch.py |  7 ++++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/python-stdlib/fnmatch/fnmatch.py b/python-stdlib/fnmatch/fnmatch.py
index 93b5d5214..f573d75c6 100644
--- a/python-stdlib/fnmatch/fnmatch.py
+++ b/python-stdlib/fnmatch/fnmatch.py
@@ -17,6 +17,8 @@
 
 __all__ = ["filter", "fnmatch", "fnmatchcase", "translate"]
 
+COMPAT = re.__name__ == "ure"
+
 
 def fnmatch(name, pat):
     """Test whether FILENAME matches PATTERN.
@@ -46,6 +48,11 @@ def _compile_pattern(pat):
         res = bytes(res_str, "ISO-8859-1")
     else:
         res = translate(pat)
+    if COMPAT:
+        if res.startswith("(?ms)"):
+            res = res[5:]
+        if res.endswith("\\Z"):
+            res = res[:-2] + "$"
     return re.compile(res).match
 
 
@@ -104,6 +111,15 @@ def translate(pat):
                     stuff = "\\" + stuff
                 res = "%s[%s]" % (res, stuff)
         else:
-            res = res + re.escape(c)
+            try:
+                res = res + re.escape(c)
+            except AttributeError:
+                # Using ure rather than re-pcre
+                res = res + re_escape(c)
     # Original patterns is undefined, see http://bugs.python.org/issue21464
     return "(?ms)" + res + "\Z"
+
+
+def re_escape(pattern):
+    # Replacement minimal re.escape for ure compatibility
+    return re.sub(r"([\^\$\.\|\?\*\+\(\)\[\\])", r"\\\1", pattern)
diff --git a/python-stdlib/fnmatch/metadata.txt b/python-stdlib/fnmatch/metadata.txt
index faa832140..5eb297d46 100644
--- a/python-stdlib/fnmatch/metadata.txt
+++ b/python-stdlib/fnmatch/metadata.txt
@@ -1,4 +1,4 @@
 srctype = cpython
 type = module
 version = 0.5.2
-depends = os, os.path, re-pcre
+depends = os, os.path
diff --git a/python-stdlib/fnmatch/setup.py b/python-stdlib/fnmatch/setup.py
index 415804c01..5a9ac6323 100644
--- a/python-stdlib/fnmatch/setup.py
+++ b/python-stdlib/fnmatch/setup.py
@@ -21,5 +21,5 @@
     license="Python",
     cmdclass={"sdist": sdist_upip.sdist},
     py_modules=["fnmatch"],
-    install_requires=["micropython-os", "micropython-os.path", "micropython-re-pcre"],
+    install_requires=["micropython-os", "micropython-os.path"],
 )
diff --git a/python-stdlib/fnmatch/test_fnmatch.py b/python-stdlib/fnmatch/test_fnmatch.py
index 1ddf8a607..4eaeec63b 100644
--- a/python-stdlib/fnmatch/test_fnmatch.py
+++ b/python-stdlib/fnmatch/test_fnmatch.py
@@ -10,7 +10,8 @@ class FnmatchTestCase(unittest.TestCase):
     def check_match(self, filename, pattern, should_match=1, fn=fnmatch):
         if should_match:
             self.assertTrue(
-                fn(filename, pattern), "expected %r to match pattern %r" % (filename, pattern)
+                fn(filename, pattern),
+                "expected %r to match pattern %r" % (filename, pattern),
             )
         else:
             self.assertTrue(
@@ -80,9 +81,9 @@ def test_filter(self):
         self.assertEqual(filter(["a", "b"], "a"), ["a"])
 
 
-def test_main():
+def main():
     support.run_unittest(FnmatchTestCase, TranslateTestCase, FilterTestCase)
 
 
 if __name__ == "__main__":
-    test_main()
+    main()

From 7259f0fd6f8759646d044eee2a40a6456734aca6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 12 Apr 2022 05:49:06 +1000
Subject: [PATCH 008/343] fnmatch: Remove dependency on os.path.

---
 python-stdlib/fnmatch/fnmatch.py   | 24 +++++++++++++++++-------
 python-stdlib/fnmatch/metadata.txt |  1 -
 python-stdlib/fnmatch/setup.py     |  1 -
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/python-stdlib/fnmatch/fnmatch.py b/python-stdlib/fnmatch/fnmatch.py
index f573d75c6..71009afa2 100644
--- a/python-stdlib/fnmatch/fnmatch.py
+++ b/python-stdlib/fnmatch/fnmatch.py
@@ -9,11 +9,21 @@
 The function translate(PATTERN) returns a regular expression
 corresponding to PATTERN.  (It does not compile it.)
 """
-import os
-import os.path
 import re
 
-# import functools
+try:
+    from os.path import normcase
+except ImportError:
+
+    def normcase(s):
+        """
+        From os.path.normcase
+        Normalize the case of a pathname. On Windows, convert all characters
+        in the pathname to lowercase, and also convert forward slashes to
+        backward slashes. On other operating systems, return the path unchanged.
+        """
+        return s
+
 
 __all__ = ["filter", "fnmatch", "fnmatchcase", "translate"]
 
@@ -35,8 +45,8 @@ def fnmatch(name, pat):
     if the operating system requires it.
     If you don't want this, use fnmatchcase(FILENAME, PATTERN).
     """
-    name = os.path.normcase(name)
-    pat = os.path.normcase(pat)
+    name = normcase(name)
+    pat = normcase(pat)
     return fnmatchcase(name, pat)
 
 
@@ -59,10 +69,10 @@ def _compile_pattern(pat):
 def filter(names, pat):
     """Return the subset of the list NAMES that match PAT."""
     result = []
-    pat = os.path.normcase(pat)
+    pat = normcase(pat)
     match = _compile_pattern(pat)
     for name in names:
-        if match(os.path.normcase(name)):
+        if match(normcase(name)):
             result.append(name)
     return result
 
diff --git a/python-stdlib/fnmatch/metadata.txt b/python-stdlib/fnmatch/metadata.txt
index 5eb297d46..10b54b832 100644
--- a/python-stdlib/fnmatch/metadata.txt
+++ b/python-stdlib/fnmatch/metadata.txt
@@ -1,4 +1,3 @@
 srctype = cpython
 type = module
 version = 0.5.2
-depends = os, os.path
diff --git a/python-stdlib/fnmatch/setup.py b/python-stdlib/fnmatch/setup.py
index 5a9ac6323..7ca64ddf8 100644
--- a/python-stdlib/fnmatch/setup.py
+++ b/python-stdlib/fnmatch/setup.py
@@ -21,5 +21,4 @@
     license="Python",
     cmdclass={"sdist": sdist_upip.sdist},
     py_modules=["fnmatch"],
-    install_requires=["micropython-os", "micropython-os.path"],
 )

From d64557a2114d4c366242e929af15dd61b6ff7f4b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 18 Mar 2022 12:42:00 +1100
Subject: [PATCH 009/343] fnmatch: Release 0.6.0.

---
 python-stdlib/fnmatch/metadata.txt | 2 +-
 python-stdlib/fnmatch/setup.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-stdlib/fnmatch/metadata.txt b/python-stdlib/fnmatch/metadata.txt
index 10b54b832..27b8c03f3 100644
--- a/python-stdlib/fnmatch/metadata.txt
+++ b/python-stdlib/fnmatch/metadata.txt
@@ -1,3 +1,3 @@
 srctype = cpython
 type = module
-version = 0.5.2
+version = 0.6.0
diff --git a/python-stdlib/fnmatch/setup.py b/python-stdlib/fnmatch/setup.py
index 7ca64ddf8..06331a9cb 100644
--- a/python-stdlib/fnmatch/setup.py
+++ b/python-stdlib/fnmatch/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="micropython-fnmatch",
-    version="0.5.2",
+    version="0.6.0",
     description="CPython fnmatch module ported to MicroPython",
     long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
     url="https://github.com/micropython/micropython-lib",

From a9cd99ce2d2af4d236cfe86a722f55af2bcd4528 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 1 Nov 2018 16:25:38 +1100
Subject: [PATCH 010/343] unittest: Allow passing module name or instance into
 unittest.main()

---
 python-stdlib/unittest/unittest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 2b00fbddb..3aed90c72 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -219,7 +219,7 @@ def test_cases(m):
             if isinstance(c, object) and isinstance(c, type) and issubclass(c, TestCase):
                 yield c
 
-    m = __import__(module)
+    m = __import__(module) if isinstance(module, str) else module
     suite = TestSuite()
     for c in test_cases(m):
         suite.addTest(c)

From 7d4d02edfc689811ac9fb120a188498686bfc56d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Wed, 31 Oct 2018 11:49:45 +1100
Subject: [PATCH 011/343] unittest: Log failure tracebacks at test end.

Store traceback details for each test failure and log to console at the
end of the test, like CPython version of the module does.
---
 python-stdlib/unittest/unittest.py | 31 ++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 3aed90c72..55468b548 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -1,5 +1,13 @@
 import sys
 
+try:
+    import io
+    import traceback
+except ImportError:
+    import uio as io
+
+    traceback = None
+
 
 class SkipTest(Exception):
     pass
@@ -160,7 +168,7 @@ class TestRunner:
     def run(self, suite):
         res = TestResult()
         for c in suite.tests:
-            run_class(c, res)
+            res.exceptions.extend(run_class(c, res))
 
         print("Ran %d tests\n" % res.testsRun)
         if res.failuresNum > 0 or res.errorsNum > 0:
@@ -180,16 +188,27 @@ def __init__(self):
         self.failuresNum = 0
         self.skippedNum = 0
         self.testsRun = 0
+        self.exceptions = []
 
     def wasSuccessful(self):
         return self.errorsNum == 0 and self.failuresNum == 0
 
 
+def capture_exc(e):
+    buf = io.StringIO()
+    if hasattr(sys, "print_exception"):
+        sys.print_exception(e, buf)
+    elif traceback is not None:
+        traceback.print_exception(None, e, sys.exc_info()[2], file=buf)
+    return buf.getvalue()
+
+
 # TODO: Uncompliant
 def run_class(c, test_result):
     o = c()
     set_up = getattr(o, "setUp", lambda: None)
     tear_down = getattr(o, "tearDown", lambda: None)
+    exceptions = []
     for name in dir(o):
         if name.startswith("test"):
             print("%s (%s) ..." % (name, c.__qualname__), end="")
@@ -202,14 +221,14 @@ def run_class(c, test_result):
             except SkipTest as e:
                 print(" skipped:", e.args[0])
                 test_result.skippedNum += 1
-            except:
+            except Exception as ex:
+                exceptions.append(capture_exc(ex))
                 print(" FAIL")
                 test_result.failuresNum += 1
-                # Uncomment to investigate failure in detail
-                # raise
                 continue
             finally:
                 tear_down()
+    return exceptions
 
 
 def main(module="__main__"):
@@ -225,5 +244,9 @@ def test_cases(m):
         suite.addTest(c)
     runner = TestRunner()
     result = runner.run(suite)
+    if result.exceptions:
+        sep = "\n----------------------------------------------------------------------\n"
+        print(sep)
+        print(sep.join(result.exceptions))
     # Terminate with non zero return code in case of failures
     sys.exit(result.failuresNum > 0)

From 663a3d6c54a97f4f11288889b59b23cbe8e4d8cd Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 19 Dec 2018 00:36:08 +0300
Subject: [PATCH 012/343] unittest: test_unittest.py: Fix typo in method name.

---
 python-stdlib/unittest/test_unittest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 4651cf852..78c3dc9e8 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -37,7 +37,7 @@ def test_AlmostEqual(self):
         with self.assertRaises(AssertionError):
             self.assertNotAlmostEqual(float("inf"), float("inf"))
 
-    def test_AmostEqualWithDelta(self):
+    def test_AlmostEqualWithDelta(self):
         self.assertAlmostEqual(1.1, 1.0, delta=0.5)
         self.assertAlmostEqual(1.0, 1.1, delta=0.5)
         self.assertNotAlmostEqual(1.1, 1.0, delta=0.05)

From 669d343feb80f17eb932f5f576e6ebfb79cd3295 Mon Sep 17 00:00:00 2001
From: sss <satbir.singh@planetinnovation.com.au>
Date: Wed, 31 Oct 2018 15:59:56 +1100
Subject: [PATCH 013/343] unittest: Allow to catch AssertionError with
 assertRaises().

Without this change, current implementaiton produces a false positive
result for AssertionError type.

Example of falsely passing test code:

def test(a, b):
    assert a > 10
    assert b > 10

self.assertRaises(AssertionError, test, 20, 20)
---
 python-stdlib/unittest/unittest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 55468b548..f6772ddbe 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -126,12 +126,13 @@ def assertRaises(self, exc, func=None, *args, **kwargs):
 
         try:
             func(*args, **kwargs)
-            assert False, "%r not raised" % exc
         except Exception as e:
             if isinstance(e, exc):
                 return
             raise
 
+        assert False, "%r not raised" % exc
+
 
 def skip(msg):
     def _decor(fun):

From fca89f65c7d2e8780cdc7b6be7c8548eb1f704c1 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 26 Jan 2019 02:42:30 +0300
Subject: [PATCH 014/343] unittest: test_unittest: Add test for
 .assertRaises(AssertionError).

Make sure that not raising AssertionError from tested function is properly
caught.
---
 python-stdlib/unittest/test_unittest.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 78c3dc9e8..645363cee 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -111,6 +111,21 @@ def testRaises(self):
     def testSkip(self):
         self.assertFail("this should be skipped")
 
+    def testAssert(self):
+
+        e1 = None
+        try:
+
+            def func_under_test(a):
+                assert a > 10
+
+            self.assertRaises(AssertionError, func_under_test, 20)
+        except AssertionError as e:
+            e1 = e
+
+        if not e1 or "not raised" not in e1.args[0]:
+            self.fail("Expected to catch lack of AssertionError from assert in func_under_test")
+
 
 if __name__ == "__main__":
     unittest.main()

From 965e25ce89d9dfd3ca9e7b51cc34cd3ef265574e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 3 Mar 2019 23:40:09 +0300
Subject: [PATCH 015/343] unittest: test_unittest: Typo fix.

---
 python-stdlib/unittest/test_unittest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 645363cee..8188def9e 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -109,7 +109,7 @@ def testRaises(self):
 
     @unittest.skip("test of skipping")
     def testSkip(self):
-        self.assertFail("this should be skipped")
+        self.fail("this should be skipped")
 
     def testAssert(self):
 

From a57b575020b026bc339cdb0abab89da47c0e81ea Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 27 Jul 2019 07:14:45 +0300
Subject: [PATCH 016/343] unittest: AssertRaisesContext: Store exception value
 as self.exception.

For tests to check. This feature is used by CPython stdlib tests.
---
 python-stdlib/unittest/unittest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index f6772ddbe..061a0b0b4 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -21,6 +21,7 @@ def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, tb):
+        self.exception = exc_value
         if exc_type is None:
             assert False, "%r not raised" % self.expected
         if issubclass(exc_type, self.expected):

From dedfe2dcd4627546c52f4620393324f7ab57a55a Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 13 Aug 2019 08:29:50 +0300
Subject: [PATCH 017/343] unittest: Add assertLessEqual, assertGreaterEqual
 methods.

As used by CPython testsuite.
---
 python-stdlib/unittest/unittest.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 061a0b0b4..a22880d5a 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -43,6 +43,16 @@ def assertNotEqual(self, x, y, msg=""):
             msg = "%r not expected to be equal %r" % (x, y)
         assert x != y, msg
 
+    def assertLessEqual(self, x, y, msg=None):
+        if msg is None:
+            msg = "%r is expected to be <= %r" % (x, y)
+        assert x <= y, msg
+
+    def assertGreaterEqual(self, x, y, msg=None):
+        if msg is None:
+            msg = "%r is expected to be >= %r" % (x, y)
+        assert x >= y, msg
+
     def assertAlmostEqual(self, x, y, places=None, msg="", delta=None):
         if x == y:
             return

From dc788f4e5003bef2bf1dcc87d16691f7c82a10c4 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 14 Dec 2019 22:17:02 +0300
Subject: [PATCH 018/343] unittest: Reinstate useful debugger helper.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index a22880d5a..a3e058b1b 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -237,6 +237,8 @@ def run_class(c, test_result):
                 exceptions.append(capture_exc(ex))
                 print(" FAIL")
                 test_result.failuresNum += 1
+                # Uncomment to investigate failure in detail
+                # raise
                 continue
             finally:
                 tear_down()

From c72ec5c0296165b7430f8562826e18e75274998b Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 15 Dec 2019 15:05:18 +0300
Subject: [PATCH 019/343] unittest: TestSuite: Add undescore to internal field,
 self._tests.

To avoid possible name clashes.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index a3e058b1b..e0c463fff 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -170,16 +170,16 @@ def skipUnless(cond, msg):
 
 class TestSuite:
     def __init__(self):
-        self.tests = []
+        self._tests = []
 
     def addTest(self, cls):
-        self.tests.append(cls)
+        self._tests.append(cls)
 
 
 class TestRunner:
     def run(self, suite):
         res = TestResult()
-        for c in suite.tests:
+        for c in suite._tests:
             res.exceptions.extend(run_class(c, res))
 
         print("Ran %d tests\n" % res.testsRun)

From d747b21fc690191b63242948b0695eafa12a9bf5 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 15 Dec 2019 16:13:47 +0300
Subject: [PATCH 020/343] unittest: Only treat callable fields as test methods.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index e0c463fff..066ad3613 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -223,8 +223,10 @@ def run_class(c, test_result):
     exceptions = []
     for name in dir(o):
         if name.startswith("test"):
-            print("%s (%s) ..." % (name, c.__qualname__), end="")
             m = getattr(o, name)
+            if not callable(m):
+                continue
+            print("%s (%s) ..." % (name, c.__qualname__), end="")
             set_up()
             try:
                 test_result.testsRun += 1

From f09d2ec608f8238c7c88c04575c0bb3d87334ef8 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 26 Feb 2020 15:03:46 +0200
Subject: [PATCH 021/343] unittest: Support both test classes and class
 instances.

And for clarity, rename runner function run_class() -> run_suite().

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 066ad3613..55d002f42 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -180,7 +180,7 @@ class TestRunner:
     def run(self, suite):
         res = TestResult()
         for c in suite._tests:
-            res.exceptions.extend(run_class(c, res))
+            res.exceptions.extend(run_suite(c, res))
 
         print("Ran %d tests\n" % res.testsRun)
         if res.failuresNum > 0 or res.errorsNum > 0:
@@ -216,8 +216,11 @@ def capture_exc(e):
 
 
 # TODO: Uncompliant
-def run_class(c, test_result):
-    o = c()
+def run_suite(c, test_result):
+    if isinstance(c, type):
+        o = c()
+    else:
+        o = c
     set_up = getattr(o, "setUp", lambda: None)
     tear_down = getattr(o, "tearDown", lambda: None)
     exceptions = []

From 5d3a44cb1c80ced042be88e1a4c0dd4bbbfe9c27 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 27 Feb 2020 17:17:48 +0200
Subject: [PATCH 022/343] unittest: TestCase: Add (dummy) __init__.

Mostly to workaround inherited MicroPython's issues with inheritance.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 55d002f42..fb6c61254 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -30,6 +30,9 @@ def __exit__(self, exc_type, exc_value, tb):
 
 
 class TestCase:
+    def __init__(self):
+        pass
+
     def fail(self, msg=""):
         assert False, msg
 

From 7d777740275c270223fd88d261a47557834f1cbc Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 8 Aug 2020 11:42:24 +0300
Subject: [PATCH 023/343] unittest: Add TestCase.skipTest() method.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index fb6c61254..70da2ce16 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -33,6 +33,9 @@ class TestCase:
     def __init__(self):
         pass
 
+    def skipTest(self, reason):
+        raise SkipTest(reason)
+
     def fail(self, msg=""):
         assert False, msg
 

From 555f28ce6d83f2193149b22a2da7551243e6396f Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 9 Aug 2020 11:58:19 +0300
Subject: [PATCH 024/343] unittest: Add dummy TestCase.subTest() context
 manager.

Just runs "subtests" in the scope of the main TestCase.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 70da2ce16..deb678b9d 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -29,10 +29,21 @@ def __exit__(self, exc_type, exc_value, tb):
         return False
 
 
+class NullContext:
+    def __enter__(self):
+        pass
+
+    def __exit__(self, a, b, c):
+        pass
+
+
 class TestCase:
     def __init__(self):
         pass
 
+    def subTest(self, msg=None, **params):
+        return NullContext()
+
     def skipTest(self, reason):
         raise SkipTest(reason)
 

From 04dce89790881d3bc1a4659a4020e7899759be13 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Mon, 10 Aug 2020 20:54:49 +0300
Subject: [PATCH 025/343] unittest: Add dummy TestCase.assertWarns() context
 manager.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index deb678b9d..5911117c2 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -161,6 +161,9 @@ def assertRaises(self, exc, func=None, *args, **kwargs):
 
         assert False, "%r not raised" % exc
 
+    def assertWarns(self, warn):
+        return NullContext()
+
 
 def skip(msg):
     def _decor(fun):

From 2c0b508e4dcf929d96e58e62567d11ff6661e0b2 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 15 Nov 2020 11:52:23 +0300
Subject: [PATCH 026/343] unittest: TestSuite: Add run() method.

For CPython compatibility.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 5911117c2..4e428204d 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -195,12 +195,16 @@ def __init__(self):
     def addTest(self, cls):
         self._tests.append(cls)
 
+    def run(self, result):
+        for c in self._tests:
+            result.exceptions.extend(run_suite(c, result))
+        return result
+
 
 class TestRunner:
     def run(self, suite):
         res = TestResult()
-        for c in suite._tests:
-            res.exceptions.extend(run_suite(c, res))
+        suite.run(res)
 
         print("Ran %d tests\n" % res.testsRun)
         if res.failuresNum > 0 or res.errorsNum > 0:

From 1b46612f941ce96800af57d82e59d16750943284 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 13 May 2021 01:30:32 +0300
Subject: [PATCH 027/343] unittest: Implement basic addCleanup()/doCleanup().

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 4e428204d..8c092a31d 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -41,6 +41,17 @@ class TestCase:
     def __init__(self):
         pass
 
+    def addCleanup(self, func, *args, **kwargs):
+        if not hasattr(self, "_cleanups"):
+            self._cleanups = []
+        self._cleanups.append((func, args, kwargs))
+
+    def doCleanups(self):
+        if hasattr(self, "_cleanups"):
+            while self._cleanups:
+                func, args, kwargs = self._cleanups.pop()
+                func(*args, **kwargs)
+
     def subTest(self, msg=None, **params):
         return NullContext()
 
@@ -271,6 +282,7 @@ def run_suite(c, test_result):
                 continue
             finally:
                 tear_down()
+                o.doCleanups()
     return exceptions
 
 

From e582666f5da9670abeba5c84cfcabeff9099c0d1 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Fri, 14 May 2021 17:15:24 +0300
Subject: [PATCH 028/343] unittest: Properly handle failures vs errors.

Also, rework result printing to be more compatible with CPython.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 46 +++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 8c092a31d..ac1ff5fc3 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -208,7 +208,7 @@ def addTest(self, cls):
 
     def run(self, result):
         for c in self._tests:
-            result.exceptions.extend(run_suite(c, result))
+            run_suite(c, result)
         return result
 
 
@@ -217,6 +217,8 @@ def run(self, suite):
         res = TestResult()
         suite.run(res)
 
+        res.printErrors()
+        print("----------------------------------------------------------------------")
         print("Ran %d tests\n" % res.testsRun)
         if res.failuresNum > 0 or res.errorsNum > 0:
             print("FAILED (failures=%d, errors=%d)" % (res.failuresNum, res.errorsNum))
@@ -235,11 +237,33 @@ def __init__(self):
         self.failuresNum = 0
         self.skippedNum = 0
         self.testsRun = 0
-        self.exceptions = []
+        self.errors = []
+        self.failures = []
 
     def wasSuccessful(self):
         return self.errorsNum == 0 and self.failuresNum == 0
 
+    def printErrors(self):
+        print()
+        self.printErrorList(self.errors)
+        self.printErrorList(self.failures)
+
+    def printErrorList(self, lst):
+        sep = "----------------------------------------------------------------------"
+        for c, e in lst:
+            print("======================================================================")
+            print(c)
+            print(sep)
+            print(e)
+
+    def __repr__(self):
+        # Format is compatible with CPython.
+        return "<unittest.result.TestResult run=%d errors=%d failures=%d>" % (
+            self.testsRun,
+            self.errorsNum,
+            self.failuresNum,
+        )
+
 
 def capture_exc(e):
     buf = io.StringIO()
@@ -274,9 +298,15 @@ def run_suite(c, test_result):
                 print(" skipped:", e.args[0])
                 test_result.skippedNum += 1
             except Exception as ex:
-                exceptions.append(capture_exc(ex))
-                print(" FAIL")
-                test_result.failuresNum += 1
+                ex_str = capture_exc(ex)
+                if isinstance(ex, AssertionError):
+                    test_result.failuresNum += 1
+                    test_result.failures.append(((name, c), ex_str))
+                    print(" FAIL")
+                else:
+                    test_result.errorsNum += 1
+                    test_result.errors.append(((name, c), ex_str))
+                    print(" ERROR")
                 # Uncomment to investigate failure in detail
                 # raise
                 continue
@@ -299,9 +329,5 @@ def test_cases(m):
         suite.addTest(c)
     runner = TestRunner()
     result = runner.run(suite)
-    if result.exceptions:
-        sep = "\n----------------------------------------------------------------------\n"
-        print(sep)
-        print(sep.join(result.exceptions))
     # Terminate with non zero return code in case of failures
-    sys.exit(result.failuresNum > 0)
+    sys.exit(result.failuresNum or result.errorsNum)

From 8e82f3d80b436656a37d3feb1edcfc416b1a6674 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 15 May 2021 10:35:25 +0300
Subject: [PATCH 029/343] unittest: Support recursive TestSuite's.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index ac1ff5fc3..dcdc5a1c1 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -276,6 +276,10 @@ def capture_exc(e):
 
 # TODO: Uncompliant
 def run_suite(c, test_result):
+    if isinstance(c, TestSuite):
+        c.run(test_result)
+        return
+
     if isinstance(c, type):
         o = c()
     else:

From 377ebbfe56076584f697af731c4c9e4259f6cefc Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Mon, 19 Jul 2021 17:28:35 +0300
Subject: [PATCH 030/343] unittest: Add expectedFailure decorator.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index dcdc5a1c1..e6793809c 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -199,6 +199,18 @@ def skipUnless(cond, msg):
     return skip(msg)
 
 
+def expectedFailure(test):
+    def test_exp_fail(*args, **kwargs):
+        try:
+            test(*args, **kwargs)
+        except:
+            pass
+        else:
+            assert False, "unexpected success"
+
+    return test_exp_fail
+
+
 class TestSuite:
     def __init__(self):
         self._tests = []

From 01fcd42042162e62a208fe88c79b981f7d5dd6a2 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 20 Jul 2021 22:06:52 +0300
Subject: [PATCH 031/343] unittest: test_unittest: Add tests for
 expectedFailure decorator.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/test_unittest.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 8188def9e..7d7e4ca27 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -126,6 +126,22 @@ def func_under_test(a):
         if not e1 or "not raised" not in e1.args[0]:
             self.fail("Expected to catch lack of AssertionError from assert in func_under_test")
 
+    @unittest.expectedFailure
+    def testExpectedFailure(self):
+        self.assertEqual(1, 0)
+
+    def testExpectedFailureNot(self):
+        @unittest.expectedFailure
+        def testInner():
+            self.assertEqual(1, 1)
+
+        try:
+            testInner()
+        except:
+            pass
+        else:
+            self.fail("Unexpected success was not detected")
+
 
 if __name__ == "__main__":
     unittest.main()

From 5a53a75ec102fa3510488fca5311f6ffbc400398 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 12 Oct 2021 08:57:23 +0300
Subject: [PATCH 032/343] unittest: Print no. of skipped tests in a way
 compatible with CPython.

Perhaps, modern CPython (3.8).

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index e6793809c..b5e2090a0 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -237,7 +237,7 @@ def run(self, suite):
         else:
             msg = "OK"
             if res.skippedNum > 0:
-                msg += " (%d skipped)" % res.skippedNum
+                msg += " (skipped=%d)" % res.skippedNum
             print(msg)
 
         return res

From ac282d861e5163412883ad7aac8d18dd3cd6e8dd Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 13 Oct 2021 22:22:20 +0300
Subject: [PATCH 033/343] unittest: Add TextTestRunner as alias for TestRunner.

For CPython compatibility.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index b5e2090a0..2fbe97583 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -243,6 +243,9 @@ def run(self, suite):
         return res
 
 
+TextTestRunner = TestRunner
+
+
 class TestResult:
     def __init__(self):
         self.errorsNum = 0

From f92833b0157ae284b09e1b3c6d355516f8e66209 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 23 Oct 2021 18:09:32 +0300
Subject: [PATCH 034/343] unittest: Support TestCase subclasses with own
 runTest() method.

E.g. for doctest.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>
---
 python-stdlib/unittest/unittest.py | 58 +++++++++++++++++-------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 2fbe97583..02a94d04d 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -302,36 +302,44 @@ def run_suite(c, test_result):
     set_up = getattr(o, "setUp", lambda: None)
     tear_down = getattr(o, "tearDown", lambda: None)
     exceptions = []
+
+    def run_one(m):
+        print("%s (%s) ..." % (name, c.__qualname__), end="")
+        set_up()
+        try:
+            test_result.testsRun += 1
+            m()
+            print(" ok")
+        except SkipTest as e:
+            print(" skipped:", e.args[0])
+            test_result.skippedNum += 1
+        except Exception as ex:
+            ex_str = capture_exc(ex)
+            if isinstance(ex, AssertionError):
+                test_result.failuresNum += 1
+                test_result.failures.append(((name, c), ex_str))
+                print(" FAIL")
+            else:
+                test_result.errorsNum += 1
+                test_result.errors.append(((name, c), ex_str))
+                print(" ERROR")
+            # Uncomment to investigate failure in detail
+            # raise
+        finally:
+            tear_down()
+            o.doCleanups()
+
+    if hasattr(o, "runTest"):
+        name = str(o)
+        run_one(o.runTest)
+        return
+
     for name in dir(o):
         if name.startswith("test"):
             m = getattr(o, name)
             if not callable(m):
                 continue
-            print("%s (%s) ..." % (name, c.__qualname__), end="")
-            set_up()
-            try:
-                test_result.testsRun += 1
-                m()
-                print(" ok")
-            except SkipTest as e:
-                print(" skipped:", e.args[0])
-                test_result.skippedNum += 1
-            except Exception as ex:
-                ex_str = capture_exc(ex)
-                if isinstance(ex, AssertionError):
-                    test_result.failuresNum += 1
-                    test_result.failures.append(((name, c), ex_str))
-                    print(" FAIL")
-                else:
-                    test_result.errorsNum += 1
-                    test_result.errors.append(((name, c), ex_str))
-                    print(" ERROR")
-                # Uncomment to investigate failure in detail
-                # raise
-                continue
-            finally:
-                tear_down()
-                o.doCleanups()
+            run_one(m)
     return exceptions
 
 

From c7eb3de858b91578da0faaaca7e75bd29aa25831 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 18 Mar 2022 14:56:24 +1100
Subject: [PATCH 035/343] unittest: Print module name on result lines.

Matches cpython format.
---
 python-stdlib/unittest/unittest.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 02a94d04d..1211035bd 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -212,15 +212,16 @@ def test_exp_fail(*args, **kwargs):
 
 
 class TestSuite:
-    def __init__(self):
+    def __init__(self, name=""):
         self._tests = []
+        self.name = name
 
     def addTest(self, cls):
         self._tests.append(cls)
 
     def run(self, result):
         for c in self._tests:
-            run_suite(c, result)
+            run_suite(c, result, self.name)
         return result
 
 
@@ -290,7 +291,7 @@ def capture_exc(e):
 
 
 # TODO: Uncompliant
-def run_suite(c, test_result):
+def run_suite(c, test_result, suite_name=""):
     if isinstance(c, TestSuite):
         c.run(test_result)
         return
@@ -302,9 +303,13 @@ def run_suite(c, test_result):
     set_up = getattr(o, "setUp", lambda: None)
     tear_down = getattr(o, "tearDown", lambda: None)
     exceptions = []
+    try:
+        suite_name += "." + c.__qualname__
+    except AttributeError:
+        pass
 
     def run_one(m):
-        print("%s (%s) ..." % (name, c.__qualname__), end="")
+        print("%s (%s) ..." % (name, suite_name), end="")
         set_up()
         try:
             test_result.testsRun += 1
@@ -351,7 +356,7 @@ def test_cases(m):
                 yield c
 
     m = __import__(module) if isinstance(module, str) else module
-    suite = TestSuite()
+    suite = TestSuite(m.__name__)
     for c in test_cases(m):
         suite.addTest(c)
     runner = TestRunner()

From 9d9ca3d59bad61538c9e11ebca70e98367dac909 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 18 Mar 2022 14:58:20 +1100
Subject: [PATCH 036/343] unittest: Run test_* functions as well as TestCase
 classes.

---
 python-stdlib/unittest/unittest.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 1211035bd..c59446b0c 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -332,7 +332,10 @@ def run_one(m):
             # raise
         finally:
             tear_down()
-            o.doCleanups()
+            try:
+                o.doCleanups()
+            except AttributeError:
+                pass
 
     if hasattr(o, "runTest"):
         name = str(o)
@@ -340,11 +343,16 @@ def run_one(m):
         return
 
     for name in dir(o):
-        if name.startswith("test"):
+        if name.startswith("test_"):
             m = getattr(o, name)
             if not callable(m):
                 continue
             run_one(m)
+
+    if callable(o):
+        name = o.__name__
+        run_one(o)
+
     return exceptions
 
 
@@ -354,6 +362,8 @@ def test_cases(m):
             c = getattr(m, tn)
             if isinstance(c, object) and isinstance(c, type) and issubclass(c, TestCase):
                 yield c
+            elif tn.startswith("test_") and callable(c):
+                yield c
 
     m = __import__(module) if isinstance(module, str) else module
     suite = TestSuite(m.__name__)

From a7b2f6311788e1d658641e130327d7027818dc82 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 18 Mar 2022 17:32:25 +1100
Subject: [PATCH 037/343] unittest: Add discover function.

---
 python-stdlib/unittest/metadata.txt         |  1 +
 python-stdlib/unittest/setup.py             |  1 +
 python-stdlib/unittest/unittest.py          | 84 +++++++++++++++++----
 python-stdlib/unittest/unittest_discover.py | 70 +++++++++++++++++
 4 files changed, 141 insertions(+), 15 deletions(-)
 create mode 100644 python-stdlib/unittest/unittest_discover.py

diff --git a/python-stdlib/unittest/metadata.txt b/python-stdlib/unittest/metadata.txt
index f3c23ccee..8c0c0ff56 100644
--- a/python-stdlib/unittest/metadata.txt
+++ b/python-stdlib/unittest/metadata.txt
@@ -1,3 +1,4 @@
 srctype = micropython-lib
 type = module
 version = 0.3.2
+depends = argparse, fnmatch
diff --git a/python-stdlib/unittest/setup.py b/python-stdlib/unittest/setup.py
index 74b985e81..6549e44bf 100644
--- a/python-stdlib/unittest/setup.py
+++ b/python-stdlib/unittest/setup.py
@@ -21,4 +21,5 @@
     license="MIT",
     cmdclass={"sdist": sdist_upip.sdist},
     py_modules=["unittest"],
+    install_requires=["micropython-argparse", "micropython-fnmatch"],
 )
diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index c59446b0c..5a87f601b 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -1,4 +1,5 @@
 import sys
+import uos
 
 try:
     import io
@@ -280,6 +281,15 @@ def __repr__(self):
             self.failuresNum,
         )
 
+    def __add__(self, other):
+        self.errorsNum += other.errorsNum
+        self.failuresNum += other.failuresNum
+        self.skippedNum += other.skippedNum
+        self.testsRun += other.testsRun
+        self.errors.extend(other.errors)
+        self.failures.extend(other.failures)
+        return self
+
 
 def capture_exc(e):
     buf = io.StringIO()
@@ -290,7 +300,6 @@ def capture_exc(e):
     return buf.getvalue()
 
 
-# TODO: Uncompliant
 def run_suite(c, test_result, suite_name=""):
     if isinstance(c, TestSuite):
         c.run(test_result)
@@ -343,7 +352,7 @@ def run_one(m):
         return
 
     for name in dir(o):
-        if name.startswith("test_"):
+        if name.startswith("test"):
             m = getattr(o, name)
             if not callable(m):
                 continue
@@ -356,20 +365,65 @@ def run_one(m):
     return exceptions
 
 
+def _test_cases(mod):
+    for tn in dir(mod):
+        c = getattr(mod, tn)
+        if isinstance(c, object) and isinstance(c, type) and issubclass(c, TestCase):
+            yield c
+        elif tn.startswith("test_") and callable(c):
+            yield c
+
+
+def run_module(runner, module, path, top):
+    sys_path_initial = sys.path[:]
+    # Add script dir and top dir to import path
+    sys.path.insert(0, str(path))
+    if top:
+        sys.path.insert(1, top)
+    try:
+        suite = TestSuite(module)
+        m = __import__(module) if isinstance(module, str) else module
+        for c in _test_cases(m):
+            suite.addTest(c)
+        result = runner.run(suite)
+        return result
+
+    finally:
+        sys.path[:] = sys_path_initial
+
+
+def discover(runner: TestRunner):
+    from unittest_discover import discover
+
+    return discover(runner=runner)
+
+
 def main(module="__main__"):
-    def test_cases(m):
-        for tn in dir(m):
-            c = getattr(m, tn)
-            if isinstance(c, object) and isinstance(c, type) and issubclass(c, TestCase):
-                yield c
-            elif tn.startswith("test_") and callable(c):
-                yield c
-
-    m = __import__(module) if isinstance(module, str) else module
-    suite = TestSuite(m.__name__)
-    for c in test_cases(m):
-        suite.addTest(c)
     runner = TestRunner()
-    result = runner.run(suite)
+
+    if len(sys.argv) <= 1:
+        result = discover(runner)
+    elif sys.argv[0].split(".")[0] == "unittest" and sys.argv[1] == "discover":
+        result = discover(runner)
+    else:
+        for test_spec in sys.argv[1:]:
+            try:
+                uos.stat(test_spec)
+                # test_spec is a local file, run it directly
+                if "/" in test_spec:
+                    path, fname = test_spec.rsplit("/", 1)
+                else:
+                    path, fname = ".", test_spec
+                modname = fname.rsplit(".", 1)[0]
+                result = run_module(runner, modname, path, None)
+
+            except OSError:
+                # Not a file, treat as import name
+                result = run_module(runner, test_spec, ".", None)
+
     # Terminate with non zero return code in case of failures
     sys.exit(result.failuresNum or result.errorsNum)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/python-stdlib/unittest/unittest_discover.py b/python-stdlib/unittest/unittest_discover.py
new file mode 100644
index 000000000..7c5abd1f8
--- /dev/null
+++ b/python-stdlib/unittest/unittest_discover.py
@@ -0,0 +1,70 @@
+import argparse
+import sys
+import uos
+from fnmatch import fnmatch
+
+from unittest import TestRunner, TestResult, run_module
+
+
+def discover(runner: TestRunner):
+    """
+    Implements discover function inspired by https://docs.python.org/3/library/unittest.html#test-discovery
+    """
+    parser = argparse.ArgumentParser()
+    # parser.add_argument(
+    #     "-v",
+    #     "--verbose",
+    #     action="store_true",
+    #     help="Verbose output",
+    # )
+    parser.add_argument(
+        "-s",
+        "--start-directory",
+        dest="start",
+        default=".",
+        help="Directory to start discovery",
+    )
+    parser.add_argument(
+        "-p",
+        "--pattern ",
+        dest="pattern",
+        default="test*.py",
+        help="Pattern to match test files",
+    )
+    parser.add_argument(
+        "-t",
+        "--top-level-directory",
+        dest="top",
+        help="Top level directory of project (defaults to start directory)",
+    )
+    args = parser.parse_args(args=sys.argv[2:])
+
+    path = args.start
+    top = args.top or path
+
+    return run_all_in_dir(
+        runner=runner,
+        path=path,
+        pattern=args.pattern,
+        top=top,
+    )
+
+
+def run_all_in_dir(runner: TestRunner, path: str, pattern: str, top: str):
+    DIR_TYPE = 0x4000
+
+    result = TestResult()
+    for fname, type, *_ in uos.ilistdir(path):
+        if fname in ("..", "."):
+            continue
+        if type == DIR_TYPE:
+            result += run_all_in_dir(
+                runner=runner,
+                path="/".join((path, fname)),
+                pattern=pattern,
+                top=top,
+            )
+        if fnmatch(fname, pattern):
+            modname = fname[: fname.rfind(".")]
+            result += run_module(runner, modname, path, top)
+    return result

From cb8d108ac1d032733c737fa233874f38d3c2b800 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 3 May 2022 16:10:12 +1000
Subject: [PATCH 038/343] unittest: Add test for environment isolation.

---
 python-stdlib/unittest/test_unittest.py          |  6 ++++++
 python-stdlib/unittest/test_unittest_isolated.py | 15 +++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 python-stdlib/unittest/test_unittest_isolated.py

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 7d7e4ca27..690fb40df 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -1,4 +1,5 @@
 import unittest
+from test_unittest_isolated import global_context
 
 
 class TestUnittestAssertions(unittest.TestCase):
@@ -142,6 +143,11 @@ def testInner():
         else:
             self.fail("Unexpected success was not detected")
 
+    def test_NotChangedByOtherTest(self):
+        global global_context
+        assert global_context is None
+        global_context = True
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/python-stdlib/unittest/test_unittest_isolated.py b/python-stdlib/unittest/test_unittest_isolated.py
new file mode 100644
index 000000000..a828f9a3b
--- /dev/null
+++ b/python-stdlib/unittest/test_unittest_isolated.py
@@ -0,0 +1,15 @@
+import unittest
+
+
+global_context = None
+
+
+class TestUnittestIsolated(unittest.TestCase):
+    def test_NotChangedByOtherTest(self):
+        global global_context
+        assert global_context is None
+        global_context = True
+
+
+if __name__ == "__main__":
+    unittest.main()

From 9f6f21150622b25e665cc5d9533839a5cc092121 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 12 Apr 2022 05:41:15 +1000
Subject: [PATCH 039/343] unittest: Reset python env between tests.

---
 python-stdlib/unittest/unittest.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 5a87f601b..dd4bb607d 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -10,6 +10,13 @@
     traceback = None
 
 
+def _snapshot_modules():
+    return {k: v for k, v in sys.modules.items()}
+
+
+__modules__ = _snapshot_modules()
+
+
 class SkipTest(Exception):
     pass
 
@@ -375,6 +382,13 @@ def _test_cases(mod):
 
 
 def run_module(runner, module, path, top):
+    if not module:
+        raise ValueError("Empty module name")
+
+    # Reset the python environment before running test
+    sys.modules.clear()
+    sys.modules.update(__modules__)
+
     sys_path_initial = sys.path[:]
     # Add script dir and top dir to import path
     sys.path.insert(0, str(path))
@@ -395,6 +409,8 @@ def run_module(runner, module, path, top):
 def discover(runner: TestRunner):
     from unittest_discover import discover
 
+    global __modules__
+    __modules__ = _snapshot_modules()
     return discover(runner=runner)
 
 

From 9b6315a2ba8c9274f09bec7bf2aeb2a4d2732f98 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 3 May 2022 17:07:48 +1000
Subject: [PATCH 040/343] unittest: Add exception capturing for subTest.

---
 python-stdlib/unittest/test_unittest.py |  8 +++
 python-stdlib/unittest/unittest.py      | 75 +++++++++++++++++++------
 2 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 690fb40df..1b02056db 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -148,6 +148,14 @@ def test_NotChangedByOtherTest(self):
         assert global_context is None
         global_context = True
 
+    def test_subtest_even(self):
+        """
+        Test that numbers between 0 and 5 are all even.
+        """
+        for i in range(0, 10, 2):
+            with self.subTest("Should only pass for even numbers", i=i):
+                self.assertEqual(i % 2, 0)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index dd4bb607d..8d20acd7d 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -37,11 +37,35 @@ def __exit__(self, exc_type, exc_value, tb):
         return False
 
 
+# These are used to provide required context to things like subTest
+__current_test__ = None
+__test_result__ = None
+
+
+class SubtestContext:
+    def __enter__(self):
+        pass
+
+    def __exit__(self, *exc_info):
+        if exc_info[0] is not None:
+            # Exception raised
+            global __test_result__, __current_test__
+            handle_test_exception(
+                __current_test__,
+                __test_result__,
+                exc_info
+            )
+        # Suppress the exception as we've captured it above
+        return True
+
+
+
+
 class NullContext:
     def __enter__(self):
         pass
 
-    def __exit__(self, a, b, c):
+    def __exit__(self, exc_type, exc_value, traceback):
         pass
 
 
@@ -61,7 +85,7 @@ def doCleanups(self):
                 func(*args, **kwargs)
 
     def subTest(self, msg=None, **params):
-        return NullContext()
+        return SubtestContext(msg=msg, params=params)
 
     def skipTest(self, reason):
         raise SkipTest(reason)
@@ -298,15 +322,29 @@ def __add__(self, other):
         return self
 
 
-def capture_exc(e):
+def capture_exc(exc, traceback):
     buf = io.StringIO()
     if hasattr(sys, "print_exception"):
-        sys.print_exception(e, buf)
+        sys.print_exception(exc, buf)
     elif traceback is not None:
-        traceback.print_exception(None, e, sys.exc_info()[2], file=buf)
+        traceback.print_exception(None, exc, traceback, file=buf)
     return buf.getvalue()
 
 
+def handle_test_exception(current_test: tuple, test_result: TestResult, exc_info: tuple):
+    exc = exc_info[1]
+    traceback =  exc_info[2]
+    ex_str = capture_exc(exc, traceback)
+    if isinstance(exc, AssertionError):
+        test_result.failuresNum += 1
+        test_result.failures.append((current_test, ex_str))
+        print(" FAIL")
+    else:
+        test_result.errorsNum += 1
+        test_result.errors.append((current_test, ex_str))
+        print(" ERROR")
+
+
 def run_suite(c, test_result, suite_name=""):
     if isinstance(c, TestSuite):
         c.run(test_result)
@@ -324,29 +362,34 @@ def run_suite(c, test_result, suite_name=""):
     except AttributeError:
         pass
 
-    def run_one(m):
+    def run_one(test_function):
+        global __test_result__, __current_test__
         print("%s (%s) ..." % (name, suite_name), end="")
         set_up()
+        __test_result__ = test_result
+        test_container = f"({suite_name})"
+        __current_test__ = (name, test_container)
         try:
             test_result.testsRun += 1
-            m()
+            test_globals = dict(**globals())
+            test_globals["test_function"] = test_function
+            exec("test_function()", test_globals, test_globals)
+            # No exception occurred, test passed
             print(" ok")
         except SkipTest as e:
             print(" skipped:", e.args[0])
             test_result.skippedNum += 1
         except Exception as ex:
-            ex_str = capture_exc(ex)
-            if isinstance(ex, AssertionError):
-                test_result.failuresNum += 1
-                test_result.failures.append(((name, c), ex_str))
-                print(" FAIL")
-            else:
-                test_result.errorsNum += 1
-                test_result.errors.append(((name, c), ex_str))
-                print(" ERROR")
+            handle_test_exception(
+                current_test=(name, c),
+                test_result=test_result,
+                exc_info=sys.exc_info()
+            )
             # Uncomment to investigate failure in detail
             # raise
         finally:
+            __test_result__ = None
+            __current_test__ = None
             tear_down()
             try:
                 o.doCleanups()

From ddeb9a7da2355bea917af99dbda6dc1d9926ba42 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 3 May 2022 17:25:25 +1000
Subject: [PATCH 041/343] unittest: Improve failure text consistency with
 cpython.

---
 python-stdlib/unittest/unittest.py | 46 +++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 8d20acd7d..0fcb32937 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -43,6 +43,10 @@ def __exit__(self, exc_type, exc_value, tb):
 
 
 class SubtestContext:
+    def __init__(self, msg=None, params=None):
+        self.msg = msg
+        self.params = params
+
     def __enter__(self):
         pass
 
@@ -50,17 +54,18 @@ def __exit__(self, *exc_info):
         if exc_info[0] is not None:
             # Exception raised
             global __test_result__, __current_test__
-            handle_test_exception(
-                __current_test__,
-                __test_result__,
-                exc_info
-            )
+            test_details = __current_test__
+            if self.msg:
+                test_details += (f" [{self.msg}]",)
+            if self.params:
+                detail = ", ".join(f"{k}={v}" for k, v in self.params.items())
+                test_details += (f" ({detail})",)
+
+            handle_test_exception(test_details, __test_result__, exc_info, False)
         # Suppress the exception as we've captured it above
         return True
 
 
-
-
 class NullContext:
     def __enter__(self):
         pass
@@ -287,6 +292,7 @@ def __init__(self):
         self.testsRun = 0
         self.errors = []
         self.failures = []
+        self.newFailures = 0
 
     def wasSuccessful(self):
         return self.errorsNum == 0 and self.failuresNum == 0
@@ -299,8 +305,9 @@ def printErrors(self):
     def printErrorList(self, lst):
         sep = "----------------------------------------------------------------------"
         for c, e in lst:
+            detail = " ".join((str(i) for i in c))
             print("======================================================================")
-            print(c)
+            print(f"FAIL: {detail}")
             print(sep)
             print(e)
 
@@ -331,18 +338,23 @@ def capture_exc(exc, traceback):
     return buf.getvalue()
 
 
-def handle_test_exception(current_test: tuple, test_result: TestResult, exc_info: tuple):
+def handle_test_exception(
+    current_test: tuple, test_result: TestResult, exc_info: tuple, verbose=True
+):
     exc = exc_info[1]
-    traceback =  exc_info[2]
+    traceback = exc_info[2]
     ex_str = capture_exc(exc, traceback)
     if isinstance(exc, AssertionError):
         test_result.failuresNum += 1
         test_result.failures.append((current_test, ex_str))
-        print(" FAIL")
+        if verbose:
+            print(" FAIL")
     else:
         test_result.errorsNum += 1
         test_result.errors.append((current_test, ex_str))
-        print(" ERROR")
+        if verbose:
+            print(" ERROR")
+    test_result.newFailures += 1
 
 
 def run_suite(c, test_result, suite_name=""):
@@ -370,20 +382,22 @@ def run_one(test_function):
         test_container = f"({suite_name})"
         __current_test__ = (name, test_container)
         try:
+            test_result.newFailures = 0
             test_result.testsRun += 1
             test_globals = dict(**globals())
             test_globals["test_function"] = test_function
             exec("test_function()", test_globals, test_globals)
             # No exception occurred, test passed
-            print(" ok")
+            if test_result.newFailures:
+                print(" FAIL")
+            else:
+                print(" ok")
         except SkipTest as e:
             print(" skipped:", e.args[0])
             test_result.skippedNum += 1
         except Exception as ex:
             handle_test_exception(
-                current_test=(name, c),
-                test_result=test_result,
-                exc_info=sys.exc_info()
+                current_test=(name, c), test_result=test_result, exc_info=sys.exc_info()
             )
             # Uncomment to investigate failure in detail
             # raise

From 2d61dbdb93fa941c54b3990c2ee046074d2fce07 Mon Sep 17 00:00:00 2001
From: Steve Li <steve.li@planetinnovation.com.au>
Date: Tue, 5 Apr 2022 10:05:30 +1000
Subject: [PATCH 042/343] unittest: Add setUpClass and tearDownClass handling.

Supports setUp and tearDown functionality at Class level.
---
 python-stdlib/unittest/test_unittest.py | 19 +++++++++++++++++++
 python-stdlib/unittest/unittest.py      |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/python-stdlib/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
index 1b02056db..8e108995a 100644
--- a/python-stdlib/unittest/test_unittest.py
+++ b/python-stdlib/unittest/test_unittest.py
@@ -157,5 +157,24 @@ def test_subtest_even(self):
                 self.assertEqual(i % 2, 0)
 
 
+class TestUnittestSetup(unittest.TestCase):
+    class_setup_var = 0
+
+    def setUpClass(self):
+        TestUnittestSetup.class_setup_var += 1
+
+    def tearDownClass(self):
+        # Not sure how to actually test this, but we can check (in the test case below)
+        # that it hasn't been run already at least.
+        TestUnittestSetup.class_setup_var = -1
+
+    def testSetUpTearDownClass_1(self):
+        assert TestUnittestSetup.class_setup_var == 1, TestUnittestSetup.class_setup_var
+
+    def testSetUpTearDownClass_2(self):
+        # Test this twice, as if setUpClass() gets run like setUp() it would be run twice
+        assert TestUnittestSetup.class_setup_var == 1, TestUnittestSetup.class_setup_var
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 0fcb32937..cfb274a6c 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -366,6 +366,8 @@ def run_suite(c, test_result, suite_name=""):
         o = c()
     else:
         o = c
+    set_up_class = getattr(o, "setUpClass", lambda: None)
+    tear_down_class = getattr(o, "tearDownClass", lambda: None)
     set_up = getattr(o, "setUp", lambda: None)
     tear_down = getattr(o, "tearDown", lambda: None)
     exceptions = []
@@ -410,6 +412,8 @@ def run_one(test_function):
             except AttributeError:
                 pass
 
+    set_up_class()
+
     if hasattr(o, "runTest"):
         name = str(o)
         run_one(o.runTest)
@@ -426,6 +430,8 @@ def run_one(test_function):
         name = o.__name__
         run_one(o)
 
+    tear_down_class()
+
     return exceptions
 
 

From 959115d3a9e203b9cb780746798ce05d44d0b250 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 5 May 2022 21:17:48 +1000
Subject: [PATCH 043/343] unittest: Add support for specifying custom
 TestRunner.

---
 python-stdlib/unittest/unittest.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index cfb274a6c..b61686981 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -263,7 +263,7 @@ def run(self, result):
 
 
 class TestRunner:
-    def run(self, suite):
+    def run(self, suite: TestSuite):
         res = TestResult()
         suite.run(res)
 
@@ -292,7 +292,8 @@ def __init__(self):
         self.testsRun = 0
         self.errors = []
         self.failures = []
-        self.newFailures = 0
+        self.skipped = []
+        self._newFailures = 0
 
     def wasSuccessful(self):
         return self.errorsNum == 0 and self.failuresNum == 0
@@ -326,6 +327,7 @@ def __add__(self, other):
         self.testsRun += other.testsRun
         self.errors.extend(other.errors)
         self.failures.extend(other.failures)
+        self.skipped.extend(other.skipped)
         return self
 
 
@@ -354,10 +356,10 @@ def handle_test_exception(
         test_result.errors.append((current_test, ex_str))
         if verbose:
             print(" ERROR")
-    test_result.newFailures += 1
+    test_result._newFailures += 1
 
 
-def run_suite(c, test_result, suite_name=""):
+def run_suite(c, test_result: TestResult, suite_name=""):
     if isinstance(c, TestSuite):
         c.run(test_result)
         return
@@ -384,19 +386,21 @@ def run_one(test_function):
         test_container = f"({suite_name})"
         __current_test__ = (name, test_container)
         try:
-            test_result.newFailures = 0
+            test_result._newFailures = 0
             test_result.testsRun += 1
             test_globals = dict(**globals())
             test_globals["test_function"] = test_function
             exec("test_function()", test_globals, test_globals)
             # No exception occurred, test passed
-            if test_result.newFailures:
+            if test_result._newFailures:
                 print(" FAIL")
             else:
                 print(" ok")
         except SkipTest as e:
-            print(" skipped:", e.args[0])
+            reason = e.args[0]
+            print(" skipped:", reason)
             test_result.skippedNum += 1
+            test_result.skipped.append((name, c, reason))
         except Exception as ex:
             handle_test_exception(
                 current_test=(name, c), test_result=test_result, exc_info=sys.exc_info()
@@ -477,8 +481,14 @@ def discover(runner: TestRunner):
     return discover(runner=runner)
 
 
-def main(module="__main__"):
-    runner = TestRunner()
+def main(module="__main__", testRunner=None):
+    if testRunner:
+        if isinstance(testRunner, type):
+            runner = testRunner()
+        else:
+            runner = testRunner
+    else:
+        runner = TestRunner()
 
     if len(sys.argv) <= 1:
         result = discover(runner)

From db4c739863e49fc874bdaae8aa8c316c7ed4276a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 24 Oct 2021 09:17:03 +0300
Subject: [PATCH 044/343] unittest: Version 0.9.0

---
 python-stdlib/unittest/metadata.txt | 2 +-
 python-stdlib/unittest/setup.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-stdlib/unittest/metadata.txt b/python-stdlib/unittest/metadata.txt
index 8c0c0ff56..ba9a983fc 100644
--- a/python-stdlib/unittest/metadata.txt
+++ b/python-stdlib/unittest/metadata.txt
@@ -1,4 +1,4 @@
 srctype = micropython-lib
 type = module
-version = 0.3.2
+version = 0.9.0
 depends = argparse, fnmatch
diff --git a/python-stdlib/unittest/setup.py b/python-stdlib/unittest/setup.py
index 6549e44bf..d1604f813 100644
--- a/python-stdlib/unittest/setup.py
+++ b/python-stdlib/unittest/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="micropython-unittest",
-    version="0.3.2",
+    version="0.9.0",
     description="unittest module for MicroPython",
     long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
     url="https://github.com/micropython/micropython-lib",

From 5854ae1286af2d06e61feea65cfe11a352506dc6 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 5 Aug 2018 13:27:18 +0300
Subject: [PATCH 045/343] urequests: Add ability to parse response headers.

This is controlled by parse_headers param to request(), which defaults to
True for compatibility with upstream requests. In this case, headers are
available as .headers of Response objects. They are however normal (not
case-insensitive) dict.

If parse_headers=False, old behavior of ignore response headers is used,
which saves memory on the dict.

Finally, parse_headers can be a custom function which can e.g. parse only
subset of headers (again, to save memory).
---
 python-ecosys/urequests/urequests.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index 75a145702..1dc379bcf 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -33,7 +33,7 @@ def json(self):
         return ujson.loads(self.content)
 
 
-def request(method, url, data=None, json=None, headers={}, stream=None):
+def request(method, url, data=None, json=None, headers={}, stream=None, parse_headers=True):
     try:
         proto, dummy, host, path = url.split("/", 3)
     except ValueError:
@@ -55,6 +55,10 @@ def request(method, url, data=None, json=None, headers={}, stream=None):
     ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
     ai = ai[0]
 
+    resp_d = None
+    if parse_headers is not False:
+        resp_d = {}
+
     s = usocket.socket(ai[0], ai[1], ai[2])
     try:
         s.connect(ai[-1])
@@ -98,6 +102,14 @@ def request(method, url, data=None, json=None, headers={}, stream=None):
                     raise ValueError("Unsupported " + l)
             elif l.startswith(b"Location:") and not 200 <= status <= 299:
                 raise NotImplementedError("Redirects not yet supported")
+            if parse_headers is False:
+                pass
+            elif parse_headers is True:
+                l = str(l, "utf-8")
+                k, v = l.split(":", 1)
+                resp_d[k] = v.strip()
+            else:
+                parse_headers(l, resp_d)
     except OSError:
         s.close()
         raise
@@ -105,6 +117,8 @@ def request(method, url, data=None, json=None, headers={}, stream=None):
     resp = Response(s)
     resp.status_code = status
     resp.reason = reason
+    if resp_d is not None:
+        resp.headers = resp_d
     return resp
 
 

From d978e246d5ea1c46f97d1e00e1abac6b0b9dcf3b Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Fri, 10 Aug 2018 07:41:54 +0300
Subject: [PATCH 046/343] urequests: Explicitly add "Connection: close" to
 request headers.

Even though we use HTTP 1.0, where closing connection after sending
response should be the default, some servers ignore this requirement and
keep the connection open.  So, explicitly send corresponding header to get
the expected behavior.
---
 python-ecosys/urequests/urequests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index 1dc379bcf..4aa2935c7 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -81,7 +81,7 @@ def request(method, url, data=None, json=None, headers={}, stream=None, parse_he
             s.write(b"Content-Type: application/json\r\n")
         if data:
             s.write(b"Content-Length: %d\r\n" % len(data))
-        s.write(b"\r\n")
+        s.write(b"Connection: close\r\n\r\n")
         if data:
             s.write(data)
 

From 106c28a4d7f2358ae0e8c3272739aa504822aab7 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Sat, 7 Mar 2020 16:16:39 +0200
Subject: [PATCH 047/343] urequests: Fix raising unsupported Transfer-Encoding
 exception.

Would lead to recursive TypeError because of str + bytes.
---
 python-ecosys/urequests/urequests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index 4aa2935c7..11de10bbc 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -99,7 +99,7 @@ def request(method, url, data=None, json=None, headers={}, stream=None, parse_he
             # print(l)
             if l.startswith(b"Transfer-Encoding:"):
                 if b"chunked" in l:
-                    raise ValueError("Unsupported " + l)
+                    raise ValueError("Unsupported " + str(l, "utf-8"))
             elif l.startswith(b"Location:") and not 200 <= status <= 299:
                 raise NotImplementedError("Redirects not yet supported")
             if parse_headers is False:

From e7e8eff86b219bec2d6e19baeb8f0d85f7b77e47 Mon Sep 17 00:00:00 2001
From: Fabian Schmitt <github@fabian-schmitt.de>
Date: Tue, 28 Jun 2022 16:44:33 +1000
Subject: [PATCH 048/343] urequests: Add Basic Authentication support.

Usage matches the shorthand version described in
https://requests.readthedocs.io/en/latest/user/authentication/#basic-authentication
---
 python-ecosys/urequests/urequests.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index 11de10bbc..f6f29babf 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -33,7 +33,17 @@ def json(self):
         return ujson.loads(self.content)
 
 
-def request(method, url, data=None, json=None, headers={}, stream=None, parse_headers=True):
+def request(
+    method, url, data=None, json=None, headers={}, stream=None, parse_headers=True, auth=None
+):
+    if auth is not None:
+        import ubinascii
+
+        username, password = auth
+        formated = b"{}:{}".format(username, password)
+        formated = str(ubinascii.b2a_base64(formated)[:-1], "ascii")
+        headers["Authorization"] = "Basic {}".format(formated)
+
     try:
         proto, dummy, host, path = url.split("/", 3)
     except ValueError:

From be327a7bc7b64d5e4f7db444898d570dc2f5ffc7 Mon Sep 17 00:00:00 2001
From: Diefesson de Sousa SIlva <diefesson.so@gmail.com>
Date: Mon, 5 Oct 2020 16:50:55 -0300
Subject: [PATCH 049/343] binascii: Implement newline param in function
 b2a_base64.

See: https://docs.python.org/3/library/binascii.html#binascii.b2a_base64
---
 python-stdlib/binascii/binascii.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/python-stdlib/binascii/binascii.py b/python-stdlib/binascii/binascii.py
index 430b1132b..f2ec39e84 100644
--- a/python-stdlib/binascii/binascii.py
+++ b/python-stdlib/binascii/binascii.py
@@ -331,7 +331,7 @@ def a2b_base64(ascii):
 table_b2a_base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
 
 
-def b2a_base64(bin):
+def b2a_base64(bin, newline=True):
     "Base64-code line of data."
 
     newlength = (len(bin) + 2) // 3
@@ -357,5 +357,6 @@ def b2a_base64(bin):
     elif leftbits == 4:
         res.append(table_b2a_base64[(leftchar & 0xF) << 2])
         res.append(PAD)
-    res.append("\n")
+    if newline:
+        res.append("\n")
     return "".join(res).encode("ascii")

From b17e9aaf936964413d53e65c43e9223315060d9d Mon Sep 17 00:00:00 2001
From: Diefesson de Sousa SIlva <diefesson.so@gmail.com>
Date: Sun, 19 Jun 2022 09:58:14 +1000
Subject: [PATCH 050/343] urequests: Add support for requests with chunked
 upload data.

---
 python-ecosys/urequests/urequests.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index f6f29babf..61605f3b2 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -36,6 +36,8 @@ def json(self):
 def request(
     method, url, data=None, json=None, headers={}, stream=None, parse_headers=True, auth=None
 ):
+    chunked_data = data and getattr(data, "__iter__", None) and not getattr(data, "__len__", None)
+
     if auth is not None:
         import ubinascii
 
@@ -90,10 +92,20 @@ def request(
             data = ujson.dumps(json)
             s.write(b"Content-Type: application/json\r\n")
         if data:
-            s.write(b"Content-Length: %d\r\n" % len(data))
+            if chunked_data:
+                s.write(b"Transfer-Encoding: chunked\r\n")
+            else:
+                s.write(b"Content-Length: %d\r\n" % len(data))
         s.write(b"Connection: close\r\n\r\n")
         if data:
-            s.write(data)
+            if chunked_data:
+                for chunk in data:
+                    s.write(b"%x\r\n" % len(chunk))
+                    s.write(chunk)
+                    s.write(b"\r\n")
+                s.write("0\r\n\r\n")
+            else:
+                s.write(data)
 
         l = s.readline()
         # print(l)

From b29cffb3e3a0e81f91da318d2549d6c8d9439ea2 Mon Sep 17 00:00:00 2001
From: Diefesson de Sousa SIlva <diefesson.so@gmail.com>
Date: Sun, 19 Jun 2022 09:58:45 +1000
Subject: [PATCH 051/343] urequests: Add support for redirects.

---
 python-ecosys/urequests/urequests.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index 61605f3b2..e52c6d2a2 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -36,6 +36,7 @@ def json(self):
 def request(
     method, url, data=None, json=None, headers={}, stream=None, parse_headers=True, auth=None
 ):
+    redirect = None  # redirection url, None means no redirection
     chunked_data = data and getattr(data, "__iter__", None) and not getattr(data, "__len__", None)
 
     if auth is not None:
@@ -123,7 +124,10 @@ def request(
                 if b"chunked" in l:
                     raise ValueError("Unsupported " + str(l, "utf-8"))
             elif l.startswith(b"Location:") and not 200 <= status <= 299:
-                raise NotImplementedError("Redirects not yet supported")
+                if status in [301, 302, 303, 307, 308]:
+                    redirect = str(l[10:-2], "utf-8")
+                else:
+                    raise NotImplementedError("Redirect %d not yet supported" % status)
             if parse_headers is False:
                 pass
             elif parse_headers is True:
@@ -136,12 +140,19 @@ def request(
         s.close()
         raise
 
-    resp = Response(s)
-    resp.status_code = status
-    resp.reason = reason
-    if resp_d is not None:
-        resp.headers = resp_d
-    return resp
+    if redirect:
+        s.close()
+        if status in [301, 302, 303]:
+            return request("GET", redirect, None, None, headers, stream)
+        else:
+            return request(method, redirect, data, json, headers, stream)
+    else:
+        resp = Response(s)
+        resp.status_code = status
+        resp.reason = reason
+        if resp_d is not None:
+            resp.headers = resp_d
+        return resp
 
 
 def head(url, **kw):

From a725c42049c436694fb1742071f30829bbffce74 Mon Sep 17 00:00:00 2001
From: karfas <karfas@gmail.com>
Date: Sat, 27 Nov 2021 12:01:55 +0100
Subject: [PATCH 052/343] urequests: Always open sockets in SOCK_STREAM mode.

On the ESP32, socket.getaddrinfo() might return SOCK_DGRAM instead of
SOCK_STREAM, eg with ".local" adresses.  As a HTTP request is always a TCP
stream, we don't need to rely on the values returned by getaddrinfo.
---
 python-ecosys/urequests/urequests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index e52c6d2a2..eb33e2618 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -72,7 +72,7 @@ def request(
     if parse_headers is not False:
         resp_d = {}
 
-    s = usocket.socket(ai[0], ai[1], ai[2])
+    s = usocket.socket(ai[0], usocket.SOCK_STREAM, ai[2])
     try:
         s.connect(ai[-1])
         if proto == "https:":

From dbd8fff830fa6e95e60ef4020003719cbd2b9922 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 20 Jun 2022 13:11:35 +1000
Subject: [PATCH 053/343] urequests: Raise error when server doesn't respond
 with valid http.

---
 python-ecosys/urequests/urequests.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index eb33e2618..42e912977 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -111,6 +111,9 @@ def request(
         l = s.readline()
         # print(l)
         l = l.split(None, 2)
+        if len(l) < 2:
+            # Invalid response
+            raise ValueError("HTTP error: BadStatusLine:\n%s" % l)
         status = int(l[1])
         reason = ""
         if len(l) > 2:

From a3d6d29b1b9de2bb147e0751c08a39608ebe06c8 Mon Sep 17 00:00:00 2001
From: Bogdan <bogdan.brinzei@gmail.com>
Date: Sun, 18 Mar 2018 12:51:38 +0200
Subject: [PATCH 054/343] urequests: Add timeout, passed to underlying socket
 if supported.

---
 python-ecosys/urequests/urequests.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/urequests/urequests.py
index 42e912977..e1998711d 100644
--- a/python-ecosys/urequests/urequests.py
+++ b/python-ecosys/urequests/urequests.py
@@ -34,7 +34,15 @@ def json(self):
 
 
 def request(
-    method, url, data=None, json=None, headers={}, stream=None, parse_headers=True, auth=None
+    method,
+    url,
+    data=None,
+    json=None,
+    headers={},
+    stream=None,
+    auth=None,
+    timeout=None,
+    parse_headers=True,
 ):
     redirect = None  # redirection url, None means no redirection
     chunked_data = data and getattr(data, "__iter__", None) and not getattr(data, "__len__", None)
@@ -73,6 +81,12 @@ def request(
         resp_d = {}
 
     s = usocket.socket(ai[0], usocket.SOCK_STREAM, ai[2])
+
+    if timeout is not None:
+        # Note: settimeout is not supported on all platforms, will raise
+        # an AttributeError if not available.
+        s.settimeout(timeout)
+
     try:
         s.connect(ai[-1])
         if proto == "https:":

From 70e422dc2e885bbaafe6eb7e3d81118e17d4b555 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 20 Jun 2022 13:23:13 +1000
Subject: [PATCH 055/343] urequests: Release 0.7.0.

---
 python-ecosys/urequests/metadata.txt | 3 +--
 python-ecosys/urequests/setup.py     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/python-ecosys/urequests/metadata.txt b/python-ecosys/urequests/metadata.txt
index 8cd156c39..04861d96f 100644
--- a/python-ecosys/urequests/metadata.txt
+++ b/python-ecosys/urequests/metadata.txt
@@ -1,4 +1,3 @@
 srctype = micropython-lib
 type = module
-version = 0.6
-author = Paul Sokolovsky
+version = 0.7.0
diff --git a/python-ecosys/urequests/setup.py b/python-ecosys/urequests/setup.py
index 65ee5da8b..51f1158e0 100644
--- a/python-ecosys/urequests/setup.py
+++ b/python-ecosys/urequests/setup.py
@@ -10,11 +10,11 @@
 
 setup(
     name="micropython-urequests",
-    version="0.6",
+    version="0.7",
     description="urequests module for MicroPython",
     long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
     url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
+    author="micropython-lib Developers",
     author_email="micro-python@googlegroups.com",
     maintainer="micropython-lib Developers",
     maintainer_email="micro-python@googlegroups.com",

From 9fdf046e2707356a009a732c53aaca316d5899bf Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguel.grinberg@gmail.com>
Date: Tue, 26 Jul 2022 23:49:38 +0100
Subject: [PATCH 056/343] python-ecosys/pyjwt: Add pyjwt-compatible module.

---
 python-ecosys/pyjwt/jwt.py      | 78 +++++++++++++++++++++++++++++++++
 python-ecosys/pyjwt/test_jwt.py | 28 ++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 python-ecosys/pyjwt/jwt.py
 create mode 100644 python-ecosys/pyjwt/test_jwt.py

diff --git a/python-ecosys/pyjwt/jwt.py b/python-ecosys/pyjwt/jwt.py
new file mode 100644
index 000000000..7ec117225
--- /dev/null
+++ b/python-ecosys/pyjwt/jwt.py
@@ -0,0 +1,78 @@
+import binascii
+import hashlib
+import hmac
+import json
+from time import time
+
+def _to_b64url(data):
+    return (
+        binascii.b2a_base64(data)
+        .rstrip(b"\n")
+        .rstrip(b"=")
+        .replace(b"+", b"-")
+        .replace(b"/", b"_")
+    )
+
+
+def _from_b64url(data):
+    return binascii.a2b_base64(data.replace(b"-", b"+").replace(b"_", b"/") + b"===")
+
+
+class exceptions:
+    class PyJWTError(Exception):
+        pass
+
+    class InvalidTokenError(PyJWTError):
+        pass
+
+    class InvalidAlgorithmError(PyJWTError):
+        pass
+
+    class InvalidSignatureError(PyJWTError):
+        pass
+
+    class ExpiredSignatureError(PyJWTError):
+        pass
+
+
+def encode(payload, key, algorithm="HS256"):
+    if algorithm != "HS256":
+        raise exceptions.InvalidAlgorithmError
+
+    if isinstance(key, str):
+        key = key.encode()
+    header = _to_b64url(json.dumps({"typ": "JWT", "alg": algorithm}).encode())
+    payload = _to_b64url(json.dumps(payload).encode())
+    signature = _to_b64url(hmac.new(key, header + b"." + payload, hashlib.sha256).digest())
+    return (header + b"." + payload + b"." + signature).decode()
+
+
+def decode(token, key, algorithms=["HS256"]):
+    if "HS256" not in algorithms:
+        raise exceptions.InvalidAlgorithmError
+
+    parts = token.encode().split(b".")
+    if len(parts) != 3:
+        raise exceptions.InvalidTokenError
+
+    try:
+        header = json.loads(_from_b64url(parts[0]).decode())
+        payload = json.loads(_from_b64url(parts[1]).decode())
+        signature = _from_b64url(parts[2])
+    except Exception:
+        raise exceptions.InvalidTokenError
+
+    if header["alg"] not in algorithms or header["alg"] != "HS256":
+        raise exceptions.InvalidAlgorithmError
+
+    if isinstance(key, str):
+        key = key.encode()
+    calculated_signature = hmac.new(key, parts[0] + b"." + parts[1], hashlib.sha256).digest()
+    if signature != calculated_signature:
+        raise exceptions.InvalidSignatureError
+
+    if "exp" in payload:
+        if time() > payload["exp"]:
+            raise exceptions.ExpiredSignatureError
+
+    return payload
diff --git a/python-ecosys/pyjwt/test_jwt.py b/python-ecosys/pyjwt/test_jwt.py
new file mode 100644
index 000000000..fb30b8bbd
--- /dev/null
+++ b/python-ecosys/pyjwt/test_jwt.py
@@ -0,0 +1,28 @@
+import jwt
+from time import time
+
+secret_key = "top-secret!"
+
+token = jwt.encode({"user": "joe"}, secret_key, algorithm="HS256")
+print(token)
+decoded = jwt.decode(token, secret_key, algorithms=["HS256"])
+if decoded != {"user": "joe"}:
+    raise Exception("Invalid decoded JWT")
+else:
+    print("Encode/decode test: OK")
+
+try:
+    decoded = jwt.decode(token, "wrong-secret", algorithms=["HS256"])
+except jwt.exceptions.InvalidSignatureError:
+    print("Invalid signature test: OK")
+else:
+    raise Exception("Invalid JWT should have failed decoding")
+
+token = jwt.encode({"user": "joe", "exp": time() - 1}, secret_key)
+print(token)
+try:
+    decoded = jwt.decode(token, secret_key, algorithms=["HS256"])
+except jwt.exceptions.ExpiredSignatureError:
+    print("Expired token test: OK")
+else:
+    raise Exception("Expired JWT should have failed decoding")

From f95260d7e3c123a8b1907ded095e4c25e4251085 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 8 Aug 2022 21:38:03 +1000
Subject: [PATCH 057/343] python-stdlib/hmac: Update to work with built-in hash
 functions.

This library was non-functional unless used with the micropython-lib
pure-Python implementation of hashlib, even if the device provides
sha1 and sha256.

This updates hmac to be significantly more RAM efficient (removes the
512-byte table), and functional with the built-in hash functions.

The only unsupported function is "copy", but this is non-critical, and now
fails with a NotSupportedError.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/hmac/hmac.py      | 174 +++++++++-----------------------
 python-stdlib/hmac/metadata.txt |   1 -
 python-stdlib/hmac/test_hmac.py |  39 ++++---
 3 files changed, 73 insertions(+), 141 deletions(-)

diff --git a/python-stdlib/hmac/hmac.py b/python-stdlib/hmac/hmac.py
index fb7457402..28631042f 100644
--- a/python-stdlib/hmac/hmac.py
+++ b/python-stdlib/hmac/hmac.py
@@ -1,161 +1,87 @@
-"""HMAC (Keyed-Hashing for Message Authentication) Python module.
-
-Implements the HMAC algorithm as described by RFC 2104.
-"""
-
-import warnings as _warnings
-
-# from _operator import _compare_digest as compare_digest
-import hashlib as _hashlib
-
-PendingDeprecationWarning = None
-RuntimeWarning = None
-
-trans_5C = bytes((x ^ 0x5C) for x in range(256))
-trans_36 = bytes((x ^ 0x36) for x in range(256))
-
-
-def translate(d, t):
-    return bytes(t[x] for x in d)
-
-
-# The size of the digests returned by HMAC depends on the underlying
-# hashing module used.  Use digest_size from the instance of HMAC instead.
-digest_size = None
+# Implements the hmac module from the Python standard library.
 
 
 class HMAC:
-    """RFC 2104 HMAC class.  Also complies with RFC 4231.
-
-    This supports the API for Cryptographic Hash Functions (PEP 247).
-    """
-
-    blocksize = 64  # 512-bit HMAC; can be changed in subclasses.
-
     def __init__(self, key, msg=None, digestmod=None):
-        """Create a new HMAC object.
-
-        key:       key for the keyed hash object.
-        msg:       Initial input for the hash, if provided.
-        digestmod: A module supporting PEP 247.  *OR*
-                   A hashlib constructor returning a new hash object. *OR*
-                   A hash name suitable for hashlib.new().
-                   Defaults to hashlib.md5.
-                   Implicit default to hashlib.md5 is deprecated and will be
-                   removed in Python 3.6.
-
-        Note: key and msg must be a bytes or bytearray objects.
-        """
-
         if not isinstance(key, (bytes, bytearray)):
-            raise TypeError("key: expected bytes or bytearray, but got %r" % type(key).__name__)
+            raise TypeError("key: expected bytes/bytearray")
+
+        import hashlib
 
         if digestmod is None:
-            _warnings.warn(
-                "HMAC() without an explicit digestmod argument " "is deprecated.",
-                PendingDeprecationWarning,
-                2,
-            )
-            digestmod = _hashlib.md5
+            # TODO: Default hash algorithm is now deprecated.
+            digestmod = hashlib.md5
 
         if callable(digestmod):
-            self.digest_cons = digestmod
+            # A hashlib constructor returning a new hash object.
+            make_hash = digestmod  # A
         elif isinstance(digestmod, str):
-            self.digest_cons = lambda d=b"": _hashlib.new(digestmod, d)
-        else:
-            self.digest_cons = lambda d=b"": digestmod.new(d)
-
-        self.outer = self.digest_cons()
-        self.inner = self.digest_cons()
-        self.digest_size = self.inner.digest_size
-
-        if hasattr(self.inner, "block_size"):
-            blocksize = self.inner.block_size
-            if blocksize < 16:
-                _warnings.warn(
-                    "block_size of %d seems too small; using our "
-                    "default of %d." % (blocksize, self.blocksize),
-                    RuntimeWarning,
-                    2,
-                )
-                blocksize = self.blocksize
+            # A hash name suitable for hashlib.new().
+            make_hash = lambda d=b"": hashlib.new(digestmod, d)  # B
         else:
-            _warnings.warn(
-                "No block_size attribute on given digest object; "
-                "Assuming %d." % (self.blocksize),
-                RuntimeWarning,
-                2,
-            )
-            blocksize = self.blocksize
-
-        # self.blocksize is the default blocksize. self.block_size is
-        # effective block size as well as the public API attribute.
-        self.block_size = blocksize
-
-        if len(key) > blocksize:
-            key = self.digest_cons(key).digest()
-
-        key = key + bytes(blocksize - len(key))
-        self.outer.update(translate(key, trans_5C))
-        self.inner.update(translate(key, trans_36))
+            # A module supporting PEP 247.
+            make_hash = digestmod.new  # C
+
+        self._outer = make_hash()
+        self._inner = make_hash()
+
+        self.digest_size = getattr(self._inner, "digest_size", None)
+        # If the provided hash doesn't support block_size (e.g. built-in
+        # hashlib), 64 is the correct default for all built-in hash
+        # functions (md5, sha1, sha256).
+        self.block_size = getattr(self._inner, "block_size", 64)
+
+        # Truncate to digest_size if greater than block_size.
+        if len(key) > self.block_size:
+            key = make_hash(key).digest()
+
+        # Pad to block size.
+        key = key + bytes(self.block_size - len(key))
+
+        self._outer.update(bytes(x ^ 0x5C for x in key))
+        self._inner.update(bytes(x ^ 0x36 for x in key))
+
         if msg is not None:
             self.update(msg)
 
     @property
     def name(self):
-        return "hmac-" + self.inner.name
+        return "hmac-" + getattr(self._inner, "name", type(self._inner).__name__)
 
     def update(self, msg):
-        """Update this hashing object with the string msg."""
-        self.inner.update(msg)
+        self._inner.update(msg)
 
     def copy(self):
-        """Return a separate copy of this hashing object.
-
-        An update to this copy won't affect the original object.
-        """
+        if not hasattr(self._inner, "copy"):
+            # Not supported for built-in hash functions.
+            raise NotImplementedError()
         # Call __new__ directly to avoid the expensive __init__.
         other = self.__class__.__new__(self.__class__)
-        other.digest_cons = self.digest_cons
+        other.block_size = self.block_size
         other.digest_size = self.digest_size
-        other.inner = self.inner.copy()
-        other.outer = self.outer.copy()
+        other._inner = self._inner.copy()
+        other._outer = self._outer.copy()
         return other
 
     def _current(self):
-        """Return a hash object for the current state.
-
-        To be used only internally with digest() and hexdigest().
-        """
-        h = self.outer.copy()
-        h.update(self.inner.digest())
+        h = self._outer
+        if hasattr(h, "copy"):
+            # built-in hash functions don't support this, and as a result,
+            # digest() will finalise the hmac and further calls to
+            # update/digest will fail.
+            h = h.copy()
+        h.update(self._inner.digest())
         return h
 
     def digest(self):
-        """Return the hash value of this hashing object.
-
-        This returns a string containing 8-bit data.  The object is
-        not altered in any way by this function; you can continue
-        updating the object after calling this function.
-        """
         h = self._current()
         return h.digest()
 
     def hexdigest(self):
-        """Like digest(), but returns a string of hexadecimal digits instead."""
-        h = self._current()
-        return h.hexdigest()
+        import binascii
 
+        return str(binascii.hexlify(self.digest()), "utf-8")
 
-def new(key, msg=None, digestmod=None):
-    """Create a new hashing object and return it.
-
-    key: The starting key for the hash.
-    msg: if available, will immediately be hashed into the object's starting
-    state.
 
-    You can now feed arbitrary strings into the object using its update()
-    method, and can ask for the hash value at any time by calling its digest()
-    method.
-    """
+def new(key, msg=None, digestmod=None):
     return HMAC(key, msg, digestmod)
diff --git a/python-stdlib/hmac/metadata.txt b/python-stdlib/hmac/metadata.txt
index 1f744f8f4..ee8bd9f95 100644
--- a/python-stdlib/hmac/metadata.txt
+++ b/python-stdlib/hmac/metadata.txt
@@ -1,4 +1,3 @@
 srctype = cpython
 type = module
 version = 3.4.2-3
-depends = warnings, hashlib
diff --git a/python-stdlib/hmac/test_hmac.py b/python-stdlib/hmac/test_hmac.py
index 815219aef..d155dd6a2 100644
--- a/python-stdlib/hmac/test_hmac.py
+++ b/python-stdlib/hmac/test_hmac.py
@@ -1,10 +1,14 @@
 import hmac
-from hashlib.sha256 import sha256
-from hashlib.sha512 import sha512
+
+# Uncomment to use micropython-lib hashlib (supports sha512)
+# import sys
+# sys.path.append('../hashlib')
+
+import hashlib
 
 msg = b"zlutoucky kun upel dabelske ody"
 
-dig = hmac.new(b"1234567890", msg=msg, digestmod=sha256).hexdigest()
+dig = hmac.new(b"1234567890", msg=msg, digestmod=hashlib.sha256).hexdigest()
 
 print("c735e751e36b08fb01e25794bdb15e7289b82aecdb652c8f4f72f307b39dad39")
 print(dig)
@@ -12,22 +16,25 @@
 if dig != "c735e751e36b08fb01e25794bdb15e7289b82aecdb652c8f4f72f307b39dad39":
     raise Exception("Error")
 
-dig = hmac.new(b"1234567890", msg=msg, digestmod=sha512).hexdigest()
+if hasattr(hashlib, "sha512"):
+    dig = hmac.new(b"1234567890", msg=msg, digestmod=hashlib.sha512).hexdigest()
 
-print(
-    "59942f31b6f5473fb4eb630fabf5358a49bc11d24ebc83b114b4af30d6ef47ea14b673f478586f520a0b9c53b27c8f8dd618c165ef586195bd4e98293d34df1a"
-)
-print(dig)
+    print(
+        "59942f31b6f5473fb4eb630fabf5358a49bc11d24ebc83b114b4af30d6ef47ea14b673f478586f520a0b9c53b27c8f8dd618c165ef586195bd4e98293d34df1a"
+    )
+    print(dig)
 
-if (
-    dig
-    != "59942f31b6f5473fb4eb630fabf5358a49bc11d24ebc83b114b4af30d6ef47ea14b673f478586f520a0b9c53b27c8f8dd618c165ef586195bd4e98293d34df1a"
-):
-    raise Exception("Error")
+    if (
+        dig
+        != "59942f31b6f5473fb4eb630fabf5358a49bc11d24ebc83b114b4af30d6ef47ea14b673f478586f520a0b9c53b27c8f8dd618c165ef586195bd4e98293d34df1a"
+    ):
+        raise Exception("Error")
+else:
+    print("sha512 not supported")
 
 key = b"\x06\x1au\x90|Xz;o\x1b<\xafGL\xbfn\x8a\xc94YPfC^\xb9\xdd)\x7f\xaf\x85\xa1\xed\x82\xbexp\xaf\x13\x1a\x9d"
 
-dig = hmac.new(key[:20], msg=msg, digestmod=sha256).hexdigest()
+dig = hmac.new(key[:20], msg=msg, digestmod=hashlib.sha256).hexdigest()
 
 print("59e332b881df09fdecf569c8b142b27fc989638720aeda2813f82442b6e3d91b")
 print(dig)
@@ -35,7 +42,7 @@
 if dig != "59e332b881df09fdecf569c8b142b27fc989638720aeda2813f82442b6e3d91b":
     raise Exception("Error")
 
-dig = hmac.new(key[:32], msg=msg, digestmod=sha256).hexdigest()
+dig = hmac.new(key[:32], msg=msg, digestmod=hashlib.sha256).hexdigest()
 
 print("b72fed815cd71acfa3a2f5cf2343679565fa18e7cd92226ab443aabd1fd7b7b0")
 print(dig)
@@ -43,7 +50,7 @@
 if dig != "b72fed815cd71acfa3a2f5cf2343679565fa18e7cd92226ab443aabd1fd7b7b0":
     raise Exception("Error")
 
-dig = hmac.new(key, msg=msg, digestmod=sha256).hexdigest()
+dig = hmac.new(key, msg=msg, digestmod=hashlib.sha256).hexdigest()
 
 print("4e51beae6c2b0f90bb3e99d8e93a32d168b6c1e9b7d2130e2d668a3b3e10358d")
 print(dig)

From c3f4779002abc27991214174d349916c60756183 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 17:06:49 +1000
Subject: [PATCH 058/343] python-ecosys/pyjwt/jwt.py: Fix missing whitespace.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-ecosys/pyjwt/jwt.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python-ecosys/pyjwt/jwt.py b/python-ecosys/pyjwt/jwt.py
index 7ec117225..11c28f479 100644
--- a/python-ecosys/pyjwt/jwt.py
+++ b/python-ecosys/pyjwt/jwt.py
@@ -4,6 +4,7 @@
 import json
 from time import time
 
+
 def _to_b64url(data):
     return (
         binascii.b2a_base64(data)

From 09f0e47386c283b17e44cfeee0329165b654d6e2 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 17 Aug 2021 11:17:29 +1000
Subject: [PATCH 059/343] aioble: Add timeout to device.exchange_mtu.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/device.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/device.py b/micropython/bluetooth/aioble/aioble/device.py
index ea87be35b..265d62157 100644
--- a/micropython/bluetooth/aioble/aioble/device.py
+++ b/micropython/bluetooth/aioble/aioble/device.py
@@ -262,7 +262,7 @@ def is_connected(self):
     def timeout(self, timeout_ms):
         return DeviceTimeout(self, timeout_ms)
 
-    async def exchange_mtu(self, mtu=None):
+    async def exchange_mtu(self, mtu=None, timeout_ms=1000):
         if not self.is_connected():
             raise ValueError("Not connected")
 
@@ -271,7 +271,8 @@ async def exchange_mtu(self, mtu=None):
 
         self._mtu_event = self._mtu_event or asyncio.ThreadSafeFlag()
         ble.gattc_exchange_mtu(self._conn_handle)
-        await self._mtu_event.wait()
+        with self.timeout(timeout_ms):
+            await self._mtu_event.wait()
         return self.mtu
 
     # Wait for a connection on an L2CAP connection-oriented-channel.

From c4fada7f6f3a3c9d47efd3606ea786476e1b48e3 Mon Sep 17 00:00:00 2001
From: Philip Peitsch <phil.peitsch@planetinnovation.com.au>
Date: Tue, 23 Aug 2022 18:36:36 +1000
Subject: [PATCH 060/343] aioble: Fix missing GattError import in server.py.

2015-01-01 07:45:46.790 INFO Received OLCP_OP_FIRST
2015-01-01 07:45:46.979 ERROR Error in ble_write_listener
Traceback (most recent call last):
  File "aioble/server.py", line 223, in indicate
NameError: name 'GattError' isn't defined
---
 micropython/bluetooth/aioble/aioble/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index b537638ed..39d3a0105 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -13,6 +13,7 @@
     log_error,
     log_warn,
     register_irq_handler,
+    GattError,
 )
 from .device import DeviceConnection, DeviceTimeout
 

From a18d49cda7a5d615298e8bb65fb24208036befff Mon Sep 17 00:00:00 2001
From: Philip Peitsch <phil.peitsch@planetinnovation.com.au>
Date: Tue, 23 Aug 2022 18:19:19 +1000
Subject: [PATCH 061/343] aioble: Make l2cap chunk size configurable to allow
 optimization by app.

---
 micropython/bluetooth/aioble/aioble/l2cap.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/l2cap.py b/micropython/bluetooth/aioble/aioble/l2cap.py
index 4d8fd927d..e8e4c0262 100644
--- a/micropython/bluetooth/aioble/aioble/l2cap.py
+++ b/micropython/bluetooth/aioble/aioble/l2cap.py
@@ -132,10 +132,10 @@ def available(self):
 
     # Waits until the channel is free and then sends buf.
     # If the buffer is larger than the MTU it will be sent in chunks.
-    async def send(self, buf, timeout_ms=None):
+    async def send(self, buf, timeout_ms=None, chunk_size=None):
         self._assert_connected()
         offset = 0
-        chunk_size = min(self.our_mtu * 2, self.peer_mtu)
+        chunk_size = min(self.our_mtu * 2, self.peer_mtu, chunk_size or self.peer_mtu)
         mv = memoryview(buf)
         while offset < len(buf):
             if self._stalled:

From ecef7a506ccbf31bbbdc0369d17f1d09543e0442 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 13 Jul 2022 13:58:00 +1000
Subject: [PATCH 062/343] all: Remove all setup.py files.

These are unused and will be replaced with manifest.py.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/test.support/setup.py             | 24 ------------
 micropython/uaiohttpclient/setup.py           | 24 ------------
 micropython/ucontextlib/setup.py              | 24 ------------
 micropython/udnspkt/setup.py                  | 24 ------------
 micropython/umqtt.robust/setup.py             | 24 ------------
 micropython/umqtt.simple/setup.py             | 24 ------------
 micropython/upip/setup.py                     | 24 ------------
 micropython/upysh/setup.py                    | 24 ------------
 micropython/urllib.urequest/setup.py          | 24 ------------
 micropython/utarfile/setup.py                 | 24 ------------
 micropython/xmltok/setup.py                   | 24 ------------
 python-ecosys/urequests/setup.py              | 24 ------------
 python-stdlib/__future__/setup.py             | 24 ------------
 python-stdlib/_markupbase/setup.py            | 25 -------------
 python-stdlib/abc/setup.py                    | 24 ------------
 python-stdlib/argparse/setup.py               | 24 ------------
 python-stdlib/base64/setup.py                 | 25 -------------
 python-stdlib/binascii/setup.py               | 24 ------------
 python-stdlib/bisect/setup.py                 | 29 ---------------
 python-stdlib/cgi/setup.py                    | 24 ------------
 python-stdlib/cmd/setup.py                    | 24 ------------
 .../collections.defaultdict/setup.py          | 24 ------------
 python-stdlib/collections.deque/setup.py      | 24 ------------
 python-stdlib/collections/setup.py            | 24 ------------
 python-stdlib/contextlib/setup.py             | 25 -------------
 python-stdlib/copy/setup.py                   | 24 ------------
 python-stdlib/curses.ascii/setup.py           | 24 ------------
 python-stdlib/datetime/setup.py               | 24 ------------
 python-stdlib/email.charset/setup.py          | 29 ---------------
 python-stdlib/email.encoders/setup.py         | 31 ----------------
 python-stdlib/email.errors/setup.py           | 24 ------------
 python-stdlib/email.feedparser/setup.py       | 30 ---------------
 python-stdlib/email.header/setup.py           | 31 ----------------
 python-stdlib/email.internal/setup.py         | 37 -------------------
 python-stdlib/email.message/setup.py          | 33 -----------------
 python-stdlib/email.parser/setup.py           | 30 ---------------
 python-stdlib/email.utils/setup.py            | 35 ------------------
 python-stdlib/errno/setup.py                  | 24 ------------
 python-stdlib/fnmatch/setup.py                | 24 ------------
 python-stdlib/functools/setup.py              | 24 ------------
 python-stdlib/getopt/setup.py                 | 25 -------------
 python-stdlib/glob/setup.py                   | 25 -------------
 python-stdlib/gzip/setup.py                   | 24 ------------
 python-stdlib/hashlib/setup.py                | 24 ------------
 python-stdlib/heapq/setup.py                  | 24 ------------
 python-stdlib/hmac/setup.py                   | 25 -------------
 python-stdlib/html.entities/setup.py          | 24 ------------
 python-stdlib/html.parser/setup.py            | 30 ---------------
 python-stdlib/html/setup.py                   | 25 -------------
 python-stdlib/http.client/setup.py            | 32 ----------------
 python-stdlib/inspect/setup.py                | 24 ------------
 python-stdlib/io/setup.py                     | 24 ------------
 python-stdlib/itertools/setup.py              | 24 ------------
 python-stdlib/json/setup.py                   | 18 ---------
 python-stdlib/locale/setup.py                 | 24 ------------
 python-stdlib/logging/setup.py                | 24 ------------
 python-stdlib/operator/setup.py               | 24 ------------
 python-stdlib/os.path/setup.py                | 24 ------------
 python-stdlib/os/setup.py                     | 24 ------------
 python-stdlib/pickle/setup.py                 | 24 ------------
 python-stdlib/pkg_resources/setup.py          | 24 ------------
 python-stdlib/pkgutil/setup.py                | 25 -------------
 python-stdlib/pprint/setup.py                 | 24 ------------
 python-stdlib/pystone/setup.py                | 24 ------------
 python-stdlib/pystone_lowmem/setup.py         | 24 ------------
 python-stdlib/quopri/setup.py                 | 24 ------------
 python-stdlib/random/setup.py                 | 24 ------------
 python-stdlib/shutil/setup.py                 | 24 ------------
 python-stdlib/socket/setup.py                 | 24 ------------
 python-stdlib/ssl/setup.py                    | 24 ------------
 python-stdlib/stat/setup.py                   | 24 ------------
 python-stdlib/string/setup.py                 | 24 ------------
 python-stdlib/struct/setup.py                 | 24 ------------
 python-stdlib/test.pystone/setup.py           | 24 ------------
 python-stdlib/textwrap/setup.py               | 24 ------------
 python-stdlib/threading/setup.py              | 24 ------------
 python-stdlib/timeit/setup.py                 | 31 ----------------
 python-stdlib/traceback/setup.py              | 24 ------------
 python-stdlib/types/setup.py                  | 13 -------
 python-stdlib/unittest/setup.py               | 25 -------------
 python-stdlib/urllib.parse/setup.py           | 29 ---------------
 python-stdlib/uu/setup.py                     | 25 -------------
 python-stdlib/warnings/setup.py               | 24 ------------
 unix-ffi/_libc/setup.py                       | 24 ------------
 unix-ffi/fcntl/setup.py                       | 25 -------------
 unix-ffi/ffilib/setup.py                      | 24 ------------
 unix-ffi/gettext/setup.py                     | 25 -------------
 unix-ffi/machine/setup.py                     | 25 -------------
 unix-ffi/multiprocessing/setup.py             | 25 -------------
 unix-ffi/os/setup.py                          | 25 -------------
 unix-ffi/pwd/setup.py                         | 25 -------------
 unix-ffi/re-pcre/setup.py                     | 25 -------------
 unix-ffi/select/setup.py                      | 25 -------------
 unix-ffi/signal/setup.py                      | 25 -------------
 unix-ffi/sqlite3/setup.py                     | 25 -------------
 unix-ffi/time/setup.py                        | 25 -------------
 unix-ffi/tty/setup.py                         | 24 ------------
 unix-ffi/ucurses/setup.py                     | 25 -------------
 98 files changed, 2452 deletions(-)
 delete mode 100644 micropython/test.support/setup.py
 delete mode 100644 micropython/uaiohttpclient/setup.py
 delete mode 100644 micropython/ucontextlib/setup.py
 delete mode 100644 micropython/udnspkt/setup.py
 delete mode 100644 micropython/umqtt.robust/setup.py
 delete mode 100644 micropython/umqtt.simple/setup.py
 delete mode 100644 micropython/upip/setup.py
 delete mode 100644 micropython/upysh/setup.py
 delete mode 100644 micropython/urllib.urequest/setup.py
 delete mode 100644 micropython/utarfile/setup.py
 delete mode 100644 micropython/xmltok/setup.py
 delete mode 100644 python-ecosys/urequests/setup.py
 delete mode 100644 python-stdlib/__future__/setup.py
 delete mode 100644 python-stdlib/_markupbase/setup.py
 delete mode 100644 python-stdlib/abc/setup.py
 delete mode 100644 python-stdlib/argparse/setup.py
 delete mode 100644 python-stdlib/base64/setup.py
 delete mode 100644 python-stdlib/binascii/setup.py
 delete mode 100644 python-stdlib/bisect/setup.py
 delete mode 100644 python-stdlib/cgi/setup.py
 delete mode 100644 python-stdlib/cmd/setup.py
 delete mode 100644 python-stdlib/collections.defaultdict/setup.py
 delete mode 100644 python-stdlib/collections.deque/setup.py
 delete mode 100644 python-stdlib/collections/setup.py
 delete mode 100644 python-stdlib/contextlib/setup.py
 delete mode 100644 python-stdlib/copy/setup.py
 delete mode 100644 python-stdlib/curses.ascii/setup.py
 delete mode 100644 python-stdlib/datetime/setup.py
 delete mode 100644 python-stdlib/email.charset/setup.py
 delete mode 100644 python-stdlib/email.encoders/setup.py
 delete mode 100644 python-stdlib/email.errors/setup.py
 delete mode 100644 python-stdlib/email.feedparser/setup.py
 delete mode 100644 python-stdlib/email.header/setup.py
 delete mode 100644 python-stdlib/email.internal/setup.py
 delete mode 100644 python-stdlib/email.message/setup.py
 delete mode 100644 python-stdlib/email.parser/setup.py
 delete mode 100644 python-stdlib/email.utils/setup.py
 delete mode 100644 python-stdlib/errno/setup.py
 delete mode 100644 python-stdlib/fnmatch/setup.py
 delete mode 100644 python-stdlib/functools/setup.py
 delete mode 100644 python-stdlib/getopt/setup.py
 delete mode 100644 python-stdlib/glob/setup.py
 delete mode 100644 python-stdlib/gzip/setup.py
 delete mode 100644 python-stdlib/hashlib/setup.py
 delete mode 100644 python-stdlib/heapq/setup.py
 delete mode 100644 python-stdlib/hmac/setup.py
 delete mode 100644 python-stdlib/html.entities/setup.py
 delete mode 100644 python-stdlib/html.parser/setup.py
 delete mode 100644 python-stdlib/html/setup.py
 delete mode 100644 python-stdlib/http.client/setup.py
 delete mode 100644 python-stdlib/inspect/setup.py
 delete mode 100644 python-stdlib/io/setup.py
 delete mode 100644 python-stdlib/itertools/setup.py
 delete mode 100644 python-stdlib/json/setup.py
 delete mode 100644 python-stdlib/locale/setup.py
 delete mode 100644 python-stdlib/logging/setup.py
 delete mode 100644 python-stdlib/operator/setup.py
 delete mode 100644 python-stdlib/os.path/setup.py
 delete mode 100644 python-stdlib/os/setup.py
 delete mode 100644 python-stdlib/pickle/setup.py
 delete mode 100644 python-stdlib/pkg_resources/setup.py
 delete mode 100644 python-stdlib/pkgutil/setup.py
 delete mode 100644 python-stdlib/pprint/setup.py
 delete mode 100644 python-stdlib/pystone/setup.py
 delete mode 100644 python-stdlib/pystone_lowmem/setup.py
 delete mode 100644 python-stdlib/quopri/setup.py
 delete mode 100644 python-stdlib/random/setup.py
 delete mode 100644 python-stdlib/shutil/setup.py
 delete mode 100644 python-stdlib/socket/setup.py
 delete mode 100644 python-stdlib/ssl/setup.py
 delete mode 100644 python-stdlib/stat/setup.py
 delete mode 100644 python-stdlib/string/setup.py
 delete mode 100644 python-stdlib/struct/setup.py
 delete mode 100644 python-stdlib/test.pystone/setup.py
 delete mode 100644 python-stdlib/textwrap/setup.py
 delete mode 100644 python-stdlib/threading/setup.py
 delete mode 100644 python-stdlib/timeit/setup.py
 delete mode 100644 python-stdlib/traceback/setup.py
 delete mode 100644 python-stdlib/types/setup.py
 delete mode 100644 python-stdlib/unittest/setup.py
 delete mode 100644 python-stdlib/urllib.parse/setup.py
 delete mode 100644 python-stdlib/uu/setup.py
 delete mode 100644 python-stdlib/warnings/setup.py
 delete mode 100644 unix-ffi/_libc/setup.py
 delete mode 100644 unix-ffi/fcntl/setup.py
 delete mode 100644 unix-ffi/ffilib/setup.py
 delete mode 100644 unix-ffi/gettext/setup.py
 delete mode 100644 unix-ffi/machine/setup.py
 delete mode 100644 unix-ffi/multiprocessing/setup.py
 delete mode 100644 unix-ffi/os/setup.py
 delete mode 100644 unix-ffi/pwd/setup.py
 delete mode 100644 unix-ffi/re-pcre/setup.py
 delete mode 100644 unix-ffi/select/setup.py
 delete mode 100644 unix-ffi/signal/setup.py
 delete mode 100644 unix-ffi/sqlite3/setup.py
 delete mode 100644 unix-ffi/time/setup.py
 delete mode 100644 unix-ffi/tty/setup.py
 delete mode 100644 unix-ffi/ucurses/setup.py

diff --git a/micropython/test.support/setup.py b/micropython/test.support/setup.py
deleted file mode 100644
index e24879af7..000000000
--- a/micropython/test.support/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-test.support",
-    version="0.1.3",
-    description="test.support module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["test"],
-)
diff --git a/micropython/uaiohttpclient/setup.py b/micropython/uaiohttpclient/setup.py
deleted file mode 100644
index 86e7ac5b1..000000000
--- a/micropython/uaiohttpclient/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-uaiohttpclient",
-    version="0.5.1",
-    description="HTTP client module for MicroPython uasyncio module",
-    long_description=open("README").read(),
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["uaiohttpclient"],
-)
diff --git a/micropython/ucontextlib/setup.py b/micropython/ucontextlib/setup.py
deleted file mode 100644
index aac090f6e..000000000
--- a/micropython/ucontextlib/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-ucontextlib",
-    version="0.1.1",
-    description="ucontextlib module for MicroPython",
-    long_description="Minimal subset of contextlib for MicroPython low-memory ports",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["ucontextlib"],
-)
diff --git a/micropython/udnspkt/setup.py b/micropython/udnspkt/setup.py
deleted file mode 100644
index f0c8c0626..000000000
--- a/micropython/udnspkt/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-udnspkt",
-    version="0.1",
-    description="Make and parse DNS packets (Sans I/O approach).",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["udnspkt"],
-)
diff --git a/micropython/umqtt.robust/setup.py b/micropython/umqtt.robust/setup.py
deleted file mode 100644
index f0f23ed8c..000000000
--- a/micropython/umqtt.robust/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-umqtt.robust",
-    version="1.0.1",
-    description='Lightweight MQTT client for MicroPython ("robust" version).',
-    long_description=open("README.rst").read(),
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["umqtt"],
-)
diff --git a/micropython/umqtt.simple/setup.py b/micropython/umqtt.simple/setup.py
deleted file mode 100644
index 4da36993c..000000000
--- a/micropython/umqtt.simple/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-umqtt.simple",
-    version="1.3.4",
-    description="Lightweight MQTT client for MicroPython.",
-    long_description=open("README.rst").read(),
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["umqtt"],
-)
diff --git a/micropython/upip/setup.py b/micropython/upip/setup.py
deleted file mode 100644
index 5e8ff0b21..000000000
--- a/micropython/upip/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-upip",
-    version="1.2.4",
-    description="Simple package manager for MicroPython.",
-    long_description="Simple self-hosted package manager for MicroPython (requires usocket, ussl, uzlib, uctypes builtin modules). Compatible only with packages without custom setup.py code.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["upip", "upip_utarfile"],
-)
diff --git a/micropython/upysh/setup.py b/micropython/upysh/setup.py
deleted file mode 100644
index c1608d313..000000000
--- a/micropython/upysh/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-upysh",
-    version="0.6.1",
-    description="Minimalistic file shell using native Python syntax.",
-    long_description="Minimalistic file shell using native Python syntax.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["upysh"],
-)
diff --git a/micropython/urllib.urequest/setup.py b/micropython/urllib.urequest/setup.py
deleted file mode 100644
index 5652f54b5..000000000
--- a/micropython/urllib.urequest/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-urllib.urequest",
-    version="0.6",
-    description="urllib.urequest module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["urllib"],
-)
diff --git a/micropython/utarfile/setup.py b/micropython/utarfile/setup.py
deleted file mode 100644
index a3d8a862e..000000000
--- a/micropython/utarfile/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-utarfile",
-    version="0.3.2",
-    description="utarfile module for MicroPython",
-    long_description="Lightweight tarfile module subset",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["utarfile"],
-)
diff --git a/micropython/xmltok/setup.py b/micropython/xmltok/setup.py
deleted file mode 100644
index 8b8b237c0..000000000
--- a/micropython/xmltok/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-xmltok",
-    version="0.2",
-    description="xmltok module for MicroPython",
-    long_description="Simple XML tokenizer",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["xmltok"],
-)
diff --git a/python-ecosys/urequests/setup.py b/python-ecosys/urequests/setup.py
deleted file mode 100644
index 51f1158e0..000000000
--- a/python-ecosys/urequests/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-urequests",
-    version="0.7",
-    description="urequests module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["urequests"],
-)
diff --git a/python-stdlib/__future__/setup.py b/python-stdlib/__future__/setup.py
deleted file mode 100644
index 9195f702f..000000000
--- a/python-stdlib/__future__/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-future",
-    version="0.0.3",
-    description="Dummy __future__ module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["__future__"],
-)
diff --git a/python-stdlib/_markupbase/setup.py b/python-stdlib/_markupbase/setup.py
deleted file mode 100644
index b0c3a6d4e..000000000
--- a/python-stdlib/_markupbase/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-_markupbase",
-    version="3.3.3-1",
-    description="CPython _markupbase module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["_markupbase"],
-    install_requires=["micropython-re-pcre"],
-)
diff --git a/python-stdlib/abc/setup.py b/python-stdlib/abc/setup.py
deleted file mode 100644
index 384dfd523..000000000
--- a/python-stdlib/abc/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-abc",
-    version="0.0.1",
-    description="Dummy abc module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["abc"],
-)
diff --git a/python-stdlib/argparse/setup.py b/python-stdlib/argparse/setup.py
deleted file mode 100644
index f43ebd5d8..000000000
--- a/python-stdlib/argparse/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-argparse",
-    version="0.4",
-    description="argparse module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Damien George",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["argparse"],
-)
diff --git a/python-stdlib/base64/setup.py b/python-stdlib/base64/setup.py
deleted file mode 100644
index bb306611b..000000000
--- a/python-stdlib/base64/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-base64",
-    version="3.3.3-4",
-    description="CPython base64 module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["base64"],
-    install_requires=["micropython-binascii", "micropython-re-pcre", "micropython-struct"],
-)
diff --git a/python-stdlib/binascii/setup.py b/python-stdlib/binascii/setup.py
deleted file mode 100644
index 1d8e23433..000000000
--- a/python-stdlib/binascii/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-binascii",
-    version="2.4.0-5",
-    description="PyPy binascii module ported to MicroPython",
-    long_description="This is a module ported from PyPy standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="PyPy Developers",
-    author_email="pypy-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["binascii"],
-)
diff --git a/python-stdlib/bisect/setup.py b/python-stdlib/bisect/setup.py
deleted file mode 100644
index bc6f32046..000000000
--- a/python-stdlib/bisect/setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise distutils will peek up our
-# module instead of system.
-sys.path.pop(0)
-from setuptools import setup
-
-
-def desc_dummy(name):
-    return "Dummy %s module to MicroPython" % name
-
-
-def desc_cpython(name):
-    return "CPython %s module ported to MicroPython" % name
-
-
-NAME = "bisect"
-
-setup(
-    name="micropython-" + NAME,
-    version="0.5",
-    description=desc_cpython(NAME),
-    url="https://github.com/micropython/micropython/issues/405",
-    author="CPython Developers",
-    maintainer="MicroPython Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    py_modules=[NAME],
-)
diff --git a/python-stdlib/cgi/setup.py b/python-stdlib/cgi/setup.py
deleted file mode 100644
index 0e5ac351c..000000000
--- a/python-stdlib/cgi/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-cgi",
-    version="3.3.3-2",
-    description="CPython cgi module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["cgi"],
-)
diff --git a/python-stdlib/cmd/setup.py b/python-stdlib/cmd/setup.py
deleted file mode 100644
index 788a7e59b..000000000
--- a/python-stdlib/cmd/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-cmd",
-    version="3.4.0-2",
-    description="CPython cmd module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["cmd"],
-)
diff --git a/python-stdlib/collections.defaultdict/setup.py b/python-stdlib/collections.defaultdict/setup.py
deleted file mode 100644
index aa0003f70..000000000
--- a/python-stdlib/collections.defaultdict/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-collections.defaultdict",
-    version="0.3",
-    description="collections.defaultdict module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["collections"],
-)
diff --git a/python-stdlib/collections.deque/setup.py b/python-stdlib/collections.deque/setup.py
deleted file mode 100644
index 72dcb00db..000000000
--- a/python-stdlib/collections.deque/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-collections.deque",
-    version="0.1.3",
-    description="collections.deque module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["collections"],
-)
diff --git a/python-stdlib/collections/setup.py b/python-stdlib/collections/setup.py
deleted file mode 100644
index 0be48b26e..000000000
--- a/python-stdlib/collections/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-collections",
-    version="0.1.2",
-    description="collections module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["collections"],
-)
diff --git a/python-stdlib/contextlib/setup.py b/python-stdlib/contextlib/setup.py
deleted file mode 100644
index eb375a75b..000000000
--- a/python-stdlib/contextlib/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-contextlib",
-    version="3.4.2-4",
-    description="CPython contextlib module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["contextlib"],
-    install_requires=["micropython-ucontextlib", "micropython-collections"],
-)
diff --git a/python-stdlib/copy/setup.py b/python-stdlib/copy/setup.py
deleted file mode 100644
index 45fd26eb1..000000000
--- a/python-stdlib/copy/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-copy",
-    version="3.3.3-2",
-    description="CPython copy module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["copy"],
-)
diff --git a/python-stdlib/curses.ascii/setup.py b/python-stdlib/curses.ascii/setup.py
deleted file mode 100644
index 9bcd9dd41..000000000
--- a/python-stdlib/curses.ascii/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-curses.ascii",
-    version="3.4.2-1",
-    description="CPython curses.ascii module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["curses"],
-)
diff --git a/python-stdlib/datetime/setup.py b/python-stdlib/datetime/setup.py
deleted file mode 100644
index e925aa2f8..000000000
--- a/python-stdlib/datetime/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-datetime",
-    version="4.0.0",
-    description="datetime module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["datetime"],
-)
diff --git a/python-stdlib/email.charset/setup.py b/python-stdlib/email.charset/setup.py
deleted file mode 100644
index 774c3d4d4..000000000
--- a/python-stdlib/email.charset/setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.charset",
-    version="0.5.1",
-    description="CPython email.charset module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-functools",
-        "micropython-email.encoders",
-        "micropython-email.errors",
-    ],
-)
diff --git a/python-stdlib/email.encoders/setup.py b/python-stdlib/email.encoders/setup.py
deleted file mode 100644
index 3b871a787..000000000
--- a/python-stdlib/email.encoders/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.encoders",
-    version="0.5.1",
-    description="CPython email.encoders module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-base64",
-        "micropython-binascii",
-        "micropython-quopri",
-        "micropython-re-pcre",
-        "micropython-string",
-    ],
-)
diff --git a/python-stdlib/email.errors/setup.py b/python-stdlib/email.errors/setup.py
deleted file mode 100644
index e1f9d9da6..000000000
--- a/python-stdlib/email.errors/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.errors",
-    version="0.5.1",
-    description="CPython email.errors module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-)
diff --git a/python-stdlib/email.feedparser/setup.py b/python-stdlib/email.feedparser/setup.py
deleted file mode 100644
index 6922e29d4..000000000
--- a/python-stdlib/email.feedparser/setup.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.feedparser",
-    version="0.5.1",
-    description="CPython email.feedparser module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-re-pcre",
-        "micropython-email.errors",
-        "micropython-email.message",
-        "micropython-email.internal",
-    ],
-)
diff --git a/python-stdlib/email.header/setup.py b/python-stdlib/email.header/setup.py
deleted file mode 100644
index e321861df..000000000
--- a/python-stdlib/email.header/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.header",
-    version="0.5.2",
-    description="CPython email.header module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-re-pcre",
-        "micropython-binascii",
-        "micropython-email.encoders",
-        "micropython-email.errors",
-        "micropython-email.charset",
-    ],
-)
diff --git a/python-stdlib/email.internal/setup.py b/python-stdlib/email.internal/setup.py
deleted file mode 100644
index 2a0bf2feb..000000000
--- a/python-stdlib/email.internal/setup.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.internal",
-    version="0.5.1",
-    description="CPython email.internal module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-re-pcre",
-        "micropython-base64",
-        "micropython-binascii",
-        "micropython-functools",
-        "micropython-string",
-        "micropython-calendar",
-        "micropython-abc",
-        "micropython-email.errors",
-        "micropython-email.header",
-        "micropython-email.charset",
-        "micropython-email.utils",
-    ],
-)
diff --git a/python-stdlib/email.message/setup.py b/python-stdlib/email.message/setup.py
deleted file mode 100644
index 29453a972..000000000
--- a/python-stdlib/email.message/setup.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.message",
-    version="0.5.3",
-    description="CPython email.message module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-re-pcre",
-        "micropython-uu",
-        "micropython-base64",
-        "micropython-binascii",
-        "micropython-email.utils",
-        "micropython-email.errors",
-        "micropython-email.charset",
-    ],
-)
diff --git a/python-stdlib/email.parser/setup.py b/python-stdlib/email.parser/setup.py
deleted file mode 100644
index b12dece4d..000000000
--- a/python-stdlib/email.parser/setup.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.parser",
-    version="0.5.1",
-    description="CPython email.parser module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-warnings",
-        "micropython-email.feedparser",
-        "micropython-email.message",
-        "micropython-email.internal",
-    ],
-)
diff --git a/python-stdlib/email.utils/setup.py b/python-stdlib/email.utils/setup.py
deleted file mode 100644
index 552b2fd01..000000000
--- a/python-stdlib/email.utils/setup.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-email.utils",
-    version="3.3.3-2",
-    description="CPython email.utils module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["email"],
-    install_requires=[
-        "micropython-os",
-        "micropython-re-pcre",
-        "micropython-base64",
-        "micropython-random",
-        "micropython-datetime",
-        "micropython-urllib.parse",
-        "micropython-warnings",
-        "micropython-quopri",
-        "micropython-email.charset",
-    ],
-)
diff --git a/python-stdlib/errno/setup.py b/python-stdlib/errno/setup.py
deleted file mode 100644
index 5683a91d3..000000000
--- a/python-stdlib/errno/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-errno",
-    version="0.1.4",
-    description="errno module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["errno"],
-)
diff --git a/python-stdlib/fnmatch/setup.py b/python-stdlib/fnmatch/setup.py
deleted file mode 100644
index 06331a9cb..000000000
--- a/python-stdlib/fnmatch/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-fnmatch",
-    version="0.6.0",
-    description="CPython fnmatch module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["fnmatch"],
-)
diff --git a/python-stdlib/functools/setup.py b/python-stdlib/functools/setup.py
deleted file mode 100644
index 76f28ebd0..000000000
--- a/python-stdlib/functools/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-functools",
-    version="0.0.7",
-    description="functools module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["functools"],
-)
diff --git a/python-stdlib/getopt/setup.py b/python-stdlib/getopt/setup.py
deleted file mode 100644
index 52382c365..000000000
--- a/python-stdlib/getopt/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-getopt",
-    version="3.3.3-1",
-    description="CPython getopt module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["getopt"],
-    install_requires=["micropython-os"],
-)
diff --git a/python-stdlib/glob/setup.py b/python-stdlib/glob/setup.py
deleted file mode 100644
index 171b56aa0..000000000
--- a/python-stdlib/glob/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-glob",
-    version="0.5.2",
-    description="CPython glob module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["glob"],
-    install_requires=["micropython-os", "micropython-re-pcre", "micropython-fnmatch"],
-)
diff --git a/python-stdlib/gzip/setup.py b/python-stdlib/gzip/setup.py
deleted file mode 100644
index 2a890a6b4..000000000
--- a/python-stdlib/gzip/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-gzip",
-    version="0.1.1",
-    description="gzip module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["gzip"],
-)
diff --git a/python-stdlib/hashlib/setup.py b/python-stdlib/hashlib/setup.py
deleted file mode 100644
index b7ca591a1..000000000
--- a/python-stdlib/hashlib/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-hashlib",
-    version="2.4.0-4",
-    description="PyPy hashlib module ported to MicroPython",
-    long_description="This is a module ported from PyPy standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="PyPy Developers",
-    author_email="pypy-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["hashlib"],
-)
diff --git a/python-stdlib/heapq/setup.py b/python-stdlib/heapq/setup.py
deleted file mode 100644
index b8405165c..000000000
--- a/python-stdlib/heapq/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-heapq",
-    version="0.9.3",
-    description="CPython heapq module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["heapq"],
-)
diff --git a/python-stdlib/hmac/setup.py b/python-stdlib/hmac/setup.py
deleted file mode 100644
index 141f21e5b..000000000
--- a/python-stdlib/hmac/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-hmac",
-    version="3.4.2-3",
-    description="CPython hmac module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["hmac"],
-    install_requires=["micropython-warnings", "micropython-hashlib"],
-)
diff --git a/python-stdlib/html.entities/setup.py b/python-stdlib/html.entities/setup.py
deleted file mode 100644
index ff0a1a5b4..000000000
--- a/python-stdlib/html.entities/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-html.entities",
-    version="3.3.3-1",
-    description="CPython html.entities module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["html"],
-)
diff --git a/python-stdlib/html.parser/setup.py b/python-stdlib/html.parser/setup.py
deleted file mode 100644
index 7223243d1..000000000
--- a/python-stdlib/html.parser/setup.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-html.parser",
-    version="3.3.3-2",
-    description="CPython html.parser module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["html"],
-    install_requires=[
-        "micropython-_markupbase",
-        "micropython-warnings",
-        "micropython-html.entities",
-        "micropython-re-pcre",
-    ],
-)
diff --git a/python-stdlib/html/setup.py b/python-stdlib/html/setup.py
deleted file mode 100644
index bded97e81..000000000
--- a/python-stdlib/html/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-html",
-    version="3.3.3-2",
-    description="CPython html module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["html"],
-    install_requires=["micropython-string"],
-)
diff --git a/python-stdlib/http.client/setup.py b/python-stdlib/http.client/setup.py
deleted file mode 100644
index 9015355bf..000000000
--- a/python-stdlib/http.client/setup.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-http.client",
-    version="0.5.1",
-    description="CPython http.client module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["http"],
-    install_requires=[
-        "micropython-email.parser",
-        "micropython-email.message",
-        "micropython-socket",
-        "micropython-collections",
-        "micropython-urllib.parse",
-        "micropython-warnings",
-    ],
-)
diff --git a/python-stdlib/inspect/setup.py b/python-stdlib/inspect/setup.py
deleted file mode 100644
index 6ad820e0a..000000000
--- a/python-stdlib/inspect/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-inspect",
-    version="0.1.2",
-    description="inspect module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["inspect"],
-)
diff --git a/python-stdlib/io/setup.py b/python-stdlib/io/setup.py
deleted file mode 100644
index 84d4b4f4b..000000000
--- a/python-stdlib/io/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-io",
-    version="0.1",
-    description="Dummy io module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["io"],
-)
diff --git a/python-stdlib/itertools/setup.py b/python-stdlib/itertools/setup.py
deleted file mode 100644
index 634f35b2d..000000000
--- a/python-stdlib/itertools/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-itertools",
-    version="0.2.3",
-    description="itertools module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["itertools"],
-)
diff --git a/python-stdlib/json/setup.py b/python-stdlib/json/setup.py
deleted file mode 100644
index 67bd8fce0..000000000
--- a/python-stdlib/json/setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# import sys
-# Remove current dir from sys.path, otherwise distutils will peek up our
-# copy module instead of system.
-# sys.path.pop(0)
-from setuptools import setup
-
-setup(
-    name="micropython-json",
-    version="0.1",
-    description="CPython json package ported to MicroPython",
-    url="https://github.com/micropython/micropython/issues/405",
-    author="CPython Developers",
-    maintainer="MicroPython Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    install_requires=["micropython-re-pcre"],
-    packages=["json"],
-)
diff --git a/python-stdlib/locale/setup.py b/python-stdlib/locale/setup.py
deleted file mode 100644
index 670a27182..000000000
--- a/python-stdlib/locale/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-locale",
-    version="0.0.2",
-    description="Dummy locale module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["locale"],
-)
diff --git a/python-stdlib/logging/setup.py b/python-stdlib/logging/setup.py
deleted file mode 100644
index a2b3350b5..000000000
--- a/python-stdlib/logging/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-logging",
-    version="0.3",
-    description="logging module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["logging"],
-)
diff --git a/python-stdlib/operator/setup.py b/python-stdlib/operator/setup.py
deleted file mode 100644
index 3cbf116e9..000000000
--- a/python-stdlib/operator/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-operator",
-    version="0.1.1",
-    description="operator module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["operator"],
-)
diff --git a/python-stdlib/os.path/setup.py b/python-stdlib/os.path/setup.py
deleted file mode 100644
index 3801ab378..000000000
--- a/python-stdlib/os.path/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-os.path",
-    version="0.1.3",
-    description="os.path module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["os"],
-)
diff --git a/python-stdlib/os/setup.py b/python-stdlib/os/setup.py
deleted file mode 100644
index e39806fd3..000000000
--- a/python-stdlib/os/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-os",
-    version="0.6",
-    description="os module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["os"],
-)
diff --git a/python-stdlib/pickle/setup.py b/python-stdlib/pickle/setup.py
deleted file mode 100644
index f0c7dfb7b..000000000
--- a/python-stdlib/pickle/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pickle",
-    version="0.1",
-    description="Dummy pickle module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pickle"],
-)
diff --git a/python-stdlib/pkg_resources/setup.py b/python-stdlib/pkg_resources/setup.py
deleted file mode 100644
index 2f3cd6e2f..000000000
--- a/python-stdlib/pkg_resources/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pkg_resources",
-    version="0.2.1",
-    description="pkg_resources module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pkg_resources"],
-)
diff --git a/python-stdlib/pkgutil/setup.py b/python-stdlib/pkgutil/setup.py
deleted file mode 100644
index eb92e7543..000000000
--- a/python-stdlib/pkgutil/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pkgutil",
-    version="0.1.1",
-    description="pkgutil module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pkgutil"],
-    install_requires=["micropython-pkg_resources"],
-)
diff --git a/python-stdlib/pprint/setup.py b/python-stdlib/pprint/setup.py
deleted file mode 100644
index 124046d3f..000000000
--- a/python-stdlib/pprint/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pprint",
-    version="0.0.4",
-    description="Dummy pprint module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pprint"],
-)
diff --git a/python-stdlib/pystone/setup.py b/python-stdlib/pystone/setup.py
deleted file mode 100644
index 86f8cc658..000000000
--- a/python-stdlib/pystone/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pystone",
-    version="3.4.2-2",
-    description="CPython pystone module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pystone"],
-)
diff --git a/python-stdlib/pystone_lowmem/setup.py b/python-stdlib/pystone_lowmem/setup.py
deleted file mode 100644
index 21614b5c6..000000000
--- a/python-stdlib/pystone_lowmem/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pystone_lowmem",
-    version="3.4.2-4",
-    description="CPython pystone_lowmem module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pystone_lowmem"],
-)
diff --git a/python-stdlib/quopri/setup.py b/python-stdlib/quopri/setup.py
deleted file mode 100644
index 780778dfa..000000000
--- a/python-stdlib/quopri/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-quopri",
-    version="0.5.1",
-    description="CPython quopri module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["quopri"],
-)
diff --git a/python-stdlib/random/setup.py b/python-stdlib/random/setup.py
deleted file mode 100644
index 3b1acdc5c..000000000
--- a/python-stdlib/random/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-random",
-    version="0.2",
-    description="Dummy random module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["random"],
-)
diff --git a/python-stdlib/shutil/setup.py b/python-stdlib/shutil/setup.py
deleted file mode 100644
index b133bacd8..000000000
--- a/python-stdlib/shutil/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-shutil",
-    version="0.0.3",
-    description="shutil module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["shutil"],
-)
diff --git a/python-stdlib/socket/setup.py b/python-stdlib/socket/setup.py
deleted file mode 100644
index 505667288..000000000
--- a/python-stdlib/socket/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-socket",
-    version="0.5.2",
-    description="socket module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["socket"],
-)
diff --git a/python-stdlib/ssl/setup.py b/python-stdlib/ssl/setup.py
deleted file mode 100644
index 1c38e2c7a..000000000
--- a/python-stdlib/ssl/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-ssl",
-    version="0.1",
-    description="Dummy ssl module for MicroPython",
-    long_description="This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["ssl"],
-)
diff --git a/python-stdlib/stat/setup.py b/python-stdlib/stat/setup.py
deleted file mode 100644
index f7b084e24..000000000
--- a/python-stdlib/stat/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-stat",
-    version="0.5.1",
-    description="CPython stat module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["stat"],
-)
diff --git a/python-stdlib/string/setup.py b/python-stdlib/string/setup.py
deleted file mode 100644
index 5c8ee89b9..000000000
--- a/python-stdlib/string/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-string",
-    version="0.1.1",
-    description="string module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["string"],
-)
diff --git a/python-stdlib/struct/setup.py b/python-stdlib/struct/setup.py
deleted file mode 100644
index f10cbd5d3..000000000
--- a/python-stdlib/struct/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-struct",
-    version="0.1.1",
-    description="struct module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["struct"],
-)
diff --git a/python-stdlib/test.pystone/setup.py b/python-stdlib/test.pystone/setup.py
deleted file mode 100644
index fc18526d1..000000000
--- a/python-stdlib/test.pystone/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-test.pystone",
-    version="1.0.1",
-    description="CPython test.pystone module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["test"],
-)
diff --git a/python-stdlib/textwrap/setup.py b/python-stdlib/textwrap/setup.py
deleted file mode 100644
index 08583e4ab..000000000
--- a/python-stdlib/textwrap/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-textwrap",
-    version="3.4.2-1",
-    description="CPython textwrap module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["textwrap"],
-)
diff --git a/python-stdlib/threading/setup.py b/python-stdlib/threading/setup.py
deleted file mode 100644
index 31693ea11..000000000
--- a/python-stdlib/threading/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-threading",
-    version="0.1",
-    description="threading module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["threading"],
-)
diff --git a/python-stdlib/timeit/setup.py b/python-stdlib/timeit/setup.py
deleted file mode 100644
index 7f17d7f09..000000000
--- a/python-stdlib/timeit/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-timeit",
-    version="3.3.3-3",
-    description="CPython timeit module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["timeit"],
-    install_requires=[
-        "micropython-getopt",
-        "micropython-itertools",
-        "micropython-linecache",
-        "micropython-time",
-        "micropython-traceback",
-    ],
-)
diff --git a/python-stdlib/traceback/setup.py b/python-stdlib/traceback/setup.py
deleted file mode 100644
index db2999c88..000000000
--- a/python-stdlib/traceback/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-traceback",
-    version="0.3",
-    description="traceback module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["traceback"],
-)
diff --git a/python-stdlib/types/setup.py b/python-stdlib/types/setup.py
deleted file mode 100644
index e9d2877c1..000000000
--- a/python-stdlib/types/setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from distutils.core import setup
-
-setup(
-    name="micropython-types",
-    version="0.0.1",
-    description="CPython types module ported to MicroPython",
-    url="https://github.com/micropython/micropython/issues/405",
-    author="CPython Developers",
-    maintainer="MicroPython Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    py_modules=["types"],
-)
diff --git a/python-stdlib/unittest/setup.py b/python-stdlib/unittest/setup.py
deleted file mode 100644
index d1604f813..000000000
--- a/python-stdlib/unittest/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-unittest",
-    version="0.9.0",
-    description="unittest module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["unittest"],
-    install_requires=["micropython-argparse", "micropython-fnmatch"],
-)
diff --git a/python-stdlib/urllib.parse/setup.py b/python-stdlib/urllib.parse/setup.py
deleted file mode 100644
index 403d42594..000000000
--- a/python-stdlib/urllib.parse/setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-urllib.parse",
-    version="0.5.2",
-    description="CPython urllib.parse module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["urllib"],
-    install_requires=[
-        "micropython-re-pcre",
-        "micropython-collections",
-        "micropython-collections.defaultdict",
-    ],
-)
diff --git a/python-stdlib/uu/setup.py b/python-stdlib/uu/setup.py
deleted file mode 100644
index 29fe8ebf0..000000000
--- a/python-stdlib/uu/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-uu",
-    version="0.5.1",
-    description="CPython uu module ported to MicroPython",
-    long_description="This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.",
-    url="https://github.com/micropython/micropython-lib",
-    author="CPython Developers",
-    author_email="python-dev@python.org",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="Python",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["uu"],
-    install_requires=["micropython-binascii", "micropython-os"],
-)
diff --git a/python-stdlib/warnings/setup.py b/python-stdlib/warnings/setup.py
deleted file mode 100644
index c93512ad5..000000000
--- a/python-stdlib/warnings/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-warnings",
-    version="0.1.1",
-    description="warnings module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["warnings"],
-)
diff --git a/unix-ffi/_libc/setup.py b/unix-ffi/_libc/setup.py
deleted file mode 100644
index a2530cc5b..000000000
--- a/unix-ffi/_libc/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-libc",
-    version="0.3.1",
-    description="MicroPython FFI helper module (deprecated)",
-    long_description="MicroPython FFI helper module (deprecated, replaced by micropython-ffilib).",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["_libc"],
-)
diff --git a/unix-ffi/fcntl/setup.py b/unix-ffi/fcntl/setup.py
deleted file mode 100644
index 93fd06136..000000000
--- a/unix-ffi/fcntl/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-fcntl",
-    version="0.0.4",
-    description="fcntl module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["fcntl"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/ffilib/setup.py b/unix-ffi/ffilib/setup.py
deleted file mode 100644
index 4cfc15bea..000000000
--- a/unix-ffi/ffilib/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-ffilib",
-    version="0.1.3",
-    description="MicroPython FFI helper module",
-    long_description="MicroPython FFI helper module to easily interface with underlying shared libraries",
-    url="https://github.com/micropython/micropython-lib",
-    author="Damien George",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["ffilib"],
-)
diff --git a/unix-ffi/gettext/setup.py b/unix-ffi/gettext/setup.py
deleted file mode 100644
index f5cc76fb4..000000000
--- a/unix-ffi/gettext/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-gettext",
-    version="0.1",
-    description="gettext module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Riccardo Magliocchetti",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["gettext"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/machine/setup.py b/unix-ffi/machine/setup.py
deleted file mode 100644
index 88ecafaf1..000000000
--- a/unix-ffi/machine/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-machine",
-    version="0.2.1",
-    description="machine module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["machine"],
-    install_requires=["micropython-ffilib", "micropython-os", "micropython-signal"],
-)
diff --git a/unix-ffi/multiprocessing/setup.py b/unix-ffi/multiprocessing/setup.py
deleted file mode 100644
index 62497ea19..000000000
--- a/unix-ffi/multiprocessing/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-multiprocessing",
-    version="0.1.2",
-    description="multiprocessing module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["multiprocessing"],
-    install_requires=["micropython-os", "micropython-select", "micropython-pickle"],
-)
diff --git a/unix-ffi/os/setup.py b/unix-ffi/os/setup.py
deleted file mode 100644
index 9d4219dad..000000000
--- a/unix-ffi/os/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-os",
-    version="0.6",
-    description="os module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["os"],
-    install_requires=["micropython-ffilib", "micropython-errno", "micropython-stat"],
-)
diff --git a/unix-ffi/pwd/setup.py b/unix-ffi/pwd/setup.py
deleted file mode 100644
index 811836932..000000000
--- a/unix-ffi/pwd/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-pwd",
-    version="0.1",
-    description="pwd module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Riccardo Magliocchetti",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["pwd"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/re-pcre/setup.py b/unix-ffi/re-pcre/setup.py
deleted file mode 100644
index f624e6250..000000000
--- a/unix-ffi/re-pcre/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-re-pcre",
-    version="0.2.5",
-    description="re-pcre module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["re"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/select/setup.py b/unix-ffi/select/setup.py
deleted file mode 100644
index 887b5b9d9..000000000
--- a/unix-ffi/select/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-select",
-    version="0.3",
-    description="select module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["select"],
-    install_requires=["micropython-os", "micropython-ffilib"],
-)
diff --git a/unix-ffi/signal/setup.py b/unix-ffi/signal/setup.py
deleted file mode 100644
index d13328343..000000000
--- a/unix-ffi/signal/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-signal",
-    version="0.3.2",
-    description="signal module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["signal"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/sqlite3/setup.py b/unix-ffi/sqlite3/setup.py
deleted file mode 100644
index 79226dd2b..000000000
--- a/unix-ffi/sqlite3/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-sqlite3",
-    version="0.2.4",
-    description="sqlite3 module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["sqlite3"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/time/setup.py b/unix-ffi/time/setup.py
deleted file mode 100644
index c3ad0332a..000000000
--- a/unix-ffi/time/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-time",
-    version="0.5",
-    description="time module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["time"],
-    install_requires=["micropython-ffilib"],
-)
diff --git a/unix-ffi/tty/setup.py b/unix-ffi/tty/setup.py
deleted file mode 100644
index 199c37e97..000000000
--- a/unix-ffi/tty/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-tty",
-    version="1.0.1",
-    description="tty module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="micropython-lib Developers",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    py_modules=["tty"],
-)
diff --git a/unix-ffi/ucurses/setup.py b/unix-ffi/ucurses/setup.py
deleted file mode 100644
index 04dbde756..000000000
--- a/unix-ffi/ucurses/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sys
-
-# Remove current dir from sys.path, otherwise setuptools will peek up our
-# module instead of system's.
-sys.path.pop(0)
-from setuptools import setup
-
-sys.path.append("..")
-import sdist_upip
-
-setup(
-    name="micropython-ucurses",
-    version="0.1.2",
-    description="ucurses module for MicroPython",
-    long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
-    url="https://github.com/micropython/micropython-lib",
-    author="Paul Sokolovsky",
-    author_email="micro-python@googlegroups.com",
-    maintainer="micropython-lib Developers",
-    maintainer_email="micro-python@googlegroups.com",
-    license="MIT",
-    cmdclass={"sdist": sdist_upip.sdist},
-    packages=["ucurses"],
-    install_requires=["micropython-os", "micropython-tty", "micropython-select"],
-)

From 8d7753d7d44629c2d59528c2a5ffd53b75f84819 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 13 Jul 2022 14:13:32 +1000
Subject: [PATCH 063/343] micropython/upip: Remove upip library.

This is unmaintained and not the one installed by default on boards
(see github.com/micropython/micropython/blob/master/tools/upip.py).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/upip/Makefile          |  13 --
 micropython/upip/bootstrap_upip.sh |  19 --
 micropython/upip/metadata.txt      |   7 -
 micropython/upip/upip.py           | 336 -----------------------------
 micropython/upip/upip_utarfile.py  |  95 --------
 5 files changed, 470 deletions(-)
 delete mode 100644 micropython/upip/Makefile
 delete mode 100755 micropython/upip/bootstrap_upip.sh
 delete mode 100644 micropython/upip/metadata.txt
 delete mode 100644 micropython/upip/upip.py
 delete mode 100644 micropython/upip/upip_utarfile.py

diff --git a/micropython/upip/Makefile b/micropython/upip/Makefile
deleted file mode 100644
index a80a0e23a..000000000
--- a/micropython/upip/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all:
-
-# This target prepares snapshot of all dependency modules, for
-# self-contained install
-deps: upip_gzip.py upip_utarfile.py
-
-upip_gzip.py: ../gzip/gzip.py
-	cp $^ $@
-upip_utarfile.py: ../utarfile/utarfile.py
-	cp $^ $@
-
-clean:
-	rm upip_*.py
diff --git a/micropython/upip/bootstrap_upip.sh b/micropython/upip/bootstrap_upip.sh
deleted file mode 100755
index 9692f450c..000000000
--- a/micropython/upip/bootstrap_upip.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# This script performs bootstrap installation of upip package manager from PyPI
-# All the other packages can be installed using it.
-
-if [ -z "$TMPDIR" ]; then
-    cd /tmp
-else
-    cd $TMPDIR
-fi
-
-# Remove any stale old version
-rm -rf micropython-upip-*
-wget -nd -rH -l1 -D files.pythonhosted.org https://pypi.org/project/micropython-upip/ --reject=html
-
-tar xfz micropython-upip-*.tar.gz
-mkdir -p ~/.micropython/lib/
-cp micropython-upip-*/upip*.py ~/.micropython/lib/
-
-echo "upip is installed. To use:"
-echo "micropython -m upip --help"
diff --git a/micropython/upip/metadata.txt b/micropython/upip/metadata.txt
deleted file mode 100644
index 95d03c03d..000000000
--- a/micropython/upip/metadata.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 1.2.4
-author = Paul Sokolovsky
-extra_modules = upip_utarfile
-desc = Simple package manager for MicroPython.
-long_desc = Simple self-hosted package manager for MicroPython (requires usocket, ussl, uzlib, uctypes builtin modules). Compatible only with packages without custom setup.py code.
diff --git a/micropython/upip/upip.py b/micropython/upip/upip.py
deleted file mode 100644
index b28fdfbb2..000000000
--- a/micropython/upip/upip.py
+++ /dev/null
@@ -1,336 +0,0 @@
-#
-# upip - Package manager for MicroPython
-#
-# Copyright (c) 2015-2018 Paul Sokolovsky
-#
-# Licensed under the MIT license.
-#
-import sys
-import gc
-import uos as os
-import uerrno as errno
-import ujson as json
-import uzlib
-import upip_utarfile as tarfile
-
-gc.collect()
-
-
-debug = False
-install_path = None
-cleanup_files = []
-gzdict_sz = 16 + 15
-
-file_buf = bytearray(512)
-
-
-class NotFoundError(Exception):
-    pass
-
-
-def op_split(path):
-    if path == "":
-        return ("", "")
-    r = path.rsplit("/", 1)
-    if len(r) == 1:
-        return ("", path)
-    head = r[0]
-    if not head:
-        head = "/"
-    return (head, r[1])
-
-
-def op_basename(path):
-    return op_split(path)[1]
-
-
-# Expects *file* name
-def _makedirs(name, mode=0o777):
-    ret = False
-    s = ""
-    comps = name.rstrip("/").split("/")[:-1]
-    if comps[0] == "":
-        s = "/"
-    for c in comps:
-        if s and s[-1] != "/":
-            s += "/"
-        s += c
-        try:
-            os.mkdir(s)
-            ret = True
-        except OSError as e:
-            if e.args[0] != errno.EEXIST and e.args[0] != errno.EISDIR:
-                raise
-            ret = False
-    return ret
-
-
-def save_file(fname, subf):
-    global file_buf
-    with open(fname, "wb") as outf:
-        while True:
-            sz = subf.readinto(file_buf)
-            if not sz:
-                break
-            outf.write(file_buf, sz)
-
-
-def install_tar(f, prefix):
-    meta = {}
-    for info in f:
-        # print(info)
-        fname = info.name
-        try:
-            fname = fname[fname.index("/") + 1 :]
-        except ValueError:
-            fname = ""
-
-        save = True
-        for p in ("setup.", "PKG-INFO", "README"):
-            # print(fname, p)
-            if fname.startswith(p) or ".egg-info" in fname:
-                if fname.endswith("/requires.txt"):
-                    meta["deps"] = f.extractfile(info).read()
-                save = False
-                if debug:
-                    print("Skipping", fname)
-                break
-
-        if save:
-            outfname = prefix + fname
-            if info.type != tarfile.DIRTYPE:
-                if debug:
-                    print("Extracting " + outfname)
-                _makedirs(outfname)
-                subf = f.extractfile(info)
-                save_file(outfname, subf)
-    return meta
-
-
-def expandhome(s):
-    if "~/" in s:
-        h = os.getenv("HOME")
-        s = s.replace("~/", h + "/")
-    return s
-
-
-import ussl
-import usocket
-
-warn_ussl = True
-
-
-def url_open(url):
-    global warn_ussl
-
-    if debug:
-        print(url)
-
-    proto, _, host, urlpath = url.split("/", 3)
-    try:
-        ai = usocket.getaddrinfo(host, 443, 0, usocket.SOCK_STREAM)
-    except OSError as e:
-        fatal("Unable to resolve %s (no Internet?)" % host, e)
-    # print("Address infos:", ai)
-    ai = ai[0]
-
-    s = usocket.socket(ai[0], ai[1], ai[2])
-    try:
-        # print("Connect address:", addr)
-        s.connect(ai[-1])
-
-        if proto == "https:":
-            s = ussl.wrap_socket(s, server_hostname=host)
-            if warn_ussl:
-                print("Warning: %s SSL certificate is not validated" % host)
-                warn_ussl = False
-
-        # MicroPython rawsocket module supports file interface directly
-        s.write("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n" % (urlpath, host))
-        l = s.readline()
-        protover, status, msg = l.split(None, 2)
-        if status != b"200":
-            if status == b"404" or status == b"301":
-                raise NotFoundError("Package not found")
-            raise ValueError(status)
-        while 1:
-            l = s.readline()
-            if not l:
-                raise ValueError("Unexpected EOF in HTTP headers")
-            if l == b"\r\n":
-                break
-    except Exception as e:
-        s.close()
-        raise e
-
-    return s
-
-
-def get_pkg_metadata(name):
-    f = url_open("https://pypi.org/pypi/%s/json" % name)
-    try:
-        return json.load(f)
-    finally:
-        f.close()
-
-
-def fatal(msg, exc=None):
-    print("Error:", msg)
-    if exc and debug:
-        raise exc
-    sys.exit(1)
-
-
-def install_pkg(pkg_spec, install_path):
-    data = get_pkg_metadata(pkg_spec)
-
-    latest_ver = data["info"]["version"]
-    packages = data["releases"][latest_ver]
-    del data
-    gc.collect()
-    assert len(packages) == 1
-    package_url = packages[0]["url"]
-    print("Installing %s %s from %s" % (pkg_spec, latest_ver, package_url))
-    package_fname = op_basename(package_url)
-    f1 = url_open(package_url)
-    try:
-        f2 = uzlib.DecompIO(f1, gzdict_sz)
-        f3 = tarfile.TarFile(fileobj=f2)
-        meta = install_tar(f3, install_path)
-    finally:
-        f1.close()
-    del f3
-    del f2
-    gc.collect()
-    return meta
-
-
-def install(to_install, install_path=None):
-    # Calculate gzip dictionary size to use
-    global gzdict_sz
-    sz = gc.mem_free() + gc.mem_alloc()
-    if sz <= 65536:
-        gzdict_sz = 16 + 12
-
-    if install_path is None:
-        install_path = get_install_path()
-    if install_path[-1] != "/":
-        install_path += "/"
-    if not isinstance(to_install, list):
-        to_install = [to_install]
-    print("Installing to: " + install_path)
-    # sets would be perfect here, but don't depend on them
-    installed = []
-    try:
-        while to_install:
-            if debug:
-                print("Queue:", to_install)
-            pkg_spec = to_install.pop(0)
-            if pkg_spec in installed:
-                continue
-            meta = install_pkg(pkg_spec, install_path)
-            installed.append(pkg_spec)
-            if debug:
-                print(meta)
-            deps = meta.get("deps", "").rstrip()
-            if deps:
-                deps = deps.decode("utf-8").split("\n")
-                to_install.extend(deps)
-    except Exception as e:
-        print(
-            "Error installing '{}': {}, packages may be partially installed".format(pkg_spec, e),
-            file=sys.stderr,
-        )
-
-
-def get_install_path():
-    global install_path
-    if install_path is None:
-        # sys.path[0] is current module's path
-        install_path = sys.path[1]
-    install_path = expandhome(install_path)
-    return install_path
-
-
-def cleanup():
-    for fname in cleanup_files:
-        try:
-            os.unlink(fname)
-        except OSError:
-            print("Warning: Cannot delete " + fname)
-
-
-def help():
-    print(
-        """\
-upip - Simple PyPI package manager for MicroPython
-Usage: micropython -m upip install [-p <path>] <package>... | -r <requirements.txt>
-import upip; upip.install(package_or_list, [<path>])
-
-If <path> is not given, packages will be installed into sys.path[1]
-(can be set from MICROPYPATH environment variable, if current system
-supports that)."""
-    )
-    print("Current value of sys.path[1]:", sys.path[1])
-    print(
-        """\
-
-Note: only MicroPython packages (usually, named micropython-*) are supported
-for installation, upip does not support arbitrary code in setup.py.
-"""
-    )
-
-
-def main():
-    global debug
-    global install_path
-    install_path = None
-
-    if len(sys.argv) < 2 or sys.argv[1] == "-h" or sys.argv[1] == "--help":
-        help()
-        return
-
-    if sys.argv[1] != "install":
-        fatal("Only 'install' command supported")
-
-    to_install = []
-
-    i = 2
-    while i < len(sys.argv) and sys.argv[i][0] == "-":
-        opt = sys.argv[i]
-        i += 1
-        if opt == "-h" or opt == "--help":
-            help()
-            return
-        elif opt == "-p":
-            install_path = sys.argv[i]
-            i += 1
-        elif opt == "-r":
-            list_file = sys.argv[i]
-            i += 1
-            with open(list_file) as f:
-                while True:
-                    l = f.readline()
-                    if not l:
-                        break
-                    if l[0] == "#":
-                        continue
-                    to_install.append(l.rstrip())
-        elif opt == "--debug":
-            debug = True
-        else:
-            fatal("Unknown/unsupported option: " + opt)
-
-    to_install.extend(sys.argv[i:])
-    if not to_install:
-        help()
-        return
-
-    install(to_install)
-
-    if not debug:
-        cleanup()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/micropython/upip/upip_utarfile.py b/micropython/upip/upip_utarfile.py
deleted file mode 100644
index 21b899f02..000000000
--- a/micropython/upip/upip_utarfile.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import uctypes
-
-# http://www.gnu.org/software/tar/manual/html_node/Standard.html
-TAR_HEADER = {
-    "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
-    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 11),
-}
-
-DIRTYPE = "dir"
-REGTYPE = "file"
-
-
-def roundup(val, align):
-    return (val + align - 1) & ~(align - 1)
-
-
-class FileSection:
-    def __init__(self, f, content_len, aligned_len):
-        self.f = f
-        self.content_len = content_len
-        self.align = aligned_len - content_len
-
-    def read(self, sz=65536):
-        if self.content_len == 0:
-            return b""
-        if sz > self.content_len:
-            sz = self.content_len
-        data = self.f.read(sz)
-        sz = len(data)
-        self.content_len -= sz
-        return data
-
-    def readinto(self, buf):
-        if self.content_len == 0:
-            return 0
-        if len(buf) > self.content_len:
-            buf = memoryview(buf)[: self.content_len]
-        sz = self.f.readinto(buf)
-        self.content_len -= sz
-        return sz
-
-    def skip(self):
-        sz = self.content_len + self.align
-        if sz:
-            buf = bytearray(16)
-            while sz:
-                s = min(sz, 16)
-                self.f.readinto(buf, s)
-                sz -= s
-
-
-class TarInfo:
-    def __str__(self):
-        return "TarInfo(%r, %s, %d)" % (self.name, self.type, self.size)
-
-
-class TarFile:
-    def __init__(self, name=None, fileobj=None):
-        if fileobj:
-            self.f = fileobj
-        else:
-            self.f = open(name, "rb")
-        self.subf = None
-
-    def next(self):
-        if self.subf:
-            self.subf.skip()
-        buf = self.f.read(512)
-        if not buf:
-            return None
-
-        h = uctypes.struct(uctypes.addressof(buf), TAR_HEADER, uctypes.LITTLE_ENDIAN)
-
-        # Empty block means end of archive
-        if h.name[0] == 0:
-            return None
-
-        d = TarInfo()
-        d.name = str(h.name, "utf-8").rstrip("\0")
-        d.size = int(bytes(h.size), 8)
-        d.type = [REGTYPE, DIRTYPE][d.name[-1] == "/"]
-        self.subf = d.subf = FileSection(self.f, d.size, roundup(d.size, 512))
-        return d
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        v = self.next()
-        if v is None:
-            raise StopIteration
-        return v
-
-    def extractfile(self, tarinfo):
-        return tarinfo.subf

From ce66e701a5bd20859c6a4f66b262fc38992dfa3a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 13 Jul 2022 14:44:28 +1000
Subject: [PATCH 064/343] all: Replace metadata.txt with manifest.py.

Uses the new require()/package()/module() functions from manifestfile.py.

Add manifest.py for iperf3 and pyjwt.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/manifest.py          |  8 +-------
 micropython/test.support/manifest.py              |  3 +++
 micropython/test.support/metadata.txt             |  3 ---
 micropython/uaiohttpclient/manifest.py            |  5 +++++
 micropython/uaiohttpclient/metadata.txt           |  6 ------
 micropython/ucontextlib/manifest.py               |  5 +++++
 micropython/ucontextlib/metadata.txt              |  5 -----
 micropython/udnspkt/manifest.py                   |  5 +++++
 micropython/udnspkt/metadata.txt                  |  5 -----
 micropython/umqtt.robust/manifest.py              |  7 +++++++
 micropython/umqtt.robust/metadata.txt             |  6 ------
 micropython/umqtt.simple/manifest.py              |  5 +++++
 micropython/umqtt.simple/metadata.txt             |  6 ------
 micropython/upysh/manifest.py                     |  3 +++
 micropython/upysh/metadata.txt                    |  5 -----
 micropython/urllib.urequest/manifest.py           |  5 +++++
 micropython/urllib.urequest/metadata.txt          |  4 ----
 micropython/utarfile/manifest.py                  |  5 +++++
 micropython/utarfile/metadata.txt                 |  5 -----
 micropython/xmltok/manifest.py                    |  5 +++++
 micropython/xmltok/metadata.txt                   |  5 -----
 python-ecosys/iperf3/manifest.py                  |  1 +
 python-ecosys/pyjwt/manifest.py                   |  5 +++++
 python-ecosys/urequests/manifest.py               |  3 +++
 python-ecosys/urequests/metadata.txt              |  3 ---
 python-stdlib/__future__/manifest.py              |  3 +++
 python-stdlib/__future__/metadata.txt             |  4 ----
 python-stdlib/_markupbase/manifest.py             |  5 +++++
 python-stdlib/_markupbase/metadata.txt            |  4 ----
 python-stdlib/abc/manifest.py                     |  3 +++
 python-stdlib/abc/metadata.txt                    |  3 ---
 python-stdlib/argparse/manifest.py                |  5 +++++
 python-stdlib/argparse/metadata.txt               |  4 ----
 python-stdlib/base64/manifest.py                  |  7 +++++++
 python-stdlib/base64/metadata.txt                 |  4 ----
 python-stdlib/binascii/manifest.py                |  3 +++
 python-stdlib/binascii/metadata.txt               |  3 ---
 python-stdlib/cgi/manifest.py                     |  3 +++
 python-stdlib/cgi/metadata.txt                    |  3 ---
 python-stdlib/cmd/manifest.py                     |  3 +++
 python-stdlib/cmd/metadata.txt                    |  3 ---
 python-stdlib/collections.defaultdict/manifest.py |  5 +++++
 .../collections.defaultdict/metadata.txt          |  4 ----
 python-stdlib/collections.deque/manifest.py       |  3 +++
 python-stdlib/collections.deque/metadata.txt      |  3 ---
 python-stdlib/collections/manifest.py             |  3 +++
 python-stdlib/collections/metadata.txt            |  3 ---
 python-stdlib/contextlib/manifest.py              |  6 ++++++
 python-stdlib/contextlib/metadata.txt             |  5 -----
 python-stdlib/copy/manifest.py                    |  3 +++
 python-stdlib/copy/metadata.txt                   |  3 ---
 python-stdlib/curses.ascii/manifest.py            |  3 +++
 python-stdlib/curses.ascii/metadata.txt           |  3 ---
 python-stdlib/datetime/manifest.py                |  5 +++++
 python-stdlib/datetime/metadata.txt               |  4 ----
 python-stdlib/email.charset/manifest.py           |  7 +++++++
 python-stdlib/email.charset/metadata.txt          |  4 ----
 python-stdlib/email.encoders/manifest.py          |  9 +++++++++
 python-stdlib/email.encoders/metadata.txt         |  4 ----
 python-stdlib/email.errors/manifest.py            |  3 +++
 python-stdlib/email.errors/metadata.txt           |  3 ---
 python-stdlib/email.feedparser/manifest.py        |  8 ++++++++
 python-stdlib/email.feedparser/metadata.txt       |  4 ----
 python-stdlib/email.header/manifest.py            |  9 +++++++++
 python-stdlib/email.header/metadata.txt           |  4 ----
 python-stdlib/email.internal/manifest.py          | 15 +++++++++++++++
 python-stdlib/email.internal/metadata.txt         |  4 ----
 python-stdlib/email.message/manifest.py           | 11 +++++++++++
 python-stdlib/email.message/metadata.txt          |  4 ----
 python-stdlib/email.parser/manifest.py            |  8 ++++++++
 python-stdlib/email.parser/metadata.txt           |  4 ----
 python-stdlib/email.utils/manifest.py             | 13 +++++++++++++
 python-stdlib/email.utils/metadata.txt            |  4 ----
 python-stdlib/errno/manifest.py                   |  3 +++
 python-stdlib/errno/metadata.txt                  |  3 ---
 python-stdlib/fnmatch/manifest.py                 |  3 +++
 python-stdlib/fnmatch/metadata.txt                |  3 ---
 python-stdlib/functools/manifest.py               |  3 +++
 python-stdlib/functools/metadata.txt              |  3 ---
 python-stdlib/getopt/manifest.py                  |  5 +++++
 python-stdlib/getopt/metadata.txt                 |  4 ----
 python-stdlib/glob/manifest.py                    |  7 +++++++
 python-stdlib/glob/metadata.txt                   |  4 ----
 python-stdlib/gzip/manifest.py                    |  3 +++
 python-stdlib/gzip/metadata.txt                   |  3 ---
 python-stdlib/hashlib/manifest.py                 |  3 +++
 python-stdlib/hashlib/metadata.txt                |  3 ---
 python-stdlib/heapq/manifest.py                   |  3 +++
 python-stdlib/heapq/metadata.txt                  |  5 -----
 python-stdlib/hmac/manifest.py                    |  3 +++
 python-stdlib/hmac/metadata.txt                   |  3 ---
 python-stdlib/html.entities/manifest.py           |  3 +++
 python-stdlib/html.entities/metadata.txt          |  3 ---
 python-stdlib/html.parser/manifest.py             |  8 ++++++++
 python-stdlib/html.parser/metadata.txt            |  4 ----
 python-stdlib/html/manifest.py                    |  5 +++++
 python-stdlib/html/metadata.txt                   |  4 ----
 python-stdlib/http.client/manifest.py             | 10 ++++++++++
 python-stdlib/http.client/metadata.txt            |  4 ----
 python-stdlib/inspect/manifest.py                 |  3 +++
 python-stdlib/inspect/metadata.txt                |  3 ---
 python-stdlib/io/manifest.py                      |  3 +++
 python-stdlib/io/metadata.txt                     |  3 ---
 python-stdlib/itertools/manifest.py               |  3 +++
 python-stdlib/itertools/metadata.txt              |  3 ---
 python-stdlib/locale/manifest.py                  |  3 +++
 python-stdlib/locale/metadata.txt                 |  3 ---
 python-stdlib/logging/manifest.py                 |  3 +++
 python-stdlib/logging/metadata.txt                |  3 ---
 python-stdlib/operator/manifest.py                |  3 +++
 python-stdlib/operator/metadata.txt               |  3 ---
 python-stdlib/os.path/manifest.py                 |  7 +++++++
 python-stdlib/os.path/metadata.txt                |  4 ----
 python-stdlib/os/manifest.py                      |  5 +++++
 python-stdlib/os/metadata.txt                     |  4 ----
 python-stdlib/pickle/manifest.py                  |  3 +++
 python-stdlib/pickle/metadata.txt                 |  3 ---
 python-stdlib/pkg_resources/manifest.py           |  3 +++
 python-stdlib/pkg_resources/metadata.txt          |  3 ---
 python-stdlib/pkgutil/manifest.py                 |  5 +++++
 python-stdlib/pkgutil/metadata.txt                |  4 ----
 python-stdlib/pprint/manifest.py                  |  3 +++
 python-stdlib/pprint/metadata.txt                 |  3 ---
 python-stdlib/pystone/manifest.py                 |  3 +++
 python-stdlib/pystone/metadata.txt                |  3 ---
 python-stdlib/pystone_lowmem/manifest.py          |  3 +++
 python-stdlib/pystone_lowmem/metadata.txt         |  3 ---
 python-stdlib/quopri/manifest.py                  |  3 +++
 python-stdlib/quopri/metadata.txt                 |  3 ---
 python-stdlib/random/manifest.py                  |  3 +++
 python-stdlib/random/metadata.txt                 |  3 ---
 python-stdlib/shutil/manifest.py                  |  3 +++
 python-stdlib/shutil/metadata.txt                 |  3 ---
 python-stdlib/socket/manifest.py                  |  5 +++++
 python-stdlib/socket/metadata.txt                 |  4 ----
 python-stdlib/ssl/manifest.py                     |  3 +++
 python-stdlib/ssl/metadata.txt                    |  3 ---
 python-stdlib/stat/manifest.py                    |  3 +++
 python-stdlib/stat/metadata.txt                   |  3 ---
 python-stdlib/string/manifest.py                  |  3 +++
 python-stdlib/string/metadata.txt                 |  3 ---
 python-stdlib/struct/manifest.py                  |  3 +++
 python-stdlib/struct/metadata.txt                 |  3 ---
 python-stdlib/test.pystone/manifest.py            |  3 +++
 python-stdlib/test.pystone/metadata.txt           |  3 ---
 python-stdlib/textwrap/manifest.py                |  3 +++
 python-stdlib/textwrap/metadata.txt               |  3 ---
 python-stdlib/threading/manifest.py               |  3 +++
 python-stdlib/threading/metadata.txt              |  3 ---
 python-stdlib/timeit/manifest.py                  |  9 +++++++++
 python-stdlib/timeit/metadata.txt                 |  4 ----
 python-stdlib/traceback/manifest.py               |  3 +++
 python-stdlib/traceback/metadata.txt              |  3 ---
 python-stdlib/unittest/manifest.py                |  6 ++++++
 python-stdlib/unittest/metadata.txt               |  4 ----
 python-stdlib/urllib.parse/manifest.py            |  7 +++++++
 python-stdlib/urllib.parse/metadata.txt           |  4 ----
 python-stdlib/uu/manifest.py                      |  6 ++++++
 python-stdlib/uu/metadata.txt                     |  4 ----
 python-stdlib/warnings/manifest.py                |  3 +++
 python-stdlib/warnings/metadata.txt               |  3 ---
 unix-ffi/_libc/manifest.py                        |  8 ++++++++
 unix-ffi/_libc/metadata.txt                       |  7 -------
 unix-ffi/email.charset/manifest.py                |  7 +++++++
 unix-ffi/email.feedparser/manifest.py             |  8 ++++++++
 unix-ffi/email.header/manifest.py                 |  9 +++++++++
 unix-ffi/email.internal/manifest.py               | 15 +++++++++++++++
 unix-ffi/email.message/manifest.py                | 11 +++++++++++
 unix-ffi/email.parser/manifest.py                 |  8 ++++++++
 unix-ffi/fcntl/manifest.py                        |  7 +++++++
 unix-ffi/fcntl/metadata.txt                       |  5 -----
 unix-ffi/ffilib/manifest.py                       |  8 ++++++++
 unix-ffi/ffilib/metadata.txt                      |  7 -------
 unix-ffi/gettext/manifest.py                      |  7 +++++++
 unix-ffi/gettext/metadata.txt                     |  5 -----
 unix-ffi/glob/manifest.py                         |  8 ++++++++
 unix-ffi/html.parser/manifest.py                  |  8 ++++++++
 unix-ffi/http.client/manifest.py                  | 10 ++++++++++
 unix-ffi/machine/manifest.py                      |  9 +++++++++
 unix-ffi/machine/metadata.txt                     |  5 -----
 unix-ffi/multiprocessing/manifest.py              |  9 +++++++++
 unix-ffi/multiprocessing/metadata.txt             |  5 -----
 unix-ffi/os/manifest.py                           |  9 +++++++++
 unix-ffi/os/metadata.txt                          |  5 -----
 unix-ffi/pwd/manifest.py                          |  7 +++++++
 unix-ffi/pwd/metadata.txt                         |  5 -----
 unix-ffi/re-pcre/manifest.py                      |  7 +++++++
 unix-ffi/re-pcre/metadata.txt                     |  6 ------
 unix-ffi/select/manifest.py                       |  8 ++++++++
 unix-ffi/select/metadata.txt                      |  5 -----
 unix-ffi/signal/manifest.py                       |  7 +++++++
 unix-ffi/signal/metadata.txt                      |  5 -----
 unix-ffi/sqlite3/manifest.py                      |  7 +++++++
 unix-ffi/sqlite3/metadata.txt                     |  5 -----
 unix-ffi/time/manifest.py                         |  5 +++++
 unix-ffi/time/metadata.txt                        |  4 ----
 unix-ffi/tty/manifest.py                          |  3 +++
 unix-ffi/tty/metadata.txt                         |  3 ---
 unix-ffi/ucurses/manifest.py                      |  9 +++++++++
 unix-ffi/ucurses/metadata.txt                     |  5 -----
 200 files changed, 573 insertions(+), 372 deletions(-)
 create mode 100644 micropython/test.support/manifest.py
 delete mode 100644 micropython/test.support/metadata.txt
 create mode 100644 micropython/uaiohttpclient/manifest.py
 delete mode 100644 micropython/uaiohttpclient/metadata.txt
 create mode 100644 micropython/ucontextlib/manifest.py
 delete mode 100644 micropython/ucontextlib/metadata.txt
 create mode 100644 micropython/udnspkt/manifest.py
 delete mode 100644 micropython/udnspkt/metadata.txt
 create mode 100644 micropython/umqtt.robust/manifest.py
 delete mode 100644 micropython/umqtt.robust/metadata.txt
 create mode 100644 micropython/umqtt.simple/manifest.py
 delete mode 100644 micropython/umqtt.simple/metadata.txt
 create mode 100644 micropython/upysh/manifest.py
 delete mode 100644 micropython/upysh/metadata.txt
 create mode 100644 micropython/urllib.urequest/manifest.py
 delete mode 100644 micropython/urllib.urequest/metadata.txt
 create mode 100644 micropython/utarfile/manifest.py
 delete mode 100644 micropython/utarfile/metadata.txt
 create mode 100644 micropython/xmltok/manifest.py
 delete mode 100644 micropython/xmltok/metadata.txt
 create mode 100644 python-ecosys/iperf3/manifest.py
 create mode 100644 python-ecosys/pyjwt/manifest.py
 create mode 100644 python-ecosys/urequests/manifest.py
 delete mode 100644 python-ecosys/urequests/metadata.txt
 create mode 100644 python-stdlib/__future__/manifest.py
 delete mode 100644 python-stdlib/__future__/metadata.txt
 create mode 100644 python-stdlib/_markupbase/manifest.py
 delete mode 100644 python-stdlib/_markupbase/metadata.txt
 create mode 100644 python-stdlib/abc/manifest.py
 delete mode 100644 python-stdlib/abc/metadata.txt
 create mode 100644 python-stdlib/argparse/manifest.py
 delete mode 100644 python-stdlib/argparse/metadata.txt
 create mode 100644 python-stdlib/base64/manifest.py
 delete mode 100644 python-stdlib/base64/metadata.txt
 create mode 100644 python-stdlib/binascii/manifest.py
 delete mode 100644 python-stdlib/binascii/metadata.txt
 create mode 100644 python-stdlib/cgi/manifest.py
 delete mode 100644 python-stdlib/cgi/metadata.txt
 create mode 100644 python-stdlib/cmd/manifest.py
 delete mode 100644 python-stdlib/cmd/metadata.txt
 create mode 100644 python-stdlib/collections.defaultdict/manifest.py
 delete mode 100644 python-stdlib/collections.defaultdict/metadata.txt
 create mode 100644 python-stdlib/collections.deque/manifest.py
 delete mode 100644 python-stdlib/collections.deque/metadata.txt
 create mode 100644 python-stdlib/collections/manifest.py
 delete mode 100644 python-stdlib/collections/metadata.txt
 create mode 100644 python-stdlib/contextlib/manifest.py
 delete mode 100644 python-stdlib/contextlib/metadata.txt
 create mode 100644 python-stdlib/copy/manifest.py
 delete mode 100644 python-stdlib/copy/metadata.txt
 create mode 100644 python-stdlib/curses.ascii/manifest.py
 delete mode 100644 python-stdlib/curses.ascii/metadata.txt
 create mode 100644 python-stdlib/datetime/manifest.py
 delete mode 100644 python-stdlib/datetime/metadata.txt
 create mode 100644 python-stdlib/email.charset/manifest.py
 delete mode 100644 python-stdlib/email.charset/metadata.txt
 create mode 100644 python-stdlib/email.encoders/manifest.py
 delete mode 100644 python-stdlib/email.encoders/metadata.txt
 create mode 100644 python-stdlib/email.errors/manifest.py
 delete mode 100644 python-stdlib/email.errors/metadata.txt
 create mode 100644 python-stdlib/email.feedparser/manifest.py
 delete mode 100644 python-stdlib/email.feedparser/metadata.txt
 create mode 100644 python-stdlib/email.header/manifest.py
 delete mode 100644 python-stdlib/email.header/metadata.txt
 create mode 100644 python-stdlib/email.internal/manifest.py
 delete mode 100644 python-stdlib/email.internal/metadata.txt
 create mode 100644 python-stdlib/email.message/manifest.py
 delete mode 100644 python-stdlib/email.message/metadata.txt
 create mode 100644 python-stdlib/email.parser/manifest.py
 delete mode 100644 python-stdlib/email.parser/metadata.txt
 create mode 100644 python-stdlib/email.utils/manifest.py
 delete mode 100644 python-stdlib/email.utils/metadata.txt
 create mode 100644 python-stdlib/errno/manifest.py
 delete mode 100644 python-stdlib/errno/metadata.txt
 create mode 100644 python-stdlib/fnmatch/manifest.py
 delete mode 100644 python-stdlib/fnmatch/metadata.txt
 create mode 100644 python-stdlib/functools/manifest.py
 delete mode 100644 python-stdlib/functools/metadata.txt
 create mode 100644 python-stdlib/getopt/manifest.py
 delete mode 100644 python-stdlib/getopt/metadata.txt
 create mode 100644 python-stdlib/glob/manifest.py
 delete mode 100644 python-stdlib/glob/metadata.txt
 create mode 100644 python-stdlib/gzip/manifest.py
 delete mode 100644 python-stdlib/gzip/metadata.txt
 create mode 100644 python-stdlib/hashlib/manifest.py
 delete mode 100644 python-stdlib/hashlib/metadata.txt
 create mode 100644 python-stdlib/heapq/manifest.py
 delete mode 100644 python-stdlib/heapq/metadata.txt
 create mode 100644 python-stdlib/hmac/manifest.py
 delete mode 100644 python-stdlib/hmac/metadata.txt
 create mode 100644 python-stdlib/html.entities/manifest.py
 delete mode 100644 python-stdlib/html.entities/metadata.txt
 create mode 100644 python-stdlib/html.parser/manifest.py
 delete mode 100644 python-stdlib/html.parser/metadata.txt
 create mode 100644 python-stdlib/html/manifest.py
 delete mode 100644 python-stdlib/html/metadata.txt
 create mode 100644 python-stdlib/http.client/manifest.py
 delete mode 100644 python-stdlib/http.client/metadata.txt
 create mode 100644 python-stdlib/inspect/manifest.py
 delete mode 100644 python-stdlib/inspect/metadata.txt
 create mode 100644 python-stdlib/io/manifest.py
 delete mode 100644 python-stdlib/io/metadata.txt
 create mode 100644 python-stdlib/itertools/manifest.py
 delete mode 100644 python-stdlib/itertools/metadata.txt
 create mode 100644 python-stdlib/locale/manifest.py
 delete mode 100644 python-stdlib/locale/metadata.txt
 create mode 100644 python-stdlib/logging/manifest.py
 delete mode 100644 python-stdlib/logging/metadata.txt
 create mode 100644 python-stdlib/operator/manifest.py
 delete mode 100644 python-stdlib/operator/metadata.txt
 create mode 100644 python-stdlib/os.path/manifest.py
 delete mode 100644 python-stdlib/os.path/metadata.txt
 create mode 100644 python-stdlib/os/manifest.py
 delete mode 100644 python-stdlib/os/metadata.txt
 create mode 100644 python-stdlib/pickle/manifest.py
 delete mode 100644 python-stdlib/pickle/metadata.txt
 create mode 100644 python-stdlib/pkg_resources/manifest.py
 delete mode 100644 python-stdlib/pkg_resources/metadata.txt
 create mode 100644 python-stdlib/pkgutil/manifest.py
 delete mode 100644 python-stdlib/pkgutil/metadata.txt
 create mode 100644 python-stdlib/pprint/manifest.py
 delete mode 100644 python-stdlib/pprint/metadata.txt
 create mode 100644 python-stdlib/pystone/manifest.py
 delete mode 100644 python-stdlib/pystone/metadata.txt
 create mode 100644 python-stdlib/pystone_lowmem/manifest.py
 delete mode 100644 python-stdlib/pystone_lowmem/metadata.txt
 create mode 100644 python-stdlib/quopri/manifest.py
 delete mode 100644 python-stdlib/quopri/metadata.txt
 create mode 100644 python-stdlib/random/manifest.py
 delete mode 100644 python-stdlib/random/metadata.txt
 create mode 100644 python-stdlib/shutil/manifest.py
 delete mode 100644 python-stdlib/shutil/metadata.txt
 create mode 100644 python-stdlib/socket/manifest.py
 delete mode 100644 python-stdlib/socket/metadata.txt
 create mode 100644 python-stdlib/ssl/manifest.py
 delete mode 100644 python-stdlib/ssl/metadata.txt
 create mode 100644 python-stdlib/stat/manifest.py
 delete mode 100644 python-stdlib/stat/metadata.txt
 create mode 100644 python-stdlib/string/manifest.py
 delete mode 100644 python-stdlib/string/metadata.txt
 create mode 100644 python-stdlib/struct/manifest.py
 delete mode 100644 python-stdlib/struct/metadata.txt
 create mode 100644 python-stdlib/test.pystone/manifest.py
 delete mode 100644 python-stdlib/test.pystone/metadata.txt
 create mode 100644 python-stdlib/textwrap/manifest.py
 delete mode 100644 python-stdlib/textwrap/metadata.txt
 create mode 100644 python-stdlib/threading/manifest.py
 delete mode 100644 python-stdlib/threading/metadata.txt
 create mode 100644 python-stdlib/timeit/manifest.py
 delete mode 100644 python-stdlib/timeit/metadata.txt
 create mode 100644 python-stdlib/traceback/manifest.py
 delete mode 100644 python-stdlib/traceback/metadata.txt
 create mode 100644 python-stdlib/unittest/manifest.py
 delete mode 100644 python-stdlib/unittest/metadata.txt
 create mode 100644 python-stdlib/urllib.parse/manifest.py
 delete mode 100644 python-stdlib/urllib.parse/metadata.txt
 create mode 100644 python-stdlib/uu/manifest.py
 delete mode 100644 python-stdlib/uu/metadata.txt
 create mode 100644 python-stdlib/warnings/manifest.py
 delete mode 100644 python-stdlib/warnings/metadata.txt
 create mode 100644 unix-ffi/_libc/manifest.py
 delete mode 100644 unix-ffi/_libc/metadata.txt
 create mode 100644 unix-ffi/email.charset/manifest.py
 create mode 100644 unix-ffi/email.feedparser/manifest.py
 create mode 100644 unix-ffi/email.header/manifest.py
 create mode 100644 unix-ffi/email.internal/manifest.py
 create mode 100644 unix-ffi/email.message/manifest.py
 create mode 100644 unix-ffi/email.parser/manifest.py
 create mode 100644 unix-ffi/fcntl/manifest.py
 delete mode 100644 unix-ffi/fcntl/metadata.txt
 create mode 100644 unix-ffi/ffilib/manifest.py
 delete mode 100644 unix-ffi/ffilib/metadata.txt
 create mode 100644 unix-ffi/gettext/manifest.py
 delete mode 100644 unix-ffi/gettext/metadata.txt
 create mode 100644 unix-ffi/glob/manifest.py
 create mode 100644 unix-ffi/html.parser/manifest.py
 create mode 100644 unix-ffi/http.client/manifest.py
 create mode 100644 unix-ffi/machine/manifest.py
 delete mode 100644 unix-ffi/machine/metadata.txt
 create mode 100644 unix-ffi/multiprocessing/manifest.py
 delete mode 100644 unix-ffi/multiprocessing/metadata.txt
 create mode 100644 unix-ffi/os/manifest.py
 delete mode 100644 unix-ffi/os/metadata.txt
 create mode 100644 unix-ffi/pwd/manifest.py
 delete mode 100644 unix-ffi/pwd/metadata.txt
 create mode 100644 unix-ffi/re-pcre/manifest.py
 delete mode 100644 unix-ffi/re-pcre/metadata.txt
 create mode 100644 unix-ffi/select/manifest.py
 delete mode 100644 unix-ffi/select/metadata.txt
 create mode 100644 unix-ffi/signal/manifest.py
 delete mode 100644 unix-ffi/signal/metadata.txt
 create mode 100644 unix-ffi/sqlite3/manifest.py
 delete mode 100644 unix-ffi/sqlite3/metadata.txt
 create mode 100644 unix-ffi/time/manifest.py
 delete mode 100644 unix-ffi/time/metadata.txt
 create mode 100644 unix-ffi/tty/manifest.py
 delete mode 100644 unix-ffi/tty/metadata.txt
 create mode 100644 unix-ffi/ucurses/manifest.py
 delete mode 100644 unix-ffi/ucurses/metadata.txt

diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 056c909eb..337014757 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -1,5 +1,3 @@
-import os
-
 _files = (
     "__init__.py",
     "core.py",
@@ -26,8 +24,4 @@
 if options.security:
     _files += ("security.py",)
 
-freeze(
-    ".",
-    tuple(os.path.join("aioble", f) for f in _files),
-    opt=3,
-)
+package("aioble", files=_files)
diff --git a/micropython/test.support/manifest.py b/micropython/test.support/manifest.py
new file mode 100644
index 000000000..d927e7ee8
--- /dev/null
+++ b/micropython/test.support/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.3")
+
+package("test")
diff --git a/micropython/test.support/metadata.txt b/micropython/test.support/metadata.txt
deleted file mode 100644
index 44531b197..000000000
--- a/micropython/test.support/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=package
-version = 0.1.3
diff --git a/micropython/uaiohttpclient/manifest.py b/micropython/uaiohttpclient/manifest.py
new file mode 100644
index 000000000..72dd9671c
--- /dev/null
+++ b/micropython/uaiohttpclient/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="HTTP client module for MicroPython uasyncio module", version="0.5.1")
+
+# Originally written by Paul Sokolovsky.
+
+module("uaiohttpclient.py")
diff --git a/micropython/uaiohttpclient/metadata.txt b/micropython/uaiohttpclient/metadata.txt
deleted file mode 100644
index 4005f7842..000000000
--- a/micropython/uaiohttpclient/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.5.1
-author = Paul Sokolovsky
-desc = HTTP client module for MicroPython uasyncio module
-long_desc = README
diff --git a/micropython/ucontextlib/manifest.py b/micropython/ucontextlib/manifest.py
new file mode 100644
index 000000000..81e6e0859
--- /dev/null
+++ b/micropython/ucontextlib/manifest.py
@@ -0,0 +1,5 @@
+metadata(
+    description="Minimal subset of contextlib for MicroPython low-memory ports", version="0.1.1"
+)
+
+module("ucontextlib.py")
diff --git a/micropython/ucontextlib/metadata.txt b/micropython/ucontextlib/metadata.txt
deleted file mode 100644
index df76a1d76..000000000
--- a/micropython/ucontextlib/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
-license = Python
-long_desc = Minimal subset of contextlib for MicroPython low-memory ports
diff --git a/micropython/udnspkt/manifest.py b/micropython/udnspkt/manifest.py
new file mode 100644
index 000000000..382b8dd74
--- /dev/null
+++ b/micropython/udnspkt/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Make and parse DNS packets (Sans I/O approach).", version="0.1")
+
+# Originally written by Paul Sokolovsky.
+
+module("udnspkt.py")
diff --git a/micropython/udnspkt/metadata.txt b/micropython/udnspkt/metadata.txt
deleted file mode 100644
index b3d97e3cc..000000000
--- a/micropython/udnspkt/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
-author = Paul Sokolovsky
-desc = Make and parse DNS packets (Sans I/O approach).
diff --git a/micropython/umqtt.robust/manifest.py b/micropython/umqtt.robust/manifest.py
new file mode 100644
index 000000000..28f83d9e3
--- /dev/null
+++ b/micropython/umqtt.robust/manifest.py
@@ -0,0 +1,7 @@
+metadata(
+    description='Lightweight MQTT client for MicroPython ("robust" version).', version="1.0.1"
+)
+
+# Originally written by Paul Sokolovsky.
+
+package("umqtt")
diff --git a/micropython/umqtt.robust/metadata.txt b/micropython/umqtt.robust/metadata.txt
deleted file mode 100644
index aef748f76..000000000
--- a/micropython/umqtt.robust/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 1.0.1
-author = Paul Sokolovsky
-desc = Lightweight MQTT client for MicroPython ("robust" version).
-long_desc = README.rst
diff --git a/micropython/umqtt.simple/manifest.py b/micropython/umqtt.simple/manifest.py
new file mode 100644
index 000000000..19617a5ee
--- /dev/null
+++ b/micropython/umqtt.simple/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Lightweight MQTT client for MicroPython.", version="1.3.4")
+
+# Originally written by Paul Sokolovsky.
+
+package("umqtt")
diff --git a/micropython/umqtt.simple/metadata.txt b/micropython/umqtt.simple/metadata.txt
deleted file mode 100644
index c95ee6056..000000000
--- a/micropython/umqtt.simple/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 1.3.4
-author = Paul Sokolovsky
-desc = Lightweight MQTT client for MicroPython.
-long_desc = README.rst
diff --git a/micropython/upysh/manifest.py b/micropython/upysh/manifest.py
new file mode 100644
index 000000000..2d36a9ab4
--- /dev/null
+++ b/micropython/upysh/manifest.py
@@ -0,0 +1,3 @@
+metadata(description="Minimalistic file shell using native Python syntax.", version="0.6.1")
+
+module("upysh.py")
diff --git a/micropython/upysh/metadata.txt b/micropython/upysh/metadata.txt
deleted file mode 100644
index ff11de932..000000000
--- a/micropython/upysh/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.6.1
-desc = Minimalistic file shell using native Python syntax.
-long_desc = Minimalistic file shell using native Python syntax.
diff --git a/micropython/urllib.urequest/manifest.py b/micropython/urllib.urequest/manifest.py
new file mode 100644
index 000000000..cb4c1569c
--- /dev/null
+++ b/micropython/urllib.urequest/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.6")
+
+# Originally written by Paul Sokolovsky.
+
+package("urllib")
diff --git a/micropython/urllib.urequest/metadata.txt b/micropython/urllib.urequest/metadata.txt
deleted file mode 100644
index 9db40027d..000000000
--- a/micropython/urllib.urequest/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.6
-author = Paul Sokolovsky
diff --git a/micropython/utarfile/manifest.py b/micropython/utarfile/manifest.py
new file mode 100644
index 000000000..65bd68b9a
--- /dev/null
+++ b/micropython/utarfile/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Lightweight tarfile module subset", version="0.3.2")
+
+# Originally written by Paul Sokolovsky.
+
+module("utarfile.py")
diff --git a/micropython/utarfile/metadata.txt b/micropython/utarfile/metadata.txt
deleted file mode 100644
index 4dab5614f..000000000
--- a/micropython/utarfile/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3.2
-author = Paul Sokolovsky
-long_desc = Lightweight tarfile module subset
diff --git a/micropython/xmltok/manifest.py b/micropython/xmltok/manifest.py
new file mode 100644
index 000000000..efbe41cc4
--- /dev/null
+++ b/micropython/xmltok/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Simple XML tokenizer", version="0.2")
+
+# Originally written by Paul Sokolovsky.
+
+module("xmltok.py")
diff --git a/micropython/xmltok/metadata.txt b/micropython/xmltok/metadata.txt
deleted file mode 100644
index f25bb2480..000000000
--- a/micropython/xmltok/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.2
-author = Paul Sokolovsky
-long_desc = Simple XML tokenizer
diff --git a/python-ecosys/iperf3/manifest.py b/python-ecosys/iperf3/manifest.py
new file mode 100644
index 000000000..dafba2e12
--- /dev/null
+++ b/python-ecosys/iperf3/manifest.py
@@ -0,0 +1 @@
+module("iperf3.py")
diff --git a/python-ecosys/pyjwt/manifest.py b/python-ecosys/pyjwt/manifest.py
new file mode 100644
index 000000000..8e9b22c18
--- /dev/null
+++ b/python-ecosys/pyjwt/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.1")
+
+require("hmac")
+
+module("jwt.py")
diff --git a/python-ecosys/urequests/manifest.py b/python-ecosys/urequests/manifest.py
new file mode 100644
index 000000000..5fd2e8a28
--- /dev/null
+++ b/python-ecosys/urequests/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.7.0")
+
+module("urequests.py")
diff --git a/python-ecosys/urequests/metadata.txt b/python-ecosys/urequests/metadata.txt
deleted file mode 100644
index 04861d96f..000000000
--- a/python-ecosys/urequests/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.7.0
diff --git a/python-stdlib/__future__/manifest.py b/python-stdlib/__future__/manifest.py
new file mode 100644
index 000000000..4b4de03cb
--- /dev/null
+++ b/python-stdlib/__future__/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.3")
+
+module("__future__.py")
diff --git a/python-stdlib/__future__/metadata.txt b/python-stdlib/__future__/metadata.txt
deleted file mode 100644
index 560b85785..000000000
--- a/python-stdlib/__future__/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype=dummy
-type=module
-version=0.0.3
-dist_name=future
diff --git a/python-stdlib/_markupbase/manifest.py b/python-stdlib/_markupbase/manifest.py
new file mode 100644
index 000000000..470f8a457
--- /dev/null
+++ b/python-stdlib/_markupbase/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="3.3.3-1")
+
+require("re-pcre")
+
+module("_markupbase.py")
diff --git a/python-stdlib/_markupbase/metadata.txt b/python-stdlib/_markupbase/metadata.txt
deleted file mode 100644
index d1d9150e1..000000000
--- a/python-stdlib/_markupbase/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-1
-depends = re-pcre
diff --git a/python-stdlib/abc/manifest.py b/python-stdlib/abc/manifest.py
new file mode 100644
index 000000000..66495fd75
--- /dev/null
+++ b/python-stdlib/abc/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.1")
+
+module("abc.py")
diff --git a/python-stdlib/abc/metadata.txt b/python-stdlib/abc/metadata.txt
deleted file mode 100644
index abee00b44..000000000
--- a/python-stdlib/abc/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.0.1
diff --git a/python-stdlib/argparse/manifest.py b/python-stdlib/argparse/manifest.py
new file mode 100644
index 000000000..034d73c7d
--- /dev/null
+++ b/python-stdlib/argparse/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.4")
+
+# Originally written by Damien George.
+
+module("argparse.py")
diff --git a/python-stdlib/argparse/metadata.txt b/python-stdlib/argparse/metadata.txt
deleted file mode 100644
index a724aace1..000000000
--- a/python-stdlib/argparse/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.4
-author = Damien George
diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
new file mode 100644
index 000000000..4268481ae
--- /dev/null
+++ b/python-stdlib/base64/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="3.3.3-4")
+
+require("binascii")
+require("re-pcre")
+require("struct")
+
+module("base64.py")
diff --git a/python-stdlib/base64/metadata.txt b/python-stdlib/base64/metadata.txt
deleted file mode 100644
index f19558210..000000000
--- a/python-stdlib/base64/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype=cpython
-type=module
-version = 3.3.3-4
-depends = binascii, re-pcre, struct
diff --git a/python-stdlib/binascii/manifest.py b/python-stdlib/binascii/manifest.py
new file mode 100644
index 000000000..4a478f262
--- /dev/null
+++ b/python-stdlib/binascii/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="2.4.0-5")
+
+module("binascii.py")
diff --git a/python-stdlib/binascii/metadata.txt b/python-stdlib/binascii/metadata.txt
deleted file mode 100644
index 7baf07a27..000000000
--- a/python-stdlib/binascii/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 2.4.0-5
diff --git a/python-stdlib/cgi/manifest.py b/python-stdlib/cgi/manifest.py
new file mode 100644
index 000000000..b1db6ce30
--- /dev/null
+++ b/python-stdlib/cgi/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.3.3-2")
+
+module("cgi.py")
diff --git a/python-stdlib/cgi/metadata.txt b/python-stdlib/cgi/metadata.txt
deleted file mode 100644
index 75dcaed4d..000000000
--- a/python-stdlib/cgi/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=module
-version = 3.3.3-2
diff --git a/python-stdlib/cmd/manifest.py b/python-stdlib/cmd/manifest.py
new file mode 100644
index 000000000..572f97df6
--- /dev/null
+++ b/python-stdlib/cmd/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.0-2")
+
+module("cmd.py")
diff --git a/python-stdlib/cmd/metadata.txt b/python-stdlib/cmd/metadata.txt
deleted file mode 100644
index 8ec1fe5d7..000000000
--- a/python-stdlib/cmd/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.0-2
diff --git a/python-stdlib/collections.defaultdict/manifest.py b/python-stdlib/collections.defaultdict/manifest.py
new file mode 100644
index 000000000..bbce4be13
--- /dev/null
+++ b/python-stdlib/collections.defaultdict/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.3")
+
+# Originally written by Paul Sokolovsky.
+
+package("collections")
diff --git a/python-stdlib/collections.defaultdict/metadata.txt b/python-stdlib/collections.defaultdict/metadata.txt
deleted file mode 100644
index 0ae0cdcdb..000000000
--- a/python-stdlib/collections.defaultdict/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.3
-author = Paul Sokolovsky
diff --git a/python-stdlib/collections.deque/manifest.py b/python-stdlib/collections.deque/manifest.py
new file mode 100644
index 000000000..e4306faea
--- /dev/null
+++ b/python-stdlib/collections.deque/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.3")
+
+package("collections")
diff --git a/python-stdlib/collections.deque/metadata.txt b/python-stdlib/collections.deque/metadata.txt
deleted file mode 100644
index 820b24ddc..000000000
--- a/python-stdlib/collections.deque/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.3
diff --git a/python-stdlib/collections/manifest.py b/python-stdlib/collections/manifest.py
new file mode 100644
index 000000000..d5ef69472
--- /dev/null
+++ b/python-stdlib/collections/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.2")
+
+package("collections")
diff --git a/python-stdlib/collections/metadata.txt b/python-stdlib/collections/metadata.txt
deleted file mode 100644
index c50f2e450..000000000
--- a/python-stdlib/collections/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.2
diff --git a/python-stdlib/contextlib/manifest.py b/python-stdlib/contextlib/manifest.py
new file mode 100644
index 000000000..ab7ae5775
--- /dev/null
+++ b/python-stdlib/contextlib/manifest.py
@@ -0,0 +1,6 @@
+metadata(description="Port of contextlib for micropython", version="3.4.2-4")
+
+require("ucontextlib")
+require("collections")
+
+module("contextlib.py")
diff --git a/python-stdlib/contextlib/metadata.txt b/python-stdlib/contextlib/metadata.txt
deleted file mode 100644
index 3664c376c..000000000
--- a/python-stdlib/contextlib/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-4
-long_desc = Port of contextlib for micropython
-depends = ucontextlib, collections
diff --git a/python-stdlib/copy/manifest.py b/python-stdlib/copy/manifest.py
new file mode 100644
index 000000000..909ac2054
--- /dev/null
+++ b/python-stdlib/copy/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.3.3-2")
+
+module("copy.py")
diff --git a/python-stdlib/copy/metadata.txt b/python-stdlib/copy/metadata.txt
deleted file mode 100644
index cb5ffa327..000000000
--- a/python-stdlib/copy/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-2
diff --git a/python-stdlib/curses.ascii/manifest.py b/python-stdlib/curses.ascii/manifest.py
new file mode 100644
index 000000000..6a6518089
--- /dev/null
+++ b/python-stdlib/curses.ascii/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-1")
+
+package("curses")
diff --git a/python-stdlib/curses.ascii/metadata.txt b/python-stdlib/curses.ascii/metadata.txt
deleted file mode 100644
index 5ed1bbeff..000000000
--- a/python-stdlib/curses.ascii/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 3.4.2-1
diff --git a/python-stdlib/datetime/manifest.py b/python-stdlib/datetime/manifest.py
new file mode 100644
index 000000000..017189cec
--- /dev/null
+++ b/python-stdlib/datetime/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="4.0.0")
+
+# Originally written by Lorenzo Cappelletti.
+
+module("datetime.py")
diff --git a/python-stdlib/datetime/metadata.txt b/python-stdlib/datetime/metadata.txt
deleted file mode 100644
index ee879327b..000000000
--- a/python-stdlib/datetime/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 4.0.0
-author = Lorenzo Cappelletti
diff --git a/python-stdlib/email.charset/manifest.py b/python-stdlib/email.charset/manifest.py
new file mode 100644
index 000000000..208dd9a90
--- /dev/null
+++ b/python-stdlib/email.charset/manifest.py
@@ -0,0 +1,7 @@
+# email.charset
+
+require("functools")
+require("email.encoders")
+require("email.errors")
+
+package("email", version="0.5.1")
diff --git a/python-stdlib/email.charset/metadata.txt b/python-stdlib/email.charset/metadata.txt
deleted file mode 100644
index 138ad19dc..000000000
--- a/python-stdlib/email.charset/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = functools, email.encoders, email.errors
diff --git a/python-stdlib/email.encoders/manifest.py b/python-stdlib/email.encoders/manifest.py
new file mode 100644
index 000000000..f59bf11b4
--- /dev/null
+++ b/python-stdlib/email.encoders/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.5.1")
+
+require("base64")
+require("binascii")
+require("quopri")
+require("re-pcre")
+require("string")
+
+package("email")
diff --git a/python-stdlib/email.encoders/metadata.txt b/python-stdlib/email.encoders/metadata.txt
deleted file mode 100644
index 359304fc6..000000000
--- a/python-stdlib/email.encoders/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = base64, binascii, quopri, re-pcre, string
diff --git a/python-stdlib/email.errors/manifest.py b/python-stdlib/email.errors/manifest.py
new file mode 100644
index 000000000..6a2e0be77
--- /dev/null
+++ b/python-stdlib/email.errors/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5.1")
+
+package("email")
diff --git a/python-stdlib/email.errors/metadata.txt b/python-stdlib/email.errors/metadata.txt
deleted file mode 100644
index f07adb245..000000000
--- a/python-stdlib/email.errors/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
diff --git a/python-stdlib/email.feedparser/manifest.py b/python-stdlib/email.feedparser/manifest.py
new file mode 100644
index 000000000..bc0da6dc9
--- /dev/null
+++ b/python-stdlib/email.feedparser/manifest.py
@@ -0,0 +1,8 @@
+# email.feedparser
+
+require("re-pcre")
+require("email.errors")
+require("email.message")
+require("email.internal")
+
+package("email", version="0.5.1")
diff --git a/python-stdlib/email.feedparser/metadata.txt b/python-stdlib/email.feedparser/metadata.txt
deleted file mode 100644
index b6622ec97..000000000
--- a/python-stdlib/email.feedparser/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = re-pcre, email.errors, email.message, email.internal
diff --git a/python-stdlib/email.header/manifest.py b/python-stdlib/email.header/manifest.py
new file mode 100644
index 000000000..c901a52e7
--- /dev/null
+++ b/python-stdlib/email.header/manifest.py
@@ -0,0 +1,9 @@
+# email.header
+
+require("re-pcre")
+require("binascii")
+require("email.encoders")
+require("email.errors")
+require("email.charset")
+
+package("email", version="0.5.2")
diff --git a/python-stdlib/email.header/metadata.txt b/python-stdlib/email.header/metadata.txt
deleted file mode 100644
index adc8d7f2a..000000000
--- a/python-stdlib/email.header/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.2
-depends = re-pcre, binascii, email.encoders, email.errors, email.charset
diff --git a/python-stdlib/email.internal/manifest.py b/python-stdlib/email.internal/manifest.py
new file mode 100644
index 000000000..602d1ce30
--- /dev/null
+++ b/python-stdlib/email.internal/manifest.py
@@ -0,0 +1,15 @@
+# email.internal
+
+require("re-pcre")
+require("base64")
+require("binascii")
+require("functools")
+require("string")
+# require("calendar") TODO
+require("abc")
+require("email.errors")
+require("email.header")
+require("email.charset")
+require("email.utils")
+
+package("email", version="0.5.1")
diff --git a/python-stdlib/email.internal/metadata.txt b/python-stdlib/email.internal/metadata.txt
deleted file mode 100644
index af3090fd6..000000000
--- a/python-stdlib/email.internal/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = re-pcre, base64, binascii, functools, string, calendar, abc, email.errors, email.header, email.charset, email.utils
diff --git a/python-stdlib/email.message/manifest.py b/python-stdlib/email.message/manifest.py
new file mode 100644
index 000000000..1f1fa48aa
--- /dev/null
+++ b/python-stdlib/email.message/manifest.py
@@ -0,0 +1,11 @@
+# email.message
+
+require("re-pcre")
+require("uu")
+require("base64")
+require("binascii")
+require("email.utils")
+require("email.errors")
+require("email.charset")
+
+package("email", version="0.5.3")
diff --git a/python-stdlib/email.message/metadata.txt b/python-stdlib/email.message/metadata.txt
deleted file mode 100644
index feedfa9e8..000000000
--- a/python-stdlib/email.message/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.3
-depends = re-pcre, uu, base64, binascii, email.utils, email.errors, email.charset
diff --git a/python-stdlib/email.parser/manifest.py b/python-stdlib/email.parser/manifest.py
new file mode 100644
index 000000000..095e32245
--- /dev/null
+++ b/python-stdlib/email.parser/manifest.py
@@ -0,0 +1,8 @@
+# email.parser
+
+require("warnings")
+require("email.feedparser")
+require("email.message")
+require("email.internal")
+
+package("email", version="0.5.1")
diff --git a/python-stdlib/email.parser/metadata.txt b/python-stdlib/email.parser/metadata.txt
deleted file mode 100644
index 95316b938..000000000
--- a/python-stdlib/email.parser/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = warnings, email.feedparser, email.message, email.internal
diff --git a/python-stdlib/email.utils/manifest.py b/python-stdlib/email.utils/manifest.py
new file mode 100644
index 000000000..30770226e
--- /dev/null
+++ b/python-stdlib/email.utils/manifest.py
@@ -0,0 +1,13 @@
+metadata(version="3.3.3-2")
+
+require("os")
+require("re-pcre")
+require("base64")
+require("random")
+require("datetime")
+require("urllib.parse")
+require("warnings")
+require("quopri")
+require("email.charset")
+
+package("email")
diff --git a/python-stdlib/email.utils/metadata.txt b/python-stdlib/email.utils/metadata.txt
deleted file mode 100644
index 833c02a5b..000000000
--- a/python-stdlib/email.utils/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 3.3.3-2
-depends = os, re-pcre, base64, random, datetime, urllib.parse, warnings, quopri, email.charset
diff --git a/python-stdlib/errno/manifest.py b/python-stdlib/errno/manifest.py
new file mode 100644
index 000000000..a1e1e6c7c
--- /dev/null
+++ b/python-stdlib/errno/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.4")
+
+module("errno.py")
diff --git a/python-stdlib/errno/metadata.txt b/python-stdlib/errno/metadata.txt
deleted file mode 100644
index c8ecc0530..000000000
--- a/python-stdlib/errno/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.4
diff --git a/python-stdlib/fnmatch/manifest.py b/python-stdlib/fnmatch/manifest.py
new file mode 100644
index 000000000..8f19bb8f4
--- /dev/null
+++ b/python-stdlib/fnmatch/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.6.0")
+
+module("fnmatch.py")
diff --git a/python-stdlib/fnmatch/metadata.txt b/python-stdlib/fnmatch/metadata.txt
deleted file mode 100644
index 27b8c03f3..000000000
--- a/python-stdlib/fnmatch/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 0.6.0
diff --git a/python-stdlib/functools/manifest.py b/python-stdlib/functools/manifest.py
new file mode 100644
index 000000000..634413c1e
--- /dev/null
+++ b/python-stdlib/functools/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.7")
+
+module("functools.py")
diff --git a/python-stdlib/functools/metadata.txt b/python-stdlib/functools/metadata.txt
deleted file mode 100644
index 3b48c0322..000000000
--- a/python-stdlib/functools/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.0.7
diff --git a/python-stdlib/getopt/manifest.py b/python-stdlib/getopt/manifest.py
new file mode 100644
index 000000000..437f4068d
--- /dev/null
+++ b/python-stdlib/getopt/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="3.3.3-1")
+
+require("os")
+
+module("getopt.py")
diff --git a/python-stdlib/getopt/metadata.txt b/python-stdlib/getopt/metadata.txt
deleted file mode 100644
index 58db3c223..000000000
--- a/python-stdlib/getopt/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-1
-depends = os
diff --git a/python-stdlib/glob/manifest.py b/python-stdlib/glob/manifest.py
new file mode 100644
index 000000000..e4cb7ccca
--- /dev/null
+++ b/python-stdlib/glob/manifest.py
@@ -0,0 +1,7 @@
+# glob
+
+require("os")
+require("re-pcre")
+require("fnmatch")
+
+module("glob.py", version="0.5.2")
diff --git a/python-stdlib/glob/metadata.txt b/python-stdlib/glob/metadata.txt
deleted file mode 100644
index 870dfba17..000000000
--- a/python-stdlib/glob/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 0.5.2
-depends = os, re-pcre, fnmatch
diff --git a/python-stdlib/gzip/manifest.py b/python-stdlib/gzip/manifest.py
new file mode 100644
index 000000000..eab70e56b
--- /dev/null
+++ b/python-stdlib/gzip/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("gzip.py")
diff --git a/python-stdlib/gzip/metadata.txt b/python-stdlib/gzip/metadata.txt
deleted file mode 100644
index a9265f64a..000000000
--- a/python-stdlib/gzip/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.1.1
diff --git a/python-stdlib/hashlib/manifest.py b/python-stdlib/hashlib/manifest.py
new file mode 100644
index 000000000..106168bab
--- /dev/null
+++ b/python-stdlib/hashlib/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="2.4.0-4")
+
+package("hashlib")
diff --git a/python-stdlib/hashlib/metadata.txt b/python-stdlib/hashlib/metadata.txt
deleted file mode 100644
index 5cbf62353..000000000
--- a/python-stdlib/hashlib/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 2.4.0-4
diff --git a/python-stdlib/heapq/manifest.py b/python-stdlib/heapq/manifest.py
new file mode 100644
index 000000000..1d71a3180
--- /dev/null
+++ b/python-stdlib/heapq/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.9.3")
+
+module("heapq.py")
diff --git a/python-stdlib/heapq/metadata.txt b/python-stdlib/heapq/metadata.txt
deleted file mode 100644
index c521dd0a0..000000000
--- a/python-stdlib/heapq/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = cpython
-type = module
-version = 0.9.3
-# Module uses in *some* functions, but we don't want to depend on it
-#depends = itertools
diff --git a/python-stdlib/hmac/manifest.py b/python-stdlib/hmac/manifest.py
new file mode 100644
index 000000000..92b8b18e4
--- /dev/null
+++ b/python-stdlib/hmac/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-3")
+
+module("hmac.py")
diff --git a/python-stdlib/hmac/metadata.txt b/python-stdlib/hmac/metadata.txt
deleted file mode 100644
index ee8bd9f95..000000000
--- a/python-stdlib/hmac/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-3
diff --git a/python-stdlib/html.entities/manifest.py b/python-stdlib/html.entities/manifest.py
new file mode 100644
index 000000000..0a612905f
--- /dev/null
+++ b/python-stdlib/html.entities/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.3.3-1")
+
+package("html")
diff --git a/python-stdlib/html.entities/metadata.txt b/python-stdlib/html.entities/metadata.txt
deleted file mode 100644
index 580cce681..000000000
--- a/python-stdlib/html.entities/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=package
-version = 3.3.3-1
diff --git a/python-stdlib/html.parser/manifest.py b/python-stdlib/html.parser/manifest.py
new file mode 100644
index 000000000..44a41c31c
--- /dev/null
+++ b/python-stdlib/html.parser/manifest.py
@@ -0,0 +1,8 @@
+# html.parser
+
+require("_markupbase")
+require("warnings")
+require("html.entities")
+require("re-pcre")
+
+package("html", version="3.3.3-2")
diff --git a/python-stdlib/html.parser/metadata.txt b/python-stdlib/html.parser/metadata.txt
deleted file mode 100644
index 036766fa5..000000000
--- a/python-stdlib/html.parser/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 3.3.3-2
-depends = _markupbase, warnings, html.entities, re-pcre
diff --git a/python-stdlib/html/manifest.py b/python-stdlib/html/manifest.py
new file mode 100644
index 000000000..2f0dcec77
--- /dev/null
+++ b/python-stdlib/html/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="3.3.3-2")
+
+require("string")
+
+package("html")
diff --git a/python-stdlib/html/metadata.txt b/python-stdlib/html/metadata.txt
deleted file mode 100644
index 96505cda6..000000000
--- a/python-stdlib/html/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 3.3.3-2
-depends = string
diff --git a/python-stdlib/http.client/manifest.py b/python-stdlib/http.client/manifest.py
new file mode 100644
index 000000000..119d08f3d
--- /dev/null
+++ b/python-stdlib/http.client/manifest.py
@@ -0,0 +1,10 @@
+# http.client
+
+require("email.parser")
+require("email.message")
+require("socket")
+require("collections")
+require("urllib.parse")
+require("warnings")
+
+package("http", version="0.5.1")
diff --git a/python-stdlib/http.client/metadata.txt b/python-stdlib/http.client/metadata.txt
deleted file mode 100644
index 1b2fb96d9..000000000
--- a/python-stdlib/http.client/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = email.parser, email.message, socket, collections, urllib.parse, warnings
diff --git a/python-stdlib/inspect/manifest.py b/python-stdlib/inspect/manifest.py
new file mode 100644
index 000000000..a9d5a2381
--- /dev/null
+++ b/python-stdlib/inspect/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.2")
+
+module("inspect.py")
diff --git a/python-stdlib/inspect/metadata.txt b/python-stdlib/inspect/metadata.txt
deleted file mode 100644
index 2254c557a..000000000
--- a/python-stdlib/inspect/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.2
diff --git a/python-stdlib/io/manifest.py b/python-stdlib/io/manifest.py
new file mode 100644
index 000000000..ba1659ce0
--- /dev/null
+++ b/python-stdlib/io/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("io.py")
diff --git a/python-stdlib/io/metadata.txt b/python-stdlib/io/metadata.txt
deleted file mode 100644
index abe46bcfd..000000000
--- a/python-stdlib/io/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = dummy
-type = module
-version = 0.1
diff --git a/python-stdlib/itertools/manifest.py b/python-stdlib/itertools/manifest.py
new file mode 100644
index 000000000..80ebd5024
--- /dev/null
+++ b/python-stdlib/itertools/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.2.3")
+
+module("itertools.py")
diff --git a/python-stdlib/itertools/metadata.txt b/python-stdlib/itertools/metadata.txt
deleted file mode 100644
index d1c5847b5..000000000
--- a/python-stdlib/itertools/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.2.3
diff --git a/python-stdlib/locale/manifest.py b/python-stdlib/locale/manifest.py
new file mode 100644
index 000000000..9d56ae6a5
--- /dev/null
+++ b/python-stdlib/locale/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.2")
+
+module("locale.py")
diff --git a/python-stdlib/locale/metadata.txt b/python-stdlib/locale/metadata.txt
deleted file mode 100644
index fda992a9c..000000000
--- a/python-stdlib/locale/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.0.2
diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
new file mode 100644
index 000000000..176015096
--- /dev/null
+++ b/python-stdlib/logging/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.3")
+
+module("logging.py")
diff --git a/python-stdlib/logging/metadata.txt b/python-stdlib/logging/metadata.txt
deleted file mode 100644
index a1ff78f65..000000000
--- a/python-stdlib/logging/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3
diff --git a/python-stdlib/operator/manifest.py b/python-stdlib/operator/manifest.py
new file mode 100644
index 000000000..0d53e597d
--- /dev/null
+++ b/python-stdlib/operator/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("operator.py")
diff --git a/python-stdlib/operator/metadata.txt b/python-stdlib/operator/metadata.txt
deleted file mode 100644
index a90b2ef38..000000000
--- a/python-stdlib/operator/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
diff --git a/python-stdlib/os.path/manifest.py b/python-stdlib/os.path/manifest.py
new file mode 100644
index 000000000..920d522c2
--- /dev/null
+++ b/python-stdlib/os.path/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1.3")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+
+package("os")
diff --git a/python-stdlib/os.path/metadata.txt b/python-stdlib/os.path/metadata.txt
deleted file mode 100644
index fc0e6430e..000000000
--- a/python-stdlib/os.path/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.3
-author = Paul Sokolovsky
diff --git a/python-stdlib/os/manifest.py b/python-stdlib/os/manifest.py
new file mode 100644
index 000000000..7cdeee65a
--- /dev/null
+++ b/python-stdlib/os/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.6")
+
+# Originally written by Paul Sokolovsky.
+
+package("os")
diff --git a/python-stdlib/os/metadata.txt b/python-stdlib/os/metadata.txt
deleted file mode 100644
index 9db40027d..000000000
--- a/python-stdlib/os/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.6
-author = Paul Sokolovsky
diff --git a/python-stdlib/pickle/manifest.py b/python-stdlib/pickle/manifest.py
new file mode 100644
index 000000000..0f6fbf766
--- /dev/null
+++ b/python-stdlib/pickle/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("pickle.py")
diff --git a/python-stdlib/pickle/metadata.txt b/python-stdlib/pickle/metadata.txt
deleted file mode 100644
index 3fa13ba08..000000000
--- a/python-stdlib/pickle/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.1
diff --git a/python-stdlib/pkg_resources/manifest.py b/python-stdlib/pkg_resources/manifest.py
new file mode 100644
index 000000000..ba316c9c1
--- /dev/null
+++ b/python-stdlib/pkg_resources/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.2.1")
+
+module("pkg_resources.py")
diff --git a/python-stdlib/pkg_resources/metadata.txt b/python-stdlib/pkg_resources/metadata.txt
deleted file mode 100644
index 47384f3bb..000000000
--- a/python-stdlib/pkg_resources/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.2.1
diff --git a/python-stdlib/pkgutil/manifest.py b/python-stdlib/pkgutil/manifest.py
new file mode 100644
index 000000000..5e5f13b27
--- /dev/null
+++ b/python-stdlib/pkgutil/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.1.1")
+
+require("pkg_resources")
+
+module("pkgutil.py")
diff --git a/python-stdlib/pkgutil/metadata.txt b/python-stdlib/pkgutil/metadata.txt
deleted file mode 100644
index ab1816c83..000000000
--- a/python-stdlib/pkgutil/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
-depends = pkg_resources
diff --git a/python-stdlib/pprint/manifest.py b/python-stdlib/pprint/manifest.py
new file mode 100644
index 000000000..9c0ebe9ed
--- /dev/null
+++ b/python-stdlib/pprint/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.4")
+
+module("pprint.py")
diff --git a/python-stdlib/pprint/metadata.txt b/python-stdlib/pprint/metadata.txt
deleted file mode 100644
index 03253b0c1..000000000
--- a/python-stdlib/pprint/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.0.4
diff --git a/python-stdlib/pystone/manifest.py b/python-stdlib/pystone/manifest.py
new file mode 100644
index 000000000..2a25db815
--- /dev/null
+++ b/python-stdlib/pystone/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-2")
+
+module("pystone.py")
diff --git a/python-stdlib/pystone/metadata.txt b/python-stdlib/pystone/metadata.txt
deleted file mode 100644
index cca4b9d1d..000000000
--- a/python-stdlib/pystone/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-2
diff --git a/python-stdlib/pystone_lowmem/manifest.py b/python-stdlib/pystone_lowmem/manifest.py
new file mode 100644
index 000000000..c46ec68ef
--- /dev/null
+++ b/python-stdlib/pystone_lowmem/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-4")
+
+module("pystone_lowmem.py")
diff --git a/python-stdlib/pystone_lowmem/metadata.txt b/python-stdlib/pystone_lowmem/metadata.txt
deleted file mode 100644
index ddb4a3c4a..000000000
--- a/python-stdlib/pystone_lowmem/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-4
diff --git a/python-stdlib/quopri/manifest.py b/python-stdlib/quopri/manifest.py
new file mode 100644
index 000000000..b7336972f
--- /dev/null
+++ b/python-stdlib/quopri/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5.1")
+
+module("quopri.py")
diff --git a/python-stdlib/quopri/metadata.txt b/python-stdlib/quopri/metadata.txt
deleted file mode 100644
index 3b1a1930d..000000000
--- a/python-stdlib/quopri/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=module
-version = 0.5.1
diff --git a/python-stdlib/random/manifest.py b/python-stdlib/random/manifest.py
new file mode 100644
index 000000000..fcd10007d
--- /dev/null
+++ b/python-stdlib/random/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.2")
+
+module("random.py")
diff --git a/python-stdlib/random/metadata.txt b/python-stdlib/random/metadata.txt
deleted file mode 100644
index 8fbfc2b3f..000000000
--- a/python-stdlib/random/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.2
diff --git a/python-stdlib/shutil/manifest.py b/python-stdlib/shutil/manifest.py
new file mode 100644
index 000000000..385d50ad5
--- /dev/null
+++ b/python-stdlib/shutil/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.3")
+
+module("shutil.py")
diff --git a/python-stdlib/shutil/metadata.txt b/python-stdlib/shutil/metadata.txt
deleted file mode 100644
index 1a9822260..000000000
--- a/python-stdlib/shutil/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.0.3
diff --git a/python-stdlib/socket/manifest.py b/python-stdlib/socket/manifest.py
new file mode 100644
index 000000000..a0a384d37
--- /dev/null
+++ b/python-stdlib/socket/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.5.2")
+
+# Originally written by Paul Sokolovsky.
+
+module("socket.py")
diff --git a/python-stdlib/socket/metadata.txt b/python-stdlib/socket/metadata.txt
deleted file mode 100644
index e84d96ba4..000000000
--- a/python-stdlib/socket/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.5.2
-author = Paul Sokolovsky
diff --git a/python-stdlib/ssl/manifest.py b/python-stdlib/ssl/manifest.py
new file mode 100644
index 000000000..fb92cdf48
--- /dev/null
+++ b/python-stdlib/ssl/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("ssl.py")
diff --git a/python-stdlib/ssl/metadata.txt b/python-stdlib/ssl/metadata.txt
deleted file mode 100644
index abe46bcfd..000000000
--- a/python-stdlib/ssl/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = dummy
-type = module
-version = 0.1
diff --git a/python-stdlib/stat/manifest.py b/python-stdlib/stat/manifest.py
new file mode 100644
index 000000000..a4a0b811c
--- /dev/null
+++ b/python-stdlib/stat/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5.1")
+
+module("stat.py")
diff --git a/python-stdlib/stat/metadata.txt b/python-stdlib/stat/metadata.txt
deleted file mode 100644
index 3b1a1930d..000000000
--- a/python-stdlib/stat/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=module
-version = 0.5.1
diff --git a/python-stdlib/string/manifest.py b/python-stdlib/string/manifest.py
new file mode 100644
index 000000000..a6b552be2
--- /dev/null
+++ b/python-stdlib/string/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("string.py")
diff --git a/python-stdlib/string/metadata.txt b/python-stdlib/string/metadata.txt
deleted file mode 100644
index a9265f64a..000000000
--- a/python-stdlib/string/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.1.1
diff --git a/python-stdlib/struct/manifest.py b/python-stdlib/struct/manifest.py
new file mode 100644
index 000000000..4535d780e
--- /dev/null
+++ b/python-stdlib/struct/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("struct.py")
diff --git a/python-stdlib/struct/metadata.txt b/python-stdlib/struct/metadata.txt
deleted file mode 100644
index a90b2ef38..000000000
--- a/python-stdlib/struct/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
diff --git a/python-stdlib/test.pystone/manifest.py b/python-stdlib/test.pystone/manifest.py
new file mode 100644
index 000000000..a1bd59123
--- /dev/null
+++ b/python-stdlib/test.pystone/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="1.0.1")
+
+package("test")
diff --git a/python-stdlib/test.pystone/metadata.txt b/python-stdlib/test.pystone/metadata.txt
deleted file mode 100644
index e9979d399..000000000
--- a/python-stdlib/test.pystone/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 1.0.1
diff --git a/python-stdlib/textwrap/manifest.py b/python-stdlib/textwrap/manifest.py
new file mode 100644
index 000000000..d43a54bba
--- /dev/null
+++ b/python-stdlib/textwrap/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-1")
+
+module("textwrap.py")
diff --git a/python-stdlib/textwrap/metadata.txt b/python-stdlib/textwrap/metadata.txt
deleted file mode 100644
index fc82994ce..000000000
--- a/python-stdlib/textwrap/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-1
diff --git a/python-stdlib/threading/manifest.py b/python-stdlib/threading/manifest.py
new file mode 100644
index 000000000..4db21dd1d
--- /dev/null
+++ b/python-stdlib/threading/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("threading.py")
diff --git a/python-stdlib/threading/metadata.txt b/python-stdlib/threading/metadata.txt
deleted file mode 100644
index a9a85a5bf..000000000
--- a/python-stdlib/threading/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
diff --git a/python-stdlib/timeit/manifest.py b/python-stdlib/timeit/manifest.py
new file mode 100644
index 000000000..67ff15902
--- /dev/null
+++ b/python-stdlib/timeit/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="3.3.3-3")
+
+require("getopt")
+require("itertools")
+# require("linecache") TODO
+require("time")
+require("traceback")
+
+module("timeit.py")
diff --git a/python-stdlib/timeit/metadata.txt b/python-stdlib/timeit/metadata.txt
deleted file mode 100644
index 63b2f4c8f..000000000
--- a/python-stdlib/timeit/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-3
-depends = getopt, itertools, linecache, time, traceback
diff --git a/python-stdlib/traceback/manifest.py b/python-stdlib/traceback/manifest.py
new file mode 100644
index 000000000..65b3cdaa5
--- /dev/null
+++ b/python-stdlib/traceback/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.3")
+
+module("traceback.py")
diff --git a/python-stdlib/traceback/metadata.txt b/python-stdlib/traceback/metadata.txt
deleted file mode 100644
index 85829f3ed..000000000
--- a/python-stdlib/traceback/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.3
diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
new file mode 100644
index 000000000..85a5f4015
--- /dev/null
+++ b/python-stdlib/unittest/manifest.py
@@ -0,0 +1,6 @@
+metadata(version="0.9.0")
+
+require("argparse")
+require("fnmatch")
+
+module("unittest.py")
diff --git a/python-stdlib/unittest/metadata.txt b/python-stdlib/unittest/metadata.txt
deleted file mode 100644
index ba9a983fc..000000000
--- a/python-stdlib/unittest/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.9.0
-depends = argparse, fnmatch
diff --git a/python-stdlib/urllib.parse/manifest.py b/python-stdlib/urllib.parse/manifest.py
new file mode 100644
index 000000000..4731060d7
--- /dev/null
+++ b/python-stdlib/urllib.parse/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.5.2")
+
+require("re-pcre")
+require("collections")
+require("collections.defaultdict")
+
+package("urllib")
diff --git a/python-stdlib/urllib.parse/metadata.txt b/python-stdlib/urllib.parse/metadata.txt
deleted file mode 100644
index b28c56740..000000000
--- a/python-stdlib/urllib.parse/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.2
-depends = re-pcre, collections, collections.defaultdict
diff --git a/python-stdlib/uu/manifest.py b/python-stdlib/uu/manifest.py
new file mode 100644
index 000000000..daf50569d
--- /dev/null
+++ b/python-stdlib/uu/manifest.py
@@ -0,0 +1,6 @@
+metadata(version="0.5.1")
+
+require("binascii")
+require("os")
+
+module("uu.py")
diff --git a/python-stdlib/uu/metadata.txt b/python-stdlib/uu/metadata.txt
deleted file mode 100644
index 530965938..000000000
--- a/python-stdlib/uu/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 0.5.1
-depends = binascii, os
diff --git a/python-stdlib/warnings/manifest.py b/python-stdlib/warnings/manifest.py
new file mode 100644
index 000000000..ca41363aa
--- /dev/null
+++ b/python-stdlib/warnings/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("warnings.py")
diff --git a/python-stdlib/warnings/metadata.txt b/python-stdlib/warnings/metadata.txt
deleted file mode 100644
index a9265f64a..000000000
--- a/python-stdlib/warnings/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.1.1
diff --git a/unix-ffi/_libc/manifest.py b/unix-ffi/_libc/manifest.py
new file mode 100644
index 000000000..61bf421b6
--- /dev/null
+++ b/unix-ffi/_libc/manifest.py
@@ -0,0 +1,8 @@
+metadata(
+    description="MicroPython FFI helper module (deprecated, replaced by micropython-ffilib).",
+    version="0.3.1",
+)
+
+# Originally written by Paul Sokolovsky.
+
+module("_libc.py")
diff --git a/unix-ffi/_libc/metadata.txt b/unix-ffi/_libc/metadata.txt
deleted file mode 100644
index 96cf93151..000000000
--- a/unix-ffi/_libc/metadata.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-dist_name = libc
-srctype = micropython-lib
-type = module
-version = 0.3.1
-author = Paul Sokolovsky
-desc = MicroPython FFI helper module (deprecated)
-long_desc = MicroPython FFI helper module (deprecated, replaced by micropython-ffilib).
diff --git a/unix-ffi/email.charset/manifest.py b/unix-ffi/email.charset/manifest.py
new file mode 100644
index 000000000..31d70cece
--- /dev/null
+++ b/unix-ffi/email.charset/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.5.1")
+
+require("functools")
+require("email.encoders", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.feedparser/manifest.py b/unix-ffi/email.feedparser/manifest.py
new file mode 100644
index 000000000..4ea80e302
--- /dev/null
+++ b/unix-ffi/email.feedparser/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.5.1")
+
+require("re", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+require("email.message", unix_ffi=True)
+require("email.internal", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.header/manifest.py b/unix-ffi/email.header/manifest.py
new file mode 100644
index 000000000..65b017b50
--- /dev/null
+++ b/unix-ffi/email.header/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.5.2")
+
+require("re", unix_ffi=True)
+require("binascii")
+require("email.encoders", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+require("email.charset", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.internal/manifest.py b/unix-ffi/email.internal/manifest.py
new file mode 100644
index 000000000..4aff6d2c5
--- /dev/null
+++ b/unix-ffi/email.internal/manifest.py
@@ -0,0 +1,15 @@
+metadata(version="0.5.1")
+
+require("re", unix_ffi=True)
+require("base64")
+require("binascii")
+require("functools")
+require("string")
+# require("calendar") TODO
+require("abc")
+require("email.errors", unix_ffi=True)
+require("email.header", unix_ffi=True)
+require("email.charset", unix_ffi=True)
+require("email.utils", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.message/manifest.py b/unix-ffi/email.message/manifest.py
new file mode 100644
index 000000000..7b75ee7ac
--- /dev/null
+++ b/unix-ffi/email.message/manifest.py
@@ -0,0 +1,11 @@
+metadata(version="0.5.3")
+
+require("re", unix_ffi=True)
+require("uu")
+require("base64")
+require("binascii")
+require("email.utils", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+require("email.charset", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.parser/manifest.py b/unix-ffi/email.parser/manifest.py
new file mode 100644
index 000000000..ebe662111
--- /dev/null
+++ b/unix-ffi/email.parser/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.5.1")
+
+require("warnings")
+require("email.feedparser", unix_ffi=True)
+require("email.message", unix_ffi=True)
+require("email.internal", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/fcntl/manifest.py b/unix-ffi/fcntl/manifest.py
new file mode 100644
index 000000000..e572a58e8
--- /dev/null
+++ b/unix-ffi/fcntl/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.0.4")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("fcntl.py")
diff --git a/unix-ffi/fcntl/metadata.txt b/unix-ffi/fcntl/metadata.txt
deleted file mode 100644
index b031606ec..000000000
--- a/unix-ffi/fcntl/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.0.4
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/ffilib/manifest.py b/unix-ffi/ffilib/manifest.py
new file mode 100644
index 000000000..fe795a2ec
--- /dev/null
+++ b/unix-ffi/ffilib/manifest.py
@@ -0,0 +1,8 @@
+metadata(
+    description="MicroPython FFI helper module to easily interface with underlying shared libraries",
+    version="0.1.3",
+)
+
+# Originally written by Damien George.
+
+module("ffilib.py")
diff --git a/unix-ffi/ffilib/metadata.txt b/unix-ffi/ffilib/metadata.txt
deleted file mode 100644
index 3cb26e774..000000000
--- a/unix-ffi/ffilib/metadata.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-dist_name = ffilib
-srctype = micropython-lib
-type = module
-version = 0.1.3
-author = Damien George
-desc = MicroPython FFI helper module
-long_desc = MicroPython FFI helper module to easily interface with underlying shared libraries
diff --git a/unix-ffi/gettext/manifest.py b/unix-ffi/gettext/manifest.py
new file mode 100644
index 000000000..a2b520152
--- /dev/null
+++ b/unix-ffi/gettext/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1")
+
+# Originally written by Riccardo Magliocchetti.
+
+require("ffilib")
+
+module("gettext.py")
diff --git a/unix-ffi/gettext/metadata.txt b/unix-ffi/gettext/metadata.txt
deleted file mode 100644
index 55d84737f..000000000
--- a/unix-ffi/gettext/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
-author = Riccardo Magliocchetti
-depends = ffilib
diff --git a/unix-ffi/glob/manifest.py b/unix-ffi/glob/manifest.py
new file mode 100644
index 000000000..0d0a25d3d
--- /dev/null
+++ b/unix-ffi/glob/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.5.2")
+
+require("os", unix_ffi=True)
+require("os.path")
+require("re", unix_ffi=True)
+require("fnmatch")
+
+module("glob.py")
diff --git a/unix-ffi/html.parser/manifest.py b/unix-ffi/html.parser/manifest.py
new file mode 100644
index 000000000..9c82a7833
--- /dev/null
+++ b/unix-ffi/html.parser/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="3.3.3-2")
+
+require("_markupbase", unix_ffi=True)
+require("warnings")
+require("html.entities", unix_ffi=True)
+require("re", unix_ffi=True)
+
+package("html")
diff --git a/unix-ffi/http.client/manifest.py b/unix-ffi/http.client/manifest.py
new file mode 100644
index 000000000..be0c9ef36
--- /dev/null
+++ b/unix-ffi/http.client/manifest.py
@@ -0,0 +1,10 @@
+metadata(version="0.5.1")
+
+require("email.parser", unix_ffi=True)
+require("email.message", unix_ffi=True)
+require("socket", unix_ffi=True)
+require("collections")
+require("urllib.parse", unix_ffi=True)
+require("warnings")
+
+package("http")
diff --git a/unix-ffi/machine/manifest.py b/unix-ffi/machine/manifest.py
new file mode 100644
index 000000000..c0e40764d
--- /dev/null
+++ b/unix-ffi/machine/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.2.1")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+require("os")
+require("signal")
+
+package("machine")
diff --git a/unix-ffi/machine/metadata.txt b/unix-ffi/machine/metadata.txt
deleted file mode 100644
index 51a4d3b39..000000000
--- a/unix-ffi/machine/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.2.1
-author = Paul Sokolovsky
-depends = ffilib, os, signal
diff --git a/unix-ffi/multiprocessing/manifest.py b/unix-ffi/multiprocessing/manifest.py
new file mode 100644
index 000000000..d6b32411d
--- /dev/null
+++ b/unix-ffi/multiprocessing/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.1.2")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+require("select")
+require("pickle")
+
+module("multiprocessing.py")
diff --git a/unix-ffi/multiprocessing/metadata.txt b/unix-ffi/multiprocessing/metadata.txt
deleted file mode 100644
index d4d5f8d93..000000000
--- a/unix-ffi/multiprocessing/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.2
-author = Paul Sokolovsky
-depends = os, select, pickle
diff --git a/unix-ffi/os/manifest.py b/unix-ffi/os/manifest.py
new file mode 100644
index 000000000..496a9e44e
--- /dev/null
+++ b/unix-ffi/os/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.6")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+require("errno")
+require("stat")
+
+package("os")
diff --git a/unix-ffi/os/metadata.txt b/unix-ffi/os/metadata.txt
deleted file mode 100644
index 22a1ac65f..000000000
--- a/unix-ffi/os/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.6
-author = Paul Sokolovsky
-depends = ffilib, errno, stat
diff --git a/unix-ffi/pwd/manifest.py b/unix-ffi/pwd/manifest.py
new file mode 100644
index 000000000..26e289b46
--- /dev/null
+++ b/unix-ffi/pwd/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1")
+
+# Originally written by Riccardo Magliocchetti.
+
+require("ffilib")
+
+module("pwd.py")
diff --git a/unix-ffi/pwd/metadata.txt b/unix-ffi/pwd/metadata.txt
deleted file mode 100644
index 55d84737f..000000000
--- a/unix-ffi/pwd/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
-author = Riccardo Magliocchetti
-depends = ffilib
diff --git a/unix-ffi/re-pcre/manifest.py b/unix-ffi/re-pcre/manifest.py
new file mode 100644
index 000000000..ca027317d
--- /dev/null
+++ b/unix-ffi/re-pcre/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.2.5")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("re.py")
diff --git a/unix-ffi/re-pcre/metadata.txt b/unix-ffi/re-pcre/metadata.txt
deleted file mode 100644
index d129ed7d6..000000000
--- a/unix-ffi/re-pcre/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-name = re
-srctype = micropython-lib
-type = module
-version = 0.2.5
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/select/manifest.py b/unix-ffi/select/manifest.py
new file mode 100644
index 000000000..b76078cc8
--- /dev/null
+++ b/unix-ffi/select/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.3")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+require("ffilib")
+
+module("select.py")
diff --git a/unix-ffi/select/metadata.txt b/unix-ffi/select/metadata.txt
deleted file mode 100644
index c44f5dad4..000000000
--- a/unix-ffi/select/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3
-author = Paul Sokolovsky
-depends = os, ffilib
diff --git a/unix-ffi/signal/manifest.py b/unix-ffi/signal/manifest.py
new file mode 100644
index 000000000..cb23542cc
--- /dev/null
+++ b/unix-ffi/signal/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.3.2")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("signal.py")
diff --git a/unix-ffi/signal/metadata.txt b/unix-ffi/signal/metadata.txt
deleted file mode 100644
index ffc676c93..000000000
--- a/unix-ffi/signal/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3.2
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/sqlite3/manifest.py b/unix-ffi/sqlite3/manifest.py
new file mode 100644
index 000000000..63cdf4b9f
--- /dev/null
+++ b/unix-ffi/sqlite3/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.2.4")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("sqlite3.py")
diff --git a/unix-ffi/sqlite3/metadata.txt b/unix-ffi/sqlite3/metadata.txt
deleted file mode 100644
index 92eeb4c0e..000000000
--- a/unix-ffi/sqlite3/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.2.4
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/time/manifest.py b/unix-ffi/time/manifest.py
new file mode 100644
index 000000000..32004b152
--- /dev/null
+++ b/unix-ffi/time/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.5")
+
+require("ffilib")
+
+module("time.py")
diff --git a/unix-ffi/time/metadata.txt b/unix-ffi/time/metadata.txt
deleted file mode 100644
index f4700d3ce..000000000
--- a/unix-ffi/time/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.5
-depends = ffilib
diff --git a/unix-ffi/tty/manifest.py b/unix-ffi/tty/manifest.py
new file mode 100644
index 000000000..7c8a88cac
--- /dev/null
+++ b/unix-ffi/tty/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="1.0.1")
+
+module("tty.py")
diff --git a/unix-ffi/tty/metadata.txt b/unix-ffi/tty/metadata.txt
deleted file mode 100644
index cfad2f999..000000000
--- a/unix-ffi/tty/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 1.0.1
diff --git a/unix-ffi/ucurses/manifest.py b/unix-ffi/ucurses/manifest.py
new file mode 100644
index 000000000..8ec2675a5
--- /dev/null
+++ b/unix-ffi/ucurses/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.1.2")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+require("tty")
+require("select")
+
+package("ucurses")
diff --git a/unix-ffi/ucurses/metadata.txt b/unix-ffi/ucurses/metadata.txt
deleted file mode 100644
index c9f63dde5..000000000
--- a/unix-ffi/ucurses/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.2
-author = Paul Sokolovsky
-depends = os, tty, select

From f3cfc52ab076fc913dc6e266fb7370b418c8f542 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Aug 2022 00:38:03 +1000
Subject: [PATCH 065/343] unix-ffi: Move more unix-only packages to unix-ffi.

With the dependencies captured in manifest.py, several packages in
python-stdlib were still unix-only due to direct or transitive dependencies
on unix-only or ffi modules.  Or they just make no sense to run on
microcontroller targets.

In a few cases (e.g. base64) where possible, the unix dependency could be
removed.

Updates manifest.py to use the `unix_ffi=True` arg to `require()` for these
libraries.

Rename re-pcre to re now that unix-ffi is effectively its own namespace.

Update unix-ffi/README.md, and strengthen the wording that the unix
libraries are unmaintained.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/base64/base64.py                |  2 +-
 python-stdlib/base64/manifest.py              |  1 -
 python-stdlib/email.charset/manifest.py       |  7 -------
 python-stdlib/email.feedparser/manifest.py    |  8 --------
 python-stdlib/email.header/manifest.py        |  9 ---------
 python-stdlib/email.internal/manifest.py      | 15 ---------------
 python-stdlib/email.message/manifest.py       | 11 -----------
 python-stdlib/email.parser/manifest.py        |  8 --------
 python-stdlib/glob/manifest.py                |  7 -------
 python-stdlib/html.parser/manifest.py         |  8 --------
 python-stdlib/http.client/manifest.py         | 10 ----------
 python-stdlib/uu/manifest.py                  |  2 +-
 unix-ffi/README.md                            | 19 ++++++++++++++++---
 .../_markupbase/_markupbase.py                |  0
 .../_markupbase/manifest.py                   |  2 +-
 .../argparse/argparse.py                      |  0
 .../argparse/manifest.py                      |  0
 .../argparse/test_argparse.py                 |  0
 {python-stdlib => unix-ffi}/cgi/cgi.py        |  0
 {python-stdlib => unix-ffi}/cgi/manifest.py   |  0
 .../email.charset/email/charset.py            |  0
 .../email.encoders/email/base64mime.py        |  0
 .../email.encoders/email/encoders.py          |  0
 .../email.encoders/email/quoprimime.py        |  0
 .../email.encoders/manifest.py                |  2 +-
 .../email.errors/email/errors.py              |  0
 .../email.errors/manifest.py                  |  0
 .../email.feedparser/email/feedparser.py      |  0
 .../email.header/email/header.py              |  0
 .../email.internal/email/_encoded_words.py    |  0
 .../email.internal/email/_parseaddr.py        |  0
 .../email.internal/email/_policybase.py       |  0
 .../email.message/email/iterators.py          |  0
 .../email.message/email/message.py            |  0
 .../email.parser/email/parser.py              |  0
 .../email.utils/email/utils.py                |  5 ++++-
 .../email.utils/manifest.py                   |  8 ++++----
 unix-ffi/fcntl/manifest.py                    |  2 +-
 {python-stdlib => unix-ffi}/getopt/getopt.py  |  0
 .../getopt/manifest.py                        |  2 +-
 unix-ffi/gettext/manifest.py                  |  2 +-
 {python-stdlib => unix-ffi}/glob/glob.py      |  0
 {python-stdlib => unix-ffi}/glob/test_glob.py |  0
 .../html.entities/html/entities.py            |  0
 .../html.entities/manifest.py                 |  0
 .../html.parser/html/parser.py                |  0
 .../http.client/example_client.py             |  0
 .../http.client/http/client.py                |  0
 unix-ffi/machine/manifest.py                  |  6 +++---
 unix-ffi/multiprocessing/manifest.py          |  4 ++--
 unix-ffi/os/manifest.py                       |  2 +-
 unix-ffi/pwd/manifest.py                      |  2 +-
 unix-ffi/{re-pcre => re}/manifest.py          |  2 +-
 unix-ffi/{re-pcre => re}/re.py                |  0
 unix-ffi/{re-pcre => re}/test_re.py           |  0
 unix-ffi/select/manifest.py                   |  4 ++--
 unix-ffi/signal/manifest.py                   |  2 +-
 .../socket/manifest.py                        |  0
 {python-stdlib => unix-ffi}/socket/socket.py  |  0
 unix-ffi/sqlite3/manifest.py                  |  2 +-
 .../test.support/manifest.py                  |  0
 .../test.support/test/support.py              |  0
 unix-ffi/time/manifest.py                     |  2 +-
 .../timeit/manifest.py                        |  4 ++--
 {python-stdlib => unix-ffi}/timeit/timeit.py  |  0
 unix-ffi/ucurses/manifest.py                  |  6 +++---
 .../unittest/manifest.py                      |  2 +-
 .../unittest/test_unittest.py                 |  0
 .../unittest/test_unittest_isolated.py        |  0
 .../unittest/unittest.py                      |  0
 .../unittest/unittest_discover.py             |  0
 .../urllib.parse/manifest.py                  |  2 +-
 .../urllib.parse/test_urlparse.py             |  0
 .../urllib.parse/urllib/parse.py              |  0
 74 files changed, 51 insertions(+), 119 deletions(-)
 delete mode 100644 python-stdlib/email.charset/manifest.py
 delete mode 100644 python-stdlib/email.feedparser/manifest.py
 delete mode 100644 python-stdlib/email.header/manifest.py
 delete mode 100644 python-stdlib/email.internal/manifest.py
 delete mode 100644 python-stdlib/email.message/manifest.py
 delete mode 100644 python-stdlib/email.parser/manifest.py
 delete mode 100644 python-stdlib/glob/manifest.py
 delete mode 100644 python-stdlib/html.parser/manifest.py
 delete mode 100644 python-stdlib/http.client/manifest.py
 rename {python-stdlib => unix-ffi}/_markupbase/_markupbase.py (100%)
 rename {python-stdlib => unix-ffi}/_markupbase/manifest.py (65%)
 rename {python-stdlib => unix-ffi}/argparse/argparse.py (100%)
 rename {python-stdlib => unix-ffi}/argparse/manifest.py (100%)
 rename {python-stdlib => unix-ffi}/argparse/test_argparse.py (100%)
 rename {python-stdlib => unix-ffi}/cgi/cgi.py (100%)
 rename {python-stdlib => unix-ffi}/cgi/manifest.py (100%)
 rename {python-stdlib => unix-ffi}/email.charset/email/charset.py (100%)
 rename {python-stdlib => unix-ffi}/email.encoders/email/base64mime.py (100%)
 rename {python-stdlib => unix-ffi}/email.encoders/email/encoders.py (100%)
 rename {python-stdlib => unix-ffi}/email.encoders/email/quoprimime.py (100%)
 rename {python-stdlib => unix-ffi}/email.encoders/manifest.py (80%)
 rename {python-stdlib => unix-ffi}/email.errors/email/errors.py (100%)
 rename {python-stdlib => unix-ffi}/email.errors/manifest.py (100%)
 rename {python-stdlib => unix-ffi}/email.feedparser/email/feedparser.py (100%)
 rename {python-stdlib => unix-ffi}/email.header/email/header.py (100%)
 rename {python-stdlib => unix-ffi}/email.internal/email/_encoded_words.py (100%)
 rename {python-stdlib => unix-ffi}/email.internal/email/_parseaddr.py (100%)
 rename {python-stdlib => unix-ffi}/email.internal/email/_policybase.py (100%)
 rename {python-stdlib => unix-ffi}/email.message/email/iterators.py (100%)
 rename {python-stdlib => unix-ffi}/email.message/email/message.py (100%)
 rename {python-stdlib => unix-ffi}/email.parser/email/parser.py (100%)
 rename {python-stdlib => unix-ffi}/email.utils/email/utils.py (99%)
 rename {python-stdlib => unix-ffi}/email.utils/manifest.py (50%)
 rename {python-stdlib => unix-ffi}/getopt/getopt.py (100%)
 rename {python-stdlib => unix-ffi}/getopt/manifest.py (63%)
 rename {python-stdlib => unix-ffi}/glob/glob.py (100%)
 rename {python-stdlib => unix-ffi}/glob/test_glob.py (100%)
 rename {python-stdlib => unix-ffi}/html.entities/html/entities.py (100%)
 rename {python-stdlib => unix-ffi}/html.entities/manifest.py (100%)
 rename {python-stdlib => unix-ffi}/html.parser/html/parser.py (100%)
 rename {python-stdlib => unix-ffi}/http.client/example_client.py (100%)
 rename {python-stdlib => unix-ffi}/http.client/http/client.py (100%)
 rename unix-ffi/{re-pcre => re}/manifest.py (72%)
 rename unix-ffi/{re-pcre => re}/re.py (100%)
 rename unix-ffi/{re-pcre => re}/test_re.py (100%)
 rename {python-stdlib => unix-ffi}/socket/manifest.py (100%)
 rename {python-stdlib => unix-ffi}/socket/socket.py (100%)
 rename {micropython => unix-ffi}/test.support/manifest.py (100%)
 rename {micropython => unix-ffi}/test.support/test/support.py (100%)
 rename {python-stdlib => unix-ffi}/timeit/manifest.py (65%)
 rename {python-stdlib => unix-ffi}/timeit/timeit.py (100%)
 rename {python-stdlib => unix-ffi}/unittest/manifest.py (66%)
 rename {python-stdlib => unix-ffi}/unittest/test_unittest.py (100%)
 rename {python-stdlib => unix-ffi}/unittest/test_unittest_isolated.py (100%)
 rename {python-stdlib => unix-ffi}/unittest/unittest.py (100%)
 rename {python-stdlib => unix-ffi}/unittest/unittest_discover.py (100%)
 rename {python-stdlib => unix-ffi}/urllib.parse/manifest.py (78%)
 rename {python-stdlib => unix-ffi}/urllib.parse/test_urlparse.py (100%)
 rename {python-stdlib => unix-ffi}/urllib.parse/urllib/parse.py (100%)

diff --git a/python-stdlib/base64/base64.py b/python-stdlib/base64/base64.py
index 866bf9c91..daa39728b 100644
--- a/python-stdlib/base64/base64.py
+++ b/python-stdlib/base64/base64.py
@@ -96,7 +96,7 @@ def b64decode(s, altchars=None, validate=False):
         altchars = _bytes_from_decode_data(altchars)
         assert len(altchars) == 2, repr(altchars)
         s = s.translate(bytes.maketrans(altchars, b"+/"))
-    if validate and not re.match(b"^[A-Za-z0-9+/]*={0,2}$", s):
+    if validate and not re.match(b"^[A-Za-z0-9+/]*=*$", s):
         raise binascii.Error("Non-base64 digit found")
     return binascii.a2b_base64(s)
 
diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
index 4268481ae..59d39f78b 100644
--- a/python-stdlib/base64/manifest.py
+++ b/python-stdlib/base64/manifest.py
@@ -1,7 +1,6 @@
 metadata(version="3.3.3-4")
 
 require("binascii")
-require("re-pcre")
 require("struct")
 
 module("base64.py")
diff --git a/python-stdlib/email.charset/manifest.py b/python-stdlib/email.charset/manifest.py
deleted file mode 100644
index 208dd9a90..000000000
--- a/python-stdlib/email.charset/manifest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# email.charset
-
-require("functools")
-require("email.encoders")
-require("email.errors")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/email.feedparser/manifest.py b/python-stdlib/email.feedparser/manifest.py
deleted file mode 100644
index bc0da6dc9..000000000
--- a/python-stdlib/email.feedparser/manifest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# email.feedparser
-
-require("re-pcre")
-require("email.errors")
-require("email.message")
-require("email.internal")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/email.header/manifest.py b/python-stdlib/email.header/manifest.py
deleted file mode 100644
index c901a52e7..000000000
--- a/python-stdlib/email.header/manifest.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# email.header
-
-require("re-pcre")
-require("binascii")
-require("email.encoders")
-require("email.errors")
-require("email.charset")
-
-package("email", version="0.5.2")
diff --git a/python-stdlib/email.internal/manifest.py b/python-stdlib/email.internal/manifest.py
deleted file mode 100644
index 602d1ce30..000000000
--- a/python-stdlib/email.internal/manifest.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# email.internal
-
-require("re-pcre")
-require("base64")
-require("binascii")
-require("functools")
-require("string")
-# require("calendar") TODO
-require("abc")
-require("email.errors")
-require("email.header")
-require("email.charset")
-require("email.utils")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/email.message/manifest.py b/python-stdlib/email.message/manifest.py
deleted file mode 100644
index 1f1fa48aa..000000000
--- a/python-stdlib/email.message/manifest.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# email.message
-
-require("re-pcre")
-require("uu")
-require("base64")
-require("binascii")
-require("email.utils")
-require("email.errors")
-require("email.charset")
-
-package("email", version="0.5.3")
diff --git a/python-stdlib/email.parser/manifest.py b/python-stdlib/email.parser/manifest.py
deleted file mode 100644
index 095e32245..000000000
--- a/python-stdlib/email.parser/manifest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# email.parser
-
-require("warnings")
-require("email.feedparser")
-require("email.message")
-require("email.internal")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/glob/manifest.py b/python-stdlib/glob/manifest.py
deleted file mode 100644
index e4cb7ccca..000000000
--- a/python-stdlib/glob/manifest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# glob
-
-require("os")
-require("re-pcre")
-require("fnmatch")
-
-module("glob.py", version="0.5.2")
diff --git a/python-stdlib/html.parser/manifest.py b/python-stdlib/html.parser/manifest.py
deleted file mode 100644
index 44a41c31c..000000000
--- a/python-stdlib/html.parser/manifest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# html.parser
-
-require("_markupbase")
-require("warnings")
-require("html.entities")
-require("re-pcre")
-
-package("html", version="3.3.3-2")
diff --git a/python-stdlib/http.client/manifest.py b/python-stdlib/http.client/manifest.py
deleted file mode 100644
index 119d08f3d..000000000
--- a/python-stdlib/http.client/manifest.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# http.client
-
-require("email.parser")
-require("email.message")
-require("socket")
-require("collections")
-require("urllib.parse")
-require("warnings")
-
-package("http", version="0.5.1")
diff --git a/python-stdlib/uu/manifest.py b/python-stdlib/uu/manifest.py
index daf50569d..ae90f8882 100644
--- a/python-stdlib/uu/manifest.py
+++ b/python-stdlib/uu/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.5.1")
 
 require("binascii")
-require("os")
+require("os.path")
 
 module("uu.py")
diff --git a/unix-ffi/README.md b/unix-ffi/README.md
index ae58362c8..d821dda4f 100644
--- a/unix-ffi/README.md
+++ b/unix-ffi/README.md
@@ -1,9 +1,11 @@
 Unix-specific libraries
 =======================
 
-These are libraries that will only run on the Unix port of MicroPython. There is some limited support for the Windows port too.
+These are libraries that will only run on the Unix port of MicroPython, or are
+too big to be used on microcontrollers. There is some limited support for the
+Windows port too.
 
-**Note:** This directory is largely unmaintained, although large breaking changes are not expected.
+**Note:** This directory is unmaintained.
 
 Background
 ----------
@@ -11,7 +13,18 @@ Background
 The libraries in this directory provide additional CPython compatibility using
 the host operating system's native libraries.
 
-This is implemented either by accessing the libraries directly via libffi, or by using built-in modules that are only available on the Unix port.
+This is implemented either by accessing the libraries directly via libffi, or
+by using built-in modules that are only available on the Unix port.
 
 In theory, this allows you to use MicroPython as a more complete drop-in
 replacement for CPython.
+
+Usage
+-----
+
+To use a unix-specific library, pass `unix_ffi=True` to `require()` in your
+manifest file.
+
+```py
+require("os", unix_ffi=True) # Use the unix-ffi version instead of python-stdlib.
+```
diff --git a/python-stdlib/_markupbase/_markupbase.py b/unix-ffi/_markupbase/_markupbase.py
similarity index 100%
rename from python-stdlib/_markupbase/_markupbase.py
rename to unix-ffi/_markupbase/_markupbase.py
diff --git a/python-stdlib/_markupbase/manifest.py b/unix-ffi/_markupbase/manifest.py
similarity index 65%
rename from python-stdlib/_markupbase/manifest.py
rename to unix-ffi/_markupbase/manifest.py
index 470f8a457..983b57995 100644
--- a/python-stdlib/_markupbase/manifest.py
+++ b/unix-ffi/_markupbase/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="3.3.3-1")
 
-require("re-pcre")
+require("re", unix_ffi=True)
 
 module("_markupbase.py")
diff --git a/python-stdlib/argparse/argparse.py b/unix-ffi/argparse/argparse.py
similarity index 100%
rename from python-stdlib/argparse/argparse.py
rename to unix-ffi/argparse/argparse.py
diff --git a/python-stdlib/argparse/manifest.py b/unix-ffi/argparse/manifest.py
similarity index 100%
rename from python-stdlib/argparse/manifest.py
rename to unix-ffi/argparse/manifest.py
diff --git a/python-stdlib/argparse/test_argparse.py b/unix-ffi/argparse/test_argparse.py
similarity index 100%
rename from python-stdlib/argparse/test_argparse.py
rename to unix-ffi/argparse/test_argparse.py
diff --git a/python-stdlib/cgi/cgi.py b/unix-ffi/cgi/cgi.py
similarity index 100%
rename from python-stdlib/cgi/cgi.py
rename to unix-ffi/cgi/cgi.py
diff --git a/python-stdlib/cgi/manifest.py b/unix-ffi/cgi/manifest.py
similarity index 100%
rename from python-stdlib/cgi/manifest.py
rename to unix-ffi/cgi/manifest.py
diff --git a/python-stdlib/email.charset/email/charset.py b/unix-ffi/email.charset/email/charset.py
similarity index 100%
rename from python-stdlib/email.charset/email/charset.py
rename to unix-ffi/email.charset/email/charset.py
diff --git a/python-stdlib/email.encoders/email/base64mime.py b/unix-ffi/email.encoders/email/base64mime.py
similarity index 100%
rename from python-stdlib/email.encoders/email/base64mime.py
rename to unix-ffi/email.encoders/email/base64mime.py
diff --git a/python-stdlib/email.encoders/email/encoders.py b/unix-ffi/email.encoders/email/encoders.py
similarity index 100%
rename from python-stdlib/email.encoders/email/encoders.py
rename to unix-ffi/email.encoders/email/encoders.py
diff --git a/python-stdlib/email.encoders/email/quoprimime.py b/unix-ffi/email.encoders/email/quoprimime.py
similarity index 100%
rename from python-stdlib/email.encoders/email/quoprimime.py
rename to unix-ffi/email.encoders/email/quoprimime.py
diff --git a/python-stdlib/email.encoders/manifest.py b/unix-ffi/email.encoders/manifest.py
similarity index 80%
rename from python-stdlib/email.encoders/manifest.py
rename to unix-ffi/email.encoders/manifest.py
index f59bf11b4..e1e2090c9 100644
--- a/python-stdlib/email.encoders/manifest.py
+++ b/unix-ffi/email.encoders/manifest.py
@@ -3,7 +3,7 @@
 require("base64")
 require("binascii")
 require("quopri")
-require("re-pcre")
+require("re", unix_ffi=True)
 require("string")
 
 package("email")
diff --git a/python-stdlib/email.errors/email/errors.py b/unix-ffi/email.errors/email/errors.py
similarity index 100%
rename from python-stdlib/email.errors/email/errors.py
rename to unix-ffi/email.errors/email/errors.py
diff --git a/python-stdlib/email.errors/manifest.py b/unix-ffi/email.errors/manifest.py
similarity index 100%
rename from python-stdlib/email.errors/manifest.py
rename to unix-ffi/email.errors/manifest.py
diff --git a/python-stdlib/email.feedparser/email/feedparser.py b/unix-ffi/email.feedparser/email/feedparser.py
similarity index 100%
rename from python-stdlib/email.feedparser/email/feedparser.py
rename to unix-ffi/email.feedparser/email/feedparser.py
diff --git a/python-stdlib/email.header/email/header.py b/unix-ffi/email.header/email/header.py
similarity index 100%
rename from python-stdlib/email.header/email/header.py
rename to unix-ffi/email.header/email/header.py
diff --git a/python-stdlib/email.internal/email/_encoded_words.py b/unix-ffi/email.internal/email/_encoded_words.py
similarity index 100%
rename from python-stdlib/email.internal/email/_encoded_words.py
rename to unix-ffi/email.internal/email/_encoded_words.py
diff --git a/python-stdlib/email.internal/email/_parseaddr.py b/unix-ffi/email.internal/email/_parseaddr.py
similarity index 100%
rename from python-stdlib/email.internal/email/_parseaddr.py
rename to unix-ffi/email.internal/email/_parseaddr.py
diff --git a/python-stdlib/email.internal/email/_policybase.py b/unix-ffi/email.internal/email/_policybase.py
similarity index 100%
rename from python-stdlib/email.internal/email/_policybase.py
rename to unix-ffi/email.internal/email/_policybase.py
diff --git a/python-stdlib/email.message/email/iterators.py b/unix-ffi/email.message/email/iterators.py
similarity index 100%
rename from python-stdlib/email.message/email/iterators.py
rename to unix-ffi/email.message/email/iterators.py
diff --git a/python-stdlib/email.message/email/message.py b/unix-ffi/email.message/email/message.py
similarity index 100%
rename from python-stdlib/email.message/email/message.py
rename to unix-ffi/email.message/email/message.py
diff --git a/python-stdlib/email.parser/email/parser.py b/unix-ffi/email.parser/email/parser.py
similarity index 100%
rename from python-stdlib/email.parser/email/parser.py
rename to unix-ffi/email.parser/email/parser.py
diff --git a/python-stdlib/email.utils/email/utils.py b/unix-ffi/email.utils/email/utils.py
similarity index 99%
rename from python-stdlib/email.utils/email/utils.py
rename to unix-ffi/email.utils/email/utils.py
index 0fe32ceea..e0ebdd342 100644
--- a/python-stdlib/email.utils/email/utils.py
+++ b/unix-ffi/email.utils/email/utils.py
@@ -215,7 +215,10 @@ def make_msgid(idstring=None, domain=None):
     """
     timeval = time.time()
     utcdate = time.strftime("%Y%m%d%H%M%S", time.gmtime(timeval))
-    pid = os.getpid()
+    if hasattr(os, "getpid"):
+        pid = os.getpid()
+    else:
+        pid = 0
     randint = random.randrange(100000)
     if idstring is None:
         idstring = ""
diff --git a/python-stdlib/email.utils/manifest.py b/unix-ffi/email.utils/manifest.py
similarity index 50%
rename from python-stdlib/email.utils/manifest.py
rename to unix-ffi/email.utils/manifest.py
index 30770226e..be6e33183 100644
--- a/python-stdlib/email.utils/manifest.py
+++ b/unix-ffi/email.utils/manifest.py
@@ -1,13 +1,13 @@
 metadata(version="3.3.3-2")
 
-require("os")
-require("re-pcre")
+require("os", unix_ffi=True)
+require("re", unix_ffi=True)
 require("base64")
 require("random")
 require("datetime")
-require("urllib.parse")
+require("urllib.parse", unix_ffi=True)
 require("warnings")
 require("quopri")
-require("email.charset")
+require("email.charset", unix_ffi=True)
 
 package("email")
diff --git a/unix-ffi/fcntl/manifest.py b/unix-ffi/fcntl/manifest.py
index e572a58e8..a0e9d9592 100644
--- a/unix-ffi/fcntl/manifest.py
+++ b/unix-ffi/fcntl/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("fcntl.py")
diff --git a/python-stdlib/getopt/getopt.py b/unix-ffi/getopt/getopt.py
similarity index 100%
rename from python-stdlib/getopt/getopt.py
rename to unix-ffi/getopt/getopt.py
diff --git a/python-stdlib/getopt/manifest.py b/unix-ffi/getopt/manifest.py
similarity index 63%
rename from python-stdlib/getopt/manifest.py
rename to unix-ffi/getopt/manifest.py
index 437f4068d..2038e7504 100644
--- a/python-stdlib/getopt/manifest.py
+++ b/unix-ffi/getopt/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="3.3.3-1")
 
-require("os")
+require("os", unix_ffi=True)
 
 module("getopt.py")
diff --git a/unix-ffi/gettext/manifest.py b/unix-ffi/gettext/manifest.py
index a2b520152..527330e92 100644
--- a/unix-ffi/gettext/manifest.py
+++ b/unix-ffi/gettext/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Riccardo Magliocchetti.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("gettext.py")
diff --git a/python-stdlib/glob/glob.py b/unix-ffi/glob/glob.py
similarity index 100%
rename from python-stdlib/glob/glob.py
rename to unix-ffi/glob/glob.py
diff --git a/python-stdlib/glob/test_glob.py b/unix-ffi/glob/test_glob.py
similarity index 100%
rename from python-stdlib/glob/test_glob.py
rename to unix-ffi/glob/test_glob.py
diff --git a/python-stdlib/html.entities/html/entities.py b/unix-ffi/html.entities/html/entities.py
similarity index 100%
rename from python-stdlib/html.entities/html/entities.py
rename to unix-ffi/html.entities/html/entities.py
diff --git a/python-stdlib/html.entities/manifest.py b/unix-ffi/html.entities/manifest.py
similarity index 100%
rename from python-stdlib/html.entities/manifest.py
rename to unix-ffi/html.entities/manifest.py
diff --git a/python-stdlib/html.parser/html/parser.py b/unix-ffi/html.parser/html/parser.py
similarity index 100%
rename from python-stdlib/html.parser/html/parser.py
rename to unix-ffi/html.parser/html/parser.py
diff --git a/python-stdlib/http.client/example_client.py b/unix-ffi/http.client/example_client.py
similarity index 100%
rename from python-stdlib/http.client/example_client.py
rename to unix-ffi/http.client/example_client.py
diff --git a/python-stdlib/http.client/http/client.py b/unix-ffi/http.client/http/client.py
similarity index 100%
rename from python-stdlib/http.client/http/client.py
rename to unix-ffi/http.client/http/client.py
diff --git a/unix-ffi/machine/manifest.py b/unix-ffi/machine/manifest.py
index c0e40764d..9c1f34775 100644
--- a/unix-ffi/machine/manifest.py
+++ b/unix-ffi/machine/manifest.py
@@ -2,8 +2,8 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
-require("os")
-require("signal")
+require("ffilib", unix_ffi=True)
+require("os", unix_ffi=True)
+require("signal", unix_ffi=True)
 
 package("machine")
diff --git a/unix-ffi/multiprocessing/manifest.py b/unix-ffi/multiprocessing/manifest.py
index d6b32411d..68f2bca08 100644
--- a/unix-ffi/multiprocessing/manifest.py
+++ b/unix-ffi/multiprocessing/manifest.py
@@ -2,8 +2,8 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("os")
-require("select")
+require("os", unix_ffi=True)
+require("select", unix_ffi=True)
 require("pickle")
 
 module("multiprocessing.py")
diff --git a/unix-ffi/os/manifest.py b/unix-ffi/os/manifest.py
index 496a9e44e..38cb87d5a 100644
--- a/unix-ffi/os/manifest.py
+++ b/unix-ffi/os/manifest.py
@@ -2,7 +2,7 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 require("errno")
 require("stat")
 
diff --git a/unix-ffi/pwd/manifest.py b/unix-ffi/pwd/manifest.py
index 26e289b46..7db3213f5 100644
--- a/unix-ffi/pwd/manifest.py
+++ b/unix-ffi/pwd/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Riccardo Magliocchetti.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("pwd.py")
diff --git a/unix-ffi/re-pcre/manifest.py b/unix-ffi/re/manifest.py
similarity index 72%
rename from unix-ffi/re-pcre/manifest.py
rename to unix-ffi/re/manifest.py
index ca027317d..cc52df47a 100644
--- a/unix-ffi/re-pcre/manifest.py
+++ b/unix-ffi/re/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("re.py")
diff --git a/unix-ffi/re-pcre/re.py b/unix-ffi/re/re.py
similarity index 100%
rename from unix-ffi/re-pcre/re.py
rename to unix-ffi/re/re.py
diff --git a/unix-ffi/re-pcre/test_re.py b/unix-ffi/re/test_re.py
similarity index 100%
rename from unix-ffi/re-pcre/test_re.py
rename to unix-ffi/re/test_re.py
diff --git a/unix-ffi/select/manifest.py b/unix-ffi/select/manifest.py
index b76078cc8..cadfd4e96 100644
--- a/unix-ffi/select/manifest.py
+++ b/unix-ffi/select/manifest.py
@@ -2,7 +2,7 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("os")
-require("ffilib")
+require("os", unix_ffi=True)
+require("ffilib", unix_ffi=True)
 
 module("select.py")
diff --git a/unix-ffi/signal/manifest.py b/unix-ffi/signal/manifest.py
index cb23542cc..913bbdc8c 100644
--- a/unix-ffi/signal/manifest.py
+++ b/unix-ffi/signal/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("signal.py")
diff --git a/python-stdlib/socket/manifest.py b/unix-ffi/socket/manifest.py
similarity index 100%
rename from python-stdlib/socket/manifest.py
rename to unix-ffi/socket/manifest.py
diff --git a/python-stdlib/socket/socket.py b/unix-ffi/socket/socket.py
similarity index 100%
rename from python-stdlib/socket/socket.py
rename to unix-ffi/socket/socket.py
diff --git a/unix-ffi/sqlite3/manifest.py b/unix-ffi/sqlite3/manifest.py
index 63cdf4b9f..e941e1ddd 100644
--- a/unix-ffi/sqlite3/manifest.py
+++ b/unix-ffi/sqlite3/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("sqlite3.py")
diff --git a/micropython/test.support/manifest.py b/unix-ffi/test.support/manifest.py
similarity index 100%
rename from micropython/test.support/manifest.py
rename to unix-ffi/test.support/manifest.py
diff --git a/micropython/test.support/test/support.py b/unix-ffi/test.support/test/support.py
similarity index 100%
rename from micropython/test.support/test/support.py
rename to unix-ffi/test.support/test/support.py
diff --git a/unix-ffi/time/manifest.py b/unix-ffi/time/manifest.py
index 32004b152..fcaaf7275 100644
--- a/unix-ffi/time/manifest.py
+++ b/unix-ffi/time/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="0.5")
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("time.py")
diff --git a/python-stdlib/timeit/manifest.py b/unix-ffi/timeit/manifest.py
similarity index 65%
rename from python-stdlib/timeit/manifest.py
rename to unix-ffi/timeit/manifest.py
index 67ff15902..82689bb8d 100644
--- a/python-stdlib/timeit/manifest.py
+++ b/unix-ffi/timeit/manifest.py
@@ -1,9 +1,9 @@
 metadata(version="3.3.3-3")
 
-require("getopt")
+require("getopt", unix_ffi=True)
 require("itertools")
 # require("linecache") TODO
-require("time")
+require("time", unix_ffi=True)
 require("traceback")
 
 module("timeit.py")
diff --git a/python-stdlib/timeit/timeit.py b/unix-ffi/timeit/timeit.py
similarity index 100%
rename from python-stdlib/timeit/timeit.py
rename to unix-ffi/timeit/timeit.py
diff --git a/unix-ffi/ucurses/manifest.py b/unix-ffi/ucurses/manifest.py
index 8ec2675a5..50648033e 100644
--- a/unix-ffi/ucurses/manifest.py
+++ b/unix-ffi/ucurses/manifest.py
@@ -2,8 +2,8 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("os")
-require("tty")
-require("select")
+require("os", unix_ffi=True)
+require("tty", unix_ffi=True)
+require("select", unix_ffi=True)
 
 package("ucurses")
diff --git a/python-stdlib/unittest/manifest.py b/unix-ffi/unittest/manifest.py
similarity index 66%
rename from python-stdlib/unittest/manifest.py
rename to unix-ffi/unittest/manifest.py
index 85a5f4015..3f4ddae59 100644
--- a/python-stdlib/unittest/manifest.py
+++ b/unix-ffi/unittest/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.9.0")
 
-require("argparse")
+require("argparse", unix_ffi=True)
 require("fnmatch")
 
 module("unittest.py")
diff --git a/python-stdlib/unittest/test_unittest.py b/unix-ffi/unittest/test_unittest.py
similarity index 100%
rename from python-stdlib/unittest/test_unittest.py
rename to unix-ffi/unittest/test_unittest.py
diff --git a/python-stdlib/unittest/test_unittest_isolated.py b/unix-ffi/unittest/test_unittest_isolated.py
similarity index 100%
rename from python-stdlib/unittest/test_unittest_isolated.py
rename to unix-ffi/unittest/test_unittest_isolated.py
diff --git a/python-stdlib/unittest/unittest.py b/unix-ffi/unittest/unittest.py
similarity index 100%
rename from python-stdlib/unittest/unittest.py
rename to unix-ffi/unittest/unittest.py
diff --git a/python-stdlib/unittest/unittest_discover.py b/unix-ffi/unittest/unittest_discover.py
similarity index 100%
rename from python-stdlib/unittest/unittest_discover.py
rename to unix-ffi/unittest/unittest_discover.py
diff --git a/python-stdlib/urllib.parse/manifest.py b/unix-ffi/urllib.parse/manifest.py
similarity index 78%
rename from python-stdlib/urllib.parse/manifest.py
rename to unix-ffi/urllib.parse/manifest.py
index 4731060d7..ad213bf06 100644
--- a/python-stdlib/urllib.parse/manifest.py
+++ b/unix-ffi/urllib.parse/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.5.2")
 
-require("re-pcre")
+require("re", unix_ffi=True)
 require("collections")
 require("collections.defaultdict")
 
diff --git a/python-stdlib/urllib.parse/test_urlparse.py b/unix-ffi/urllib.parse/test_urlparse.py
similarity index 100%
rename from python-stdlib/urllib.parse/test_urlparse.py
rename to unix-ffi/urllib.parse/test_urlparse.py
diff --git a/python-stdlib/urllib.parse/urllib/parse.py b/unix-ffi/urllib.parse/urllib/parse.py
similarity index 100%
rename from python-stdlib/urllib.parse/urllib/parse.py
rename to unix-ffi/urllib.parse/urllib/parse.py

From 34c9faefd10e3a3205433a39c827a526b7ed7b95 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:17:13 +1000
Subject: [PATCH 066/343] micropython/drivers: Move "onewire" bus driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/bus/onewire/manifest.py |  1 +
 micropython/drivers/bus/onewire/onewire.py  | 92 +++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 micropython/drivers/bus/onewire/manifest.py
 create mode 100644 micropython/drivers/bus/onewire/onewire.py

diff --git a/micropython/drivers/bus/onewire/manifest.py b/micropython/drivers/bus/onewire/manifest.py
new file mode 100644
index 000000000..44edcac69
--- /dev/null
+++ b/micropython/drivers/bus/onewire/manifest.py
@@ -0,0 +1 @@
+module("onewire.py", opt=3)
diff --git a/micropython/drivers/bus/onewire/onewire.py b/micropython/drivers/bus/onewire/onewire.py
new file mode 100644
index 000000000..4c6da741c
--- /dev/null
+++ b/micropython/drivers/bus/onewire/onewire.py
@@ -0,0 +1,92 @@
+# 1-Wire driver for MicroPython
+# MIT license; Copyright (c) 2016 Damien P. George
+
+import _onewire as _ow
+
+
+class OneWireError(Exception):
+    pass
+
+
+class OneWire:
+    SEARCH_ROM = 0xF0
+    MATCH_ROM = 0x55
+    SKIP_ROM = 0xCC
+
+    def __init__(self, pin):
+        self.pin = pin
+        self.pin.init(pin.OPEN_DRAIN, pin.PULL_UP)
+
+    def reset(self, required=False):
+        reset = _ow.reset(self.pin)
+        if required and not reset:
+            raise OneWireError
+        return reset
+
+    def readbit(self):
+        return _ow.readbit(self.pin)
+
+    def readbyte(self):
+        return _ow.readbyte(self.pin)
+
+    def readinto(self, buf):
+        for i in range(len(buf)):
+            buf[i] = _ow.readbyte(self.pin)
+
+    def writebit(self, value):
+        return _ow.writebit(self.pin, value)
+
+    def writebyte(self, value):
+        return _ow.writebyte(self.pin, value)
+
+    def write(self, buf):
+        for b in buf:
+            _ow.writebyte(self.pin, b)
+
+    def select_rom(self, rom):
+        self.reset()
+        self.writebyte(self.MATCH_ROM)
+        self.write(rom)
+
+    def scan(self):
+        devices = []
+        diff = 65
+        rom = False
+        for i in range(0xFF):
+            rom, diff = self._search_rom(rom, diff)
+            if rom:
+                devices += [rom]
+            if diff == 0:
+                break
+        return devices
+
+    def _search_rom(self, l_rom, diff):
+        if not self.reset():
+            return None, 0
+        self.writebyte(self.SEARCH_ROM)
+        if not l_rom:
+            l_rom = bytearray(8)
+        rom = bytearray(8)
+        next_diff = 0
+        i = 64
+        for byte in range(8):
+            r_b = 0
+            for bit in range(8):
+                b = self.readbit()
+                if self.readbit():
+                    if b:  # there are no devices or there is an error on the bus
+                        return None, 0
+                else:
+                    if not b:  # collision, two devices with different bit meaning
+                        if diff > i or ((l_rom[byte] & (1 << bit)) and diff != i):
+                            b = 1
+                            next_diff = i
+                self.writebit(b)
+                if b:
+                    r_b |= 1 << bit
+                i -= 1
+            rom[byte] = r_b
+        return rom, next_diff
+
+    def crc8(self, data):
+        return _ow.crc8(data)

From 2a849f5ec02ad610776392819fc22663a16d0d3e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:18:00 +1000
Subject: [PATCH 067/343] micropython/drivers: Move "wm8960" codec driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/codec/wm8960/manifest.py |   1 +
 micropython/drivers/codec/wm8960/wm8960.py   | 753 +++++++++++++++++++
 2 files changed, 754 insertions(+)
 create mode 100644 micropython/drivers/codec/wm8960/manifest.py
 create mode 100644 micropython/drivers/codec/wm8960/wm8960.py

diff --git a/micropython/drivers/codec/wm8960/manifest.py b/micropython/drivers/codec/wm8960/manifest.py
new file mode 100644
index 000000000..4ff5d9fc4
--- /dev/null
+++ b/micropython/drivers/codec/wm8960/manifest.py
@@ -0,0 +1 @@
+module("wm8960.py", opt=3)
diff --git a/micropython/drivers/codec/wm8960/wm8960.py b/micropython/drivers/codec/wm8960/wm8960.py
new file mode 100644
index 000000000..ad1cb1cbf
--- /dev/null
+++ b/micropython/drivers/codec/wm8960/wm8960.py
@@ -0,0 +1,753 @@
+#
+# Driver class for the WM8960 Codec to be used e.g. with MIMXRT_1xxx Boards.
+# Derived from the NXP SDK drivers.
+#
+# Copyright (c) 2015, Freescale Semiconductor, Inc., (C-Code)
+# Copyright 2016-2021 NXP, (C-Code)
+# All rights reserved.
+#
+# Translated to MicroPython by Robert Hammelrath, 2022
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+import array
+from micropython import const
+
+# Define the register addresses of WM8960.
+_LINVOL = const(0x0)
+_RINVOL = const(0x1)
+_LOUT1 = const(0x2)
+_ROUT1 = const(0x3)
+_CLOCK1 = const(0x4)
+_DACCTL1 = const(0x5)
+_DACCTL2 = const(0x6)
+_IFACE1 = const(0x7)
+_CLOCK2 = const(0x8)
+_IFACE2 = const(0x9)
+_LDAC = const(0xA)
+_RDAC = const(0xB)
+_RESET = const(0xF)
+_3D = const(0x10)
+_ALC1 = const(0x11)
+_ALC2 = const(0x12)
+_ALC3 = const(0x13)
+_NOISEG = const(0x14)
+_LADC = const(0x15)
+_RADC = const(0x16)
+_ADDCTL1 = const(0x17)
+# Register _ADDCTL2 = const(0x18)
+_POWER1 = const(0x19)
+_POWER2 = const(0x1A)
+_ADDCTL3 = const(0x1B)
+# Register _APOP1 = const(0x1C)
+# Register _APOP2 = const(0x1D)
+_LINPATH = const(0x20)
+_RINPATH = const(0x21)
+_LOUTMIX = const(0x22)
+_ROUTMIX = const(0x25)
+_MONOMIX1 = const(0x26)
+_MONOMIX2 = const(0x27)
+_LOUT2 = const(0x28)
+_ROUT2 = const(0x29)
+_MONO = const(0x2A)
+_INBMIX1 = const(0x2B)
+_INBMIX2 = const(0x2C)
+_BYPASS1 = const(0x2D)
+_BYPASS2 = const(0x2E)
+_POWER3 = const(0x2F)
+_ADDCTL4 = const(0x30)
+_CLASSD1 = const(0x31)
+# Register _CLASSD3 = const(0x33)
+_PLL1 = const(0x34)
+_PLL2 = const(0x35)
+_PLL3 = const(0x36)
+_PLL4 = const(0x37)
+
+# WM8960 PLLN range */
+_PLL_N_MIN_VALUE = const(6)
+_PLL_N_MAX_VALUE = const(12)
+
+# WM8960 CLOCK2 bits
+_CLOCK2_BCLK_DIV_MASK = const(0x0F)
+_CLOCK2_DCLK_DIV_MASK = const(0x1C0)
+_CLOCK2_DCLK_DIV_SHIFT = const(0x06)
+
+# Register _IFACE1
+_IFACE1_FORMAT_MASK = const(0x03)
+_IFACE1_WL_MASK = const(0x0C)
+_IFACE1_WL_SHIFT = const(0x02)
+_IFACE1_LRP_MASK = const(0x10)
+_IFACE1_MS_MASK = const(0x40)
+_IFACE1_DLRSWAP_MASK = const(0x20)
+_IFACE1_ALRSWAP_MASK = const(0x100)
+
+# Register _POWER1
+_POWER1_VREF_MASK = const(0x40)
+_POWER1_VREF_SHIFT = const(0x06)
+_POWER1_AINL_MASK = const(0x20)
+_POWER1_AINR_MASK = const(0x10)
+_POWER1_ADCL_MASK = const(0x08)
+_POWER1_ADCR_MASK = const(0x0)
+_POWER1_MICB_MASK = const(0x02)
+_POWER1_MICB_SHIFT = const(0x01)
+
+# Register _POWER2
+_POWER2_DACL_MASK = const(0x100)
+_POWER2_DACR_MASK = const(0x80)
+_POWER2_LOUT1_MASK = const(0x40)
+_POWER2_ROUT1_MASK = const(0x20)
+_POWER2_SPKL_MASK = const(0x10)
+_POWER2_SPKR_MASK = const(0x08)
+_POWER3_LMIC_MASK = const(0x20)
+_POWER3_RMIC_MASK = const(0x10)
+_POWER3_LOMIX_MASK = const(0x08)
+_POWER3_ROMIX_MASK = const(0x04)
+
+# Register _DACCTL1 .. 3
+_DACCTL1_MONOMIX_MASK = const(0x10)
+_DACCTL1_MONOMIX_SHIFT = const(0x4)
+_DACCTL1_DACMU_MASK = const(0x08)
+_DACCTL1_DEEM_MASK = const(0x06)
+_DACCTL1_DEEM_SHIFT = const(0x01)
+_DACCTL2_DACSMM_MASK = const(0x08)
+_DACCTL2_DACMR_MASK = const(0x04)
+_DACCTL3_ALCSR_MASK = const(0x07)
+
+# _WM8060_ALC1 .. 3
+_ALC_CHANNEL_MASK = const(0x180)
+_ALC_CHANNEL_SHIFT = const(0x7)
+_ALC_MODE_MASK = const(0x100)
+_ALC_MODE_SHIFT = const(0x8)
+_ALC_GAIN_MASK = const(0x70)
+_ALC_GAIN_SHIFT = const(0x4)
+_ALC_TARGET_MASK = const(0x0F)
+_ALC_ATTACK_MASK = const(0x0F)
+_ALC_DECAY_MASK = const(0xF0)
+_ALC_DECAY_SHIFT = const(4)
+_ALC_HOLD_MASK = const(0xF)
+
+# Register _NOISEG
+_NOISEG_LEVEL_SHIFT = const(3)
+
+_I2C_ADDR = const(0x1A)
+
+# WM8960 maximum volume values
+_MAX_VOLUME_ADC = const(0xFF)
+_MAX_VOLUME_DAC = const(0xFF)
+_MAX_VOLUME_HEADPHONE = const(0x7F)
+_MAX_VOLUME_LINEIN = const(0x3F)
+_MAX_VOLUME_SPEAKER = const(0x7F)
+
+# Config symbol names
+# Modules
+MODULE_ADC = const(0)  # ADC module in WM8960
+MODULE_DAC = const(1)  # DAC module in WM8960
+MODULE_VREF = const(2)  # VREF module
+MODULE_HEADPHONE = const(3)  # Headphone
+MODULE_MIC_BIAS = const(4)  # Mic bias
+MODULE_MIC = const(5)  # Input Mic
+MODULE_LINE_IN = const(6)  # Analog in PGA
+MODULE_LINE_OUT = const(7)  # Line out module
+MODULE_SPEAKER = const(8)  # Speaker module
+MODULE_OMIX = const(9)  # Output mixer
+MODULE_MONO_OUT = const(10)  # Mono mix
+
+# Route
+ROUTE_BYPASS = const(0)  # LINEIN->Headphone.
+ROUTE_PLAYBACK = const(1)  #  I2SIN->DAC->Headphone.
+ROUTE_PLAYBACK_RECORD = const(2)  # I2SIN->DAC->Headphone, LINEIN->ADC->I2SOUT.
+ROUTE_RECORD = const(5)  # LINEIN->ADC->I2SOUT.
+
+# Input
+INPUT_CLOSED = const(0)  # Input device is closed
+INPUT_MIC1 = const(1)  # Input as single ended mic, only use L/RINPUT1
+INPUT_MIC2 = const(2)  # Input as diff. mic, use L/RINPUT1 and L/RINPUT2
+INPUT_MIC3 = const(3)  # Input as diff. mic, use L/RINPUT1 and L/RINPUT3
+INPUT_LINE2 = const(4)  # Input as line input, only use L/RINPUT2
+INPUT_LINE3 = const(5)  # Input as line input, only use L/RINPUT3
+
+# ADC sync input
+SYNC_ADC = const(0)  # Use ADCLRC pin for ADC sync
+SYNC_DAC = const(1)  # used DACLRC pin for ADC sync
+
+# Protocol type
+BUS_I2S = const(2)  # I2S type
+BUS_LEFT_JUSTIFIED = const(1)  # Left justified mode
+BUS_RIGHT_JUSTIFIED = const(0)  # Right justified mode
+BUS_PCMA = const(3)  # PCM A mode
+BUS_PCMB = const(3 | (1 << 4))  # PCM B mode
+
+# Channel swap
+SWAP_NONE = const(0)
+SWAP_INPUT = const(1)
+SWAP_OUTPUT = const(2)
+
+# Mute settings
+MUTE_FAST = const(0)
+MUTE_SLOW = const(1)
+
+# ALC settings
+ALC_OFF = const(0)
+ALC_RIGHT = const(1)
+ALC_LEFT = const(2)
+ALC_STEREO = const(3)
+ALC_MODE = const(0)  # ALC mode
+ALC_LIMITER = const(1)  # Limiter mode
+
+# Clock Source
+SYSCLK_MCLK = const(0)  # sysclk source from external MCLK
+SYSCLK_PLL = const(1)  # sysclk source from internal PLL
+
+
+class Regs:
+    # register cache of 56 register. Since registers cannot be read back, they are
+    # kept in the table for modification
+    # fmt: off
+    cache = array.array("H", (
+        0x0097, 0x0097, 0x0000, 0x0000, 0x0000, 0x0008, 0x0000,
+        0x000a, 0x01c0, 0x0000, 0x00ff, 0x00ff, 0x0000, 0x0000,
+        0x0000, 0x0000, 0x0000, 0x007b, 0x0100, 0x0032, 0x0000,
+        0x00c3, 0x00c3, 0x01c0, 0x0000, 0x0000, 0x0000, 0x0000,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0100, 0x0050,
+        0x0050, 0x0050, 0x0050, 0x0000, 0x0000, 0x0000, 0x0000,
+        0x0040, 0x0000, 0x0000, 0x0050, 0x0050, 0x0000, 0x0002,
+        0x0037, 0x004d, 0x0080, 0x0008, 0x0031, 0x0026, 0x00e9
+    ))
+    # fmt: on
+
+    def __init__(self, i2c, i2c_address=_I2C_ADDR):
+        self.value_buffer = bytearray(2)
+        self.i2c = i2c
+        self.i2c_address = i2c_address
+
+    def __getitem__(self, reg):
+        return self.cache[reg]
+
+    def __setitem__(self, reg, value):
+        if type(reg) is tuple:
+            if type(value) is tuple:
+                self[reg[0]] = value[0]
+                self[reg[1]] = value[1]
+            else:
+                self[reg[0]] = value
+                self[reg[1]] = value
+        else:
+            if type(value) is tuple:
+                val = (self.cache[reg] & (~value[0] & 0xFFFF)) | value[1]
+            else:
+                val = value
+            self.cache[reg] = val
+            self.value_buffer[0] = (reg << 1) | ((val >> 8) & 0x01)
+            self.value_buffer[1] = val & 0xFF
+            self.i2c.writeto(self.i2c_address, self.value_buffer)
+
+
+class WM8960:
+
+    _bit_clock_divider_table = {
+        2: 0,
+        3: 1,
+        4: 2,
+        6: 3,
+        8: 4,
+        11: 5,
+        12: 6,
+        16: 7,
+        22: 8,
+        24: 9,
+        32: 10,
+        44: 11,
+        48: 12,
+    }
+
+    _dac_divider_table = {
+        1.0 * 256: 0b000,
+        1.5 * 256: 0b001,
+        2 * 256: 0b010,
+        3 * 256: 0b011,
+        4 * 256: 0b100,
+        5.5 * 256: 0b101,
+        6 * 256: 0b110,
+    }
+
+    _audio_word_length_table = {
+        16: 0b00,
+        20: 0b01,
+        24: 0b10,
+        32: 0b11,
+    }
+
+    _alc_sample_rate_table = {
+        48000: 0,
+        44100: 0,
+        32000: 1,
+        24000: 2,
+        22050: 2,
+        16000: 3,
+        12000: 4,
+        11025: 4,
+        8000: 5,
+    }
+
+    _volume_config_table = {
+        MODULE_ADC: (_MAX_VOLUME_ADC, _LADC, 0x100),
+        MODULE_DAC: (_MAX_VOLUME_DAC, _LDAC, 0x100),
+        MODULE_HEADPHONE: (_MAX_VOLUME_HEADPHONE, _LOUT1, 0x180),
+        MODULE_LINE_IN: (_MAX_VOLUME_LINEIN, _LINVOL, 0x140),
+        MODULE_SPEAKER: (_MAX_VOLUME_SPEAKER, _LOUT2, 0x180),
+    }
+
+    _input_config_table = {
+        INPUT_CLOSED: None,
+        INPUT_MIC1: (0x138, 0x117),
+        INPUT_MIC2: (0x178, 0x117),
+        INPUT_MIC3: (0x1B8, 0x117),
+        INPUT_LINE2: (0, 0xE),
+        INPUT_LINE3: (0, 0x70),
+    }
+
+    def __init__(
+        self,
+        i2c,
+        sample_rate=16000,
+        bits=16,
+        swap=SWAP_NONE,
+        route=ROUTE_PLAYBACK_RECORD,
+        left_input=INPUT_MIC3,
+        right_input=INPUT_MIC2,
+        sysclk_source=SYSCLK_MCLK,
+        mclk_freq=None,
+        primary=False,
+        adc_sync=SYNC_DAC,
+        protocol=BUS_I2S,
+        i2c_address=_I2C_ADDR,
+    ):
+        self.regs = regs = Regs(i2c, i2c_address)
+        self.sample_rate = sample_rate
+
+        # check parameter consistency and set the sysclk value
+        if sysclk_source == SYSCLK_PLL:
+            if sample_rate in (11025, 22050, 44100):
+                sysclk = 11289600
+            else:
+                sysclk = 12288000
+            if sysclk < sample_rate * 256:
+                sysclk = sample_rate * 256
+            if mclk_freq is None:
+                mclk_freq = sysclk
+        else:  # sysclk_source == SYSCLK_MCLK
+            if mclk_freq is None:
+                mclk_freq = sample_rate * 256
+            sysclk = mclk_freq
+
+        regs[_RESET] = 0x00
+        # VMID=50K, Enable VREF, AINL, AINR, ADCL and ADCR
+        # I2S_IN (bit 0), I2S_OUT (bit 1), DAP (bit 4), DAC (bit 5), ADC (bit 6) are powered on
+        regs[_POWER1] = 0xFE
+        # Enable DACL, DACR, LOUT1, ROUT1, PLL down, SPKL, SPKR
+        regs[_POWER2] = 0x1F8
+        # Enable left and right channel input PGA, left and right output mixer
+        regs[_POWER3] = 0x3C
+
+        if adc_sync == SYNC_ADC:
+            # ADC and DAC use different Frame Clock Pins
+            regs[_IFACE2] = 0x00  # ADCLRC 0x00:Input 0x40:output.
+        else:
+            # ADC and DAC use the same Frame Clock Pin
+            regs[_IFACE2] = 0x40  # ADCLRC 0x00:Input 0x40:output.
+        self.set_data_route(route)
+        self.set_protocol(protocol)
+
+        if sysclk_source == SYSCLK_PLL:
+            self.set_internal_pll_config(mclk_freq, sysclk)
+        if primary:
+            self.set_master_clock(sysclk, sample_rate, bits)
+            # set master bit.
+            self.regs[_IFACE1] = (0, _IFACE1_MS_MASK)
+
+        self.set_speaker_clock(sysclk)
+
+        # swap channels
+        if swap & SWAP_INPUT:
+            regs[_IFACE1] = (0, _IFACE1_ALRSWAP_MASK)
+        if swap & SWAP_OUTPUT:
+            regs[_IFACE1] = (0, _IFACE1_DLRSWAP_MASK)
+
+        self.set_left_input(left_input)
+        self.set_right_input(right_input)
+
+        regs[_ADDCTL1] = 0x0C0
+        regs[_ADDCTL4] = 0x60  # Set GPIO1 to 0.
+
+        regs[_BYPASS1] = regs[_BYPASS2] = 0x0
+        # ADC volume, 0dB
+        regs[_LADC, _RADC] = 0x1C3
+        # Digital DAC volume, 0dB
+        regs[_LDAC, _RDAC] = 0x1FF
+        # Headphone volume, LOUT1 and ROUT1, 0dB
+        regs[_LOUT1, _ROUT1] = 0x16F
+        # speaker volume 6dB
+        regs[_LOUT2, _ROUT2] = 0x1FF
+        # enable class D output
+        regs[_CLASSD1] = 0xF7
+        # Unmute DAC.
+        regs[_DACCTL1] = 0x0000
+        # Input PGA volume 0 dB
+        regs[_LINVOL, _RINVOL] = 0x117
+
+        self.config_data_format(sysclk, sample_rate, bits)
+
+    def deinit(self):
+
+        self.set_module(MODULE_ADC, False)
+        self.set_module(MODULE_DAC, False)
+        self.set_module(MODULE_VREF, False)
+        self.set_module(MODULE_LINE_IN, False)
+        self.set_module(MODULE_LINE_OUT, False)
+        self.set_module(MODULE_SPEAKER, False)
+
+    def set_internal_pll_config(self, input_mclk, output_clk):
+        regs = self.regs
+        pllF2 = output_clk * 4
+        pll_prescale = 0
+        sysclk_div = 1
+        frac_mode = 0
+
+        # disable PLL power
+        regs[_POWER2] = (1, 0)
+        regs[_CLOCK1] = (7, 0)
+
+        pllN = pllF2 // input_mclk
+        if pllN < _PLL_N_MIN_VALUE:
+            input_mclk //= 2
+            pll_prescale = 1
+            pllN = pllF2 // input_mclk
+            if pllN < _PLL_N_MIN_VALUE:
+                sysclk_div = 2
+                pllF2 *= 2
+                pllN = pllF2 // input_mclk
+
+        if (pllN < _PLL_N_MIN_VALUE) or (pllN > _PLL_N_MAX_VALUE):
+            raise ValueError("Invalid MCLK vs. sysclk ratio")
+
+        pllK = ((pllF2 % input_mclk) * (1 << 24)) // input_mclk
+        if pllK != 0:
+            frac_mode = 1
+
+        regs[_PLL1] = (frac_mode << 5) | (pll_prescale << 4) | (pllN & 0x0F)
+        regs[_PLL2] = (pllK >> 16) & 0xFF
+        regs[_PLL3] = (pllK >> 8) & 0xFF
+        regs[_PLL4] = pllK & 0xFF
+        # enable PLL power
+        regs[_POWER2] = (1, 1)
+        regs[_CLOCK1] = (7, ((0 if sysclk_div == 1 else sysclk_div) << 1) | 1)
+
+    def set_master_clock(self, sysclk, sample_rate, bit_width):
+        bit_clock_divider = (sysclk * 2) // (sample_rate * bit_width * 2)
+        try:
+            reg_divider = self._bit_clock_divider_table[bit_clock_divider]
+        except:
+            raise ValueError("Invalid ratio of sysclk sample rate and bits")
+        # configure the master bit clock divider
+        self.regs[_CLOCK2] = (_CLOCK2_BCLK_DIV_MASK, reg_divider)
+
+    def set_speaker_clock(self, sysclk):
+        speaker_divider_table = (1.5, 2, 3, 4, 6, 8, 12, 16)
+        for val in range(8):
+            divider = speaker_divider_table[val]
+            f = sysclk / divider
+            if 500_000 < f < 1_000_000:
+                break
+        else:
+            val = 7
+        self.regs[_CLOCK2] = (
+            _CLOCK2_DCLK_DIV_MASK,
+            val << _CLOCK2_DCLK_DIV_SHIFT,
+        )
+
+    def set_module(self, module, is_enabled):
+
+        is_enabled = 1 if is_enabled else 0
+        regs = self.regs
+
+        if module == MODULE_ADC:
+
+            regs[_POWER1] = (
+                _POWER1_ADCL_MASK | _POWER1_ADCR_MASK,
+                (_POWER1_ADCL_MASK | _POWER1_ADCR_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_DAC:
+
+            regs[_POWER2] = (
+                _POWER2_DACL_MASK | _POWER2_DACR_MASK,
+                (_POWER2_DACL_MASK | _POWER2_DACR_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_VREF:
+
+            regs[_POWER1] = (
+                _POWER1_VREF_MASK,
+                (is_enabled << _POWER1_VREF_SHIFT),
+            )
+
+        elif module == MODULE_LINE_IN:
+
+            regs[_POWER1] = (
+                _POWER1_AINL_MASK | _POWER1_AINR_MASK,
+                (_POWER1_AINL_MASK | _POWER1_AINR_MASK) * is_enabled,
+            )
+            regs[_POWER3] = (
+                _POWER3_LMIC_MASK | _POWER3_RMIC_MASK,
+                (_POWER3_LMIC_MASK | _POWER3_RMIC_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_LINE_OUT:
+
+            regs[_POWER2] = (
+                _POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK,
+                (_POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_MIC_BIAS:
+
+            regs[_POWER1] = (
+                _POWER1_MICB_MASK,
+                (is_enabled << _POWER1_MICB_SHIFT),
+            )
+
+        elif module == MODULE_SPEAKER:
+
+            regs[_POWER2] = (
+                _POWER2_SPKL_MASK | _POWER2_SPKR_MASK,
+                (_POWER2_SPKL_MASK | _POWER2_SPKR_MASK) * is_enabled,
+            )
+            regs[_CLASSD1] = 0xF7
+
+        elif module == MODULE_OMIX:
+
+            regs[_POWER3] = (
+                _POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK,
+                (_POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_MONO_OUT:
+
+            regs[_MONOMIX1] = regs[_MONOMIX2] = is_enabled << 7
+            regs[_MONO] = is_enabled << 6
+
+        else:
+            raise ValueError("Invalid module")
+
+    def enable_module(self, module):
+        self.set_module(module, True)
+
+    def disable_module(self, module):
+        self.set_module(module, False)
+
+    def set_data_route(self, route):
+        regs = self.regs
+        if route == ROUTE_BYPASS:
+            # Bypass means from line-in to HP
+            # Left LINPUT3 to left output mixer, LINPUT3 left output mixer volume = 0dB
+            # Right RINPUT3 to right output mixer, RINPUT3 right output mixer volume = 0dB
+            regs[_LOUTMIX, _ROUTMIX] = 0x80
+
+        elif route == ROUTE_PLAYBACK:
+            # Data route I2S_IN-> DAC-> HP
+            #
+            # Left DAC to left output mixer, LINPUT3 left output mixer volume = 0dB
+            # Right DAC to right output mixer, RINPUT3 right output mixer volume = 0dB
+            regs[_LOUTMIX, _ROUTMIX] = 0x100
+            regs[_POWER3] = 0x0C
+            # Set power for DAC
+            self.set_module(MODULE_DAC, True)
+            self.set_module(MODULE_OMIX, True)
+            self.set_module(MODULE_LINE_OUT, True)
+
+        elif route == ROUTE_PLAYBACK_RECORD:
+            #
+            # Left DAC to left output mixer, LINPUT3 left output mixer volume = 0dB
+            # Right DAC to right output mixer, RINPUT3 right output mixer volume = 0dB
+            regs[_LOUTMIX, _ROUTMIX] = 0x100
+            regs[_POWER3] = 0x3C
+            self.set_module(MODULE_DAC, True)
+            self.set_module(MODULE_ADC, True)
+            self.set_module(MODULE_LINE_IN, True)
+            self.set_module(MODULE_OMIX, True)
+            self.set_module(MODULE_LINE_OUT, True)
+
+        elif route == ROUTE_RECORD:
+            # LINE_IN->ADC->I2S_OUT
+            # Left and right input boost, LIN3BOOST and RIN3BOOST = 0dB
+            regs[_POWER3] = 0x30
+            # Power up ADC and AIN
+            self.set_module(MODULE_LINE_IN, True)
+            self.set_module(MODULE_ADC, True)
+
+        else:
+            raise ValueError("Invalid route")
+
+    def set_left_input(self, input):
+        if not input in self._input_config_table.keys():
+            raise ValueError("Invalid input")
+
+        input = self._input_config_table[input]
+
+        regs = self.regs
+        if input is None:
+            regs[_POWER1] = (_POWER1_AINL_MASK | _POWER1_ADCL_MASK, 0)
+        elif input[0] == 0:
+            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCL_MASK)
+            regs[_INBMIX1] = input
+        else:
+            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCL_MASK | _POWER1_MICB_MASK)
+            regs[_LINPATH] = input[0]
+            regs[_LINVOL] = input[1]
+
+    def set_right_input(self, input):
+        if not input in self._input_config_table.keys():
+            raise ValueError("Invalid input name")
+
+        input = self._input_config_table[input]
+
+        regs = self.regs
+        if input is None:
+            regs[_POWER1] = (_POWER1_AINR_MASK | _POWER1_ADCR_MASK, 0)
+        elif input[0] == 0:
+            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCR_MASK)
+            regs[_INBMIX2] = input
+        else:
+            regs[_POWER1] = (0, _POWER1_AINR_MASK | _POWER1_ADCR_MASK | _POWER1_MICB_MASK)
+            regs[_RINPATH] = input[0]
+            regs[_RINVOL] = input[1]
+
+    def set_protocol(self, protocol):
+        self.regs[_IFACE1] = (
+            _IFACE1_FORMAT_MASK | _IFACE1_LRP_MASK,
+            protocol,
+        )
+
+    def config_data_format(self, sysclk, sample_rate, bits):
+        #  Compute sample rate divider, dac and adc are the same sample rate
+        try:
+            divider = self._dac_divider_table[sysclk // sample_rate]
+            wl = self._audio_word_length_table[bits]
+        except:
+            raise ValueError("Invalid ratio sysclk/sample_rate or invalid bit length")
+
+        self.regs[_CLOCK1] = (0x1F8, divider << 6 | divider << 3)
+        self.regs[_IFACE1] = (_IFACE1_WL_MASK, wl << _IFACE1_WL_SHIFT)
+
+    def volume(self, module, volume_l=None, volume_r=None):
+        if not module in self._volume_config_table.keys():
+            raise ValueError("Invalid module")
+
+        if volume_l is None:  # get volume
+            vol_max, regnum, _ = self._volume_config_table[module]
+            return (
+                int((self.regs[regnum] & vol_max) * 100 / vol_max + 0.5),
+                int((self.regs[regnum + 1] & vol_max) * 100 / vol_max + 0.5),
+            )
+        else:  # set volume
+            if volume_r is None:
+                volume_r = volume_l
+
+            if not ((0 <= volume_l <= 100) and (0 <= volume_r <= 100)):
+                raise ValueError("Invalid value for volume")
+            elif not module in self._volume_config_table.keys():
+                raise ValueError("Invalid module")
+
+            vol_max, regnum, flags = self._volume_config_table[module]
+            self.regs[regnum] = int(volume_l * vol_max / 100 + 0.5) | flags
+            self.regs[regnum + 1] = int(volume_r * vol_max / 100 + 0.5) | flags
+
+    def mute(self, enable, soft=True, ramp=MUTE_FAST):
+        enable = _DACCTL1_DACMU_MASK if enable else 0
+        soft = _DACCTL2_DACSMM_MASK if soft else 0
+        ramp = _DACCTL2_DACMR_MASK if ramp == MUTE_SLOW else 0
+        self.regs[_DACCTL1] = (_DACCTL1_DACMU_MASK, enable)
+        self.regs[_DACCTL2] = (
+            _DACCTL2_DACSMM_MASK | _DACCTL2_DACMR_MASK,
+            soft | ramp,
+        )
+
+    def expand_3d(self, depth=0):
+        depth &= 0x0F
+        cutoff = 0 if self.sample_rate >= 32000 else 0b1100000
+        self.regs[_3D] = cutoff | depth << 1 | (1 if depth > 0 else 0)
+
+    def mono(self, enable):
+        enable = 1 if enable else 0
+        self.regs[_DACCTL1] = (
+            _DACCTL1_MONOMIX_MASK,
+            enable << _DACCTL1_MONOMIX_SHIFT,
+        )
+
+    def alc_mode(self, channel, mode=ALC_MODE):
+        if mode != ALC_MODE:
+            mode = ALC_LIMITER
+        channel &= 3
+        self.regs[_ALC1] = (
+            _ALC_CHANNEL_MASK,
+            channel << _ALC_CHANNEL_SHIFT,
+        )
+        self.regs[_ALC3] = (_ALC_MODE_MASK, mode << _ALC_MODE_SHIFT)
+        try:
+            rate = _alc_sample_rate_table[self.sample_rate]
+        except:
+            rate = 0
+        self.regs[_ADDCTL3] = (_DACCTL3_ALCSR_MASK, rate)
+
+    def alc_gain(self, target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78):
+        def limit(value, minval, maxval):
+            value = int(value)
+            if value < minval:
+                value = minval
+            if value > maxval:
+                value = maxval
+            return value
+
+        target = limit((16 + (target * 2) // 3), 0, 15)
+        max_gain = limit((max_gain + 12) // 6, 0, 7)
+        min_gain = limit((min_gain * 4 + 69) // 24, 0, 7)
+        noise_gate = limit((noise_gate * 2 + 153) // 3, -1, 31)
+        self.regs[_ALC1] = (
+            _ALC_GAIN_MASK | _ALC_TARGET_MASK,
+            (max_gain << _ALC_GAIN_SHIFT) | target,
+        )
+        self.regs[_ALC2] = (_ALC_GAIN_MASK, (min_gain << _ALC_GAIN_SHIFT))
+        if noise_gate >= 0:
+            self.regs[_NOISEG] = noise_gate << _NOISEG_LEVEL_SHIFT | 1
+        else:
+            self.regs[_NOISEG] = 0
+
+    def alc_time(self, attack=24, decay=192, hold=0):
+        def logb(value, limit):
+            value = int(value)
+            lb = 0
+            while value > 1:
+                value >>= 1
+                lb += 1
+            if lb > limit:
+                lb = limit
+            return lb
+
+        attack = logb(attack / 6, 7)
+        decay = logb(decay / 24, 7)
+        hold = logb((hold * 3) / 8, 15)
+        self.regs[_ALC2] = (_ALC_HOLD_MASK, hold)
+        self.regs[_ALC3] = (
+            _ALC_DECAY_MASK | _ALC_ATTACK_MASK,
+            (decay << _ALC_DECAY_SHIFT) | attack,
+        )
+
+    def deemphasis(self, enable):
+        deem_table = (32000, 44100, 48000)
+        enable = not not enable
+        if enable and self.sample_rate in deem_table:
+            val = deem_table.index(self.sample_rate) + 1
+        else:
+            val = 0
+        self.regs[_DACCTL1] = (_DACCTL1_DEEM_MASK, val << _DACCTL1_DEEM_SHIFT)

From d88505680f09965fb69d133db0bb68fb7de14f14 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:18:21 +1000
Subject: [PATCH 068/343] micropython/drivers: Move "lcd160cr" display driver
 from main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../drivers/display/lcd160cr/lcd160cr.py      | 482 ++++++++++++++++++
 .../drivers/display/lcd160cr/lcd160cr_test.py | 187 +++++++
 .../drivers/display/lcd160cr/manifest.py      |   6 +
 3 files changed, 675 insertions(+)
 create mode 100644 micropython/drivers/display/lcd160cr/lcd160cr.py
 create mode 100644 micropython/drivers/display/lcd160cr/lcd160cr_test.py
 create mode 100644 micropython/drivers/display/lcd160cr/manifest.py

diff --git a/micropython/drivers/display/lcd160cr/lcd160cr.py b/micropython/drivers/display/lcd160cr/lcd160cr.py
new file mode 100644
index 000000000..f792418aa
--- /dev/null
+++ b/micropython/drivers/display/lcd160cr/lcd160cr.py
@@ -0,0 +1,482 @@
+# Driver for official MicroPython LCD160CR display
+# MIT license; Copyright (c) 2017 Damien P. George
+
+from micropython import const
+from utime import sleep_ms
+from ustruct import calcsize, pack_into
+import uerrno, machine
+
+# for set_orient
+PORTRAIT = const(0)
+LANDSCAPE = const(1)
+PORTRAIT_UPSIDEDOWN = const(2)
+LANDSCAPE_UPSIDEDOWN = const(3)
+
+# for set_startup_deco; can be or'd
+STARTUP_DECO_NONE = const(0)
+STARTUP_DECO_MLOGO = const(1)
+STARTUP_DECO_INFO = const(2)
+
+_uart_baud_table = {
+    2400: 0,
+    4800: 1,
+    9600: 2,
+    19200: 3,
+    38400: 4,
+    57600: 5,
+    115200: 6,
+    230400: 7,
+    460800: 8,
+}
+
+
+class LCD160CR:
+    def __init__(self, connect=None, *, pwr=None, i2c=None, spi=None, i2c_addr=98):
+        if connect in ("X", "Y", "XY", "YX"):
+            i = connect[-1]
+            j = connect[0]
+            y = j + "4"
+        elif connect == "C":
+            i = 2
+            j = 2
+            y = "A7"
+        else:
+            if pwr is None or i2c is None or spi is None:
+                raise ValueError('must specify valid "connect" or all of "pwr", "i2c" and "spi"')
+
+        if pwr is None:
+            pwr = machine.Pin(y, machine.Pin.OUT)
+        if i2c is None:
+            i2c = machine.I2C(i, freq=1000000)
+        if spi is None:
+            spi = machine.SPI(j, baudrate=13500000, polarity=0, phase=0)
+
+        if not pwr.value():
+            pwr(1)
+            sleep_ms(10)
+        # else:
+        # alread have power
+        # lets be optimistic...
+
+        # set connections
+        self.pwr = pwr
+        self.i2c = i2c
+        self.spi = spi
+        self.i2c_addr = i2c_addr
+
+        # create temp buffers and memoryviews
+        self.buf16 = bytearray(16)
+        self.buf19 = bytearray(19)
+        self.buf = [None] * 10
+        for i in range(1, 10):
+            self.buf[i] = memoryview(self.buf16)[0:i]
+        self.buf1 = self.buf[1]
+        self.array4 = [0, 0, 0, 0]
+
+        # set default orientation and window
+        self.set_orient(PORTRAIT)
+        self._fcmd2b("<BBBBBB", 0x76, 0, 0, self.w, self.h)  # viewport 'v'
+        self._fcmd2b("<BBBBBB", 0x79, 0, 0, self.w, self.h)  # window 'y'
+
+    def _send(self, cmd):
+        i = self.i2c.writeto(self.i2c_addr, cmd)
+        if i == len(cmd):
+            return
+        cmd = memoryview(cmd)
+        n = len(cmd)
+        while True:
+            i += self.i2c.writeto(self.i2c_addr, cmd[i:])
+            if i == n:
+                return
+            sleep_ms(10)
+
+    def _fcmd2(self, fmt, a0, a1=0, a2=0):
+        buf = self.buf[calcsize(fmt)]
+        pack_into(fmt, buf, 0, 2, a0, a1, a2)
+        self._send(buf)
+
+    def _fcmd2b(self, fmt, a0, a1, a2, a3, a4=0):
+        buf = self.buf[calcsize(fmt)]
+        pack_into(fmt, buf, 0, 2, a0, a1, a2, a3, a4)
+        self._send(buf)
+
+    def _waitfor(self, n, buf):
+        t = 5000
+        while t:
+            self.i2c.readfrom_into(self.i2c_addr, self.buf1)
+            if self.buf1[0] >= n:
+                self.i2c.readfrom_into(self.i2c_addr, buf)
+                return
+            t -= 1
+            sleep_ms(1)
+        raise OSError(uerrno.ETIMEDOUT)
+
+    def oflush(self, n=255):
+        t = 5000
+        while t:
+            self.i2c.readfrom_into(self.i2c_addr + 1, self.buf1)
+            r = self.buf1[0]
+            if r >= n:
+                return
+            t -= 1
+            machine.idle()
+        raise OSError(uerrno.ETIMEDOUT)
+
+    def iflush(self):
+        t = 5000
+        while t:
+            self.i2c.readfrom_into(self.i2c_addr, self.buf16)
+            if self.buf16[0] == 0:
+                return
+            t -= 1
+            sleep_ms(1)
+        raise OSError(uerrno.ETIMEDOUT)
+
+    #### MISC METHODS ####
+
+    @staticmethod
+    def rgb(r, g, b):
+        return ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3)
+
+    @staticmethod
+    def clip_line(c, w, h):
+        while True:
+            ca = ce = 0
+            if c[1] < 0:
+                ca |= 8
+            elif c[1] > h:
+                ca |= 4
+            if c[0] < 0:
+                ca |= 1
+            elif c[0] > w:
+                ca |= 2
+            if c[3] < 0:
+                ce |= 8
+            elif c[3] > h:
+                ce |= 4
+            if c[2] < 0:
+                ce |= 1
+            elif c[2] > w:
+                ce |= 2
+            if ca & ce:
+                return False
+            elif ca | ce:
+                ca |= ce
+                if ca & 1:
+                    if c[2] < c[0]:
+                        c[0], c[2] = c[2], c[0]
+                        c[1], c[3] = c[3], c[1]
+                    c[1] += ((-c[0]) * (c[3] - c[1])) // (c[2] - c[0])
+                    c[0] = 0
+                elif ca & 2:
+                    if c[2] < c[0]:
+                        c[0], c[2] = c[2], c[0]
+                        c[1], c[3] = c[3], c[1]
+                    c[3] += ((w - 1 - c[2]) * (c[3] - c[1])) // (c[2] - c[0])
+                    c[2] = w - 1
+                elif ca & 4:
+                    if c[0] == c[2]:
+                        if c[1] >= h:
+                            c[1] = h - 1
+                        if c[3] >= h:
+                            c[3] = h - 1
+                    else:
+                        if c[3] < c[1]:
+                            c[0], c[2] = c[2], c[0]
+                            c[1], c[3] = c[3], c[1]
+                        c[2] += ((h - 1 - c[3]) * (c[2] - c[0])) // (c[3] - c[1])
+                        c[3] = h - 1
+                else:
+                    if c[0] == c[2]:
+                        if c[1] < 0:
+                            c[1] = 0
+                        if c[3] < 0:
+                            c[3] = 0
+                    else:
+                        if c[3] < c[1]:
+                            c[0], c[2] = c[2], c[0]
+                            c[1], c[3] = c[3], c[1]
+                        c[0] += ((-c[1]) * (c[2] - c[0])) // (c[3] - c[1])
+                        c[1] = 0
+            else:
+                return True
+
+    #### SETUP COMMANDS ####
+
+    def set_power(self, on):
+        self.pwr(on)
+        sleep_ms(15)
+
+    def set_orient(self, orient):
+        self._fcmd2("<BBB", 0x14, (orient & 3) + 4)
+        # update width and height variables
+        self.iflush()
+        self._send(b"\x02g0")
+        self._waitfor(4, self.buf[5])
+        self.w = self.buf[5][1]
+        self.h = self.buf[5][2]
+
+    def set_brightness(self, value):
+        self._fcmd2("<BBB", 0x16, value)
+
+    def set_i2c_addr(self, addr):
+        # 0x0e set i2c addr
+        if addr & 3:
+            raise ValueError("must specify mod 4 aligned address")
+        self._fcmd2("<BBW", 0x0E, 0x433249 | (addr << 24))
+
+    def set_uart_baudrate(self, baudrate):
+        try:
+            baudrate = _uart_baud_table[baudrate]
+        except KeyError:
+            raise ValueError("invalid baudrate")
+        self._fcmd2("<BBB", 0x18, baudrate)
+
+    def set_startup_deco(self, value):
+        self._fcmd2("<BBB", 0x19, value)
+
+    def save_to_flash(self):
+        self._send(b"\x02fn")
+
+    #### PIXEL ACCESS ####
+
+    def set_pixel(self, x, y, c):
+        self._fcmd2b("<BBBBH", 0x41, x, y, c)
+
+    def get_pixel(self, x, y):
+        self._fcmd2("<BBBB", 0x61, x, y)
+        t = 1000
+        while t:
+            self.i2c.readfrom_into(self.i2c_addr, self.buf1)
+            if self.buf1[0] >= 2:
+                self.i2c.readfrom_into(self.i2c_addr, self.buf[3])
+                return self.buf[3][1] | self.buf[3][2] << 8
+            t -= 1
+            sleep_ms(1)
+        raise OSError(uerrno.ETIMEDOUT)
+
+    def get_line(self, x, y, buf):
+        l = len(buf) // 2
+        self._fcmd2b("<BBBBB", 0x10, l, x, y)
+        l *= 2
+        t = 1000
+        while t:
+            self.i2c.readfrom_into(self.i2c_addr, self.buf1)
+            if self.buf1[0] >= l:
+                self.i2c.readfrom_into(self.i2c_addr, buf)
+                return
+            t -= 1
+            sleep_ms(1)
+        raise OSError(uerrno.ETIMEDOUT)
+
+    def screen_dump(self, buf, x=0, y=0, w=None, h=None):
+        if w is None:
+            w = self.w - x
+        if h is None:
+            h = self.h - y
+        if w <= 127:
+            line = bytearray(2 * w + 1)
+            line2 = None
+        else:
+            # split line if more than 254 bytes needed
+            buflen = (w + 1) // 2
+            line = bytearray(2 * buflen + 1)
+            line2 = memoryview(line)[: 2 * (w - buflen) + 1]
+        for i in range(min(len(buf) // (2 * w), h)):
+            ix = i * w * 2
+            self.get_line(x, y + i, line)
+            buf[ix : ix + len(line) - 1] = memoryview(line)[1:]
+            ix += len(line) - 1
+            if line2:
+                self.get_line(x + buflen, y + i, line2)
+                buf[ix : ix + len(line2) - 1] = memoryview(line2)[1:]
+                ix += len(line2) - 1
+
+    def screen_load(self, buf):
+        l = self.w * self.h * 2 + 2
+        self._fcmd2b("<BBHBBB", 0x70, l, 16, self.w, self.h)
+        n = 0
+        ar = memoryview(buf)
+        while n < len(buf):
+            if len(buf) - n >= 0x200:
+                self._send(ar[n : n + 0x200])
+                n += 0x200
+            else:
+                self._send(ar[n:])
+                while n < self.w * self.h * 2:
+                    self._send(b"\x00")
+                    n += 1
+
+    #### TEXT COMMANDS ####
+
+    def set_pos(self, x, y):
+        self._fcmd2("<BBBB", 0x58, x, y)
+
+    def set_text_color(self, fg, bg):
+        self._fcmd2("<BBHH", 0x63, fg, bg)
+
+    def set_font(self, font, scale=0, bold=0, trans=0, scroll=0):
+        self._fcmd2(
+            "<BBBB",
+            0x46,
+            (scroll << 7) | (trans << 6) | ((font & 3) << 4) | (bold & 0xF),
+            scale & 0xFF,
+        )
+
+    def write(self, s):
+        # TODO: eventually check for room in LCD input queue
+        self._send(s)
+
+    #### PRIMITIVE DRAWING COMMANDS ####
+
+    def set_pen(self, line, fill):
+        self._fcmd2("<BBHH", 0x50, line, fill)
+
+    def erase(self):
+        self._send(b"\x02\x45")
+
+    def dot(self, x, y):
+        if 0 <= x < self.w and 0 <= y < self.h:
+            self._fcmd2("<BBBB", 0x4B, x, y)
+
+    def rect(self, x, y, w, h, cmd=0x72):
+        if x + w <= 0 or y + h <= 0 or x >= self.w or y >= self.h:
+            return
+        elif x < 0 or y < 0:
+            left = top = True
+            if x < 0:
+                left = False
+                w += x
+                x = 0
+            if y < 0:
+                top = False
+                h += y
+                y = 0
+            if cmd == 0x51 or cmd == 0x72:
+                # draw interior
+                self._fcmd2b("<BBBBBB", 0x51, x, y, min(w, 255), min(h, 255))
+            if cmd == 0x57 or cmd == 0x72:
+                # draw outline
+                if left:
+                    self._fcmd2b("<BBBBBB", 0x57, x, y, 1, min(h, 255))
+                if top:
+                    self._fcmd2b("<BBBBBB", 0x57, x, y, min(w, 255), 1)
+                if x + w < self.w:
+                    self._fcmd2b("<BBBBBB", 0x57, x + w, y, 1, min(h, 255))
+                if y + h < self.h:
+                    self._fcmd2b("<BBBBBB", 0x57, x, y + h, min(w, 255), 1)
+        else:
+            self._fcmd2b("<BBBBBB", cmd, x, y, min(w, 255), min(h, 255))
+
+    def rect_outline(self, x, y, w, h):
+        self.rect(x, y, w, h, 0x57)
+
+    def rect_interior(self, x, y, w, h):
+        self.rect(x, y, w, h, 0x51)
+
+    def line(self, x1, y1, x2, y2):
+        ar4 = self.array4
+        ar4[0] = x1
+        ar4[1] = y1
+        ar4[2] = x2
+        ar4[3] = y2
+        if self.clip_line(ar4, self.w, self.h):
+            self._fcmd2b("<BBBBBB", 0x4C, ar4[0], ar4[1], ar4[2], ar4[3])
+
+    def dot_no_clip(self, x, y):
+        self._fcmd2("<BBBB", 0x4B, x, y)
+
+    def rect_no_clip(self, x, y, w, h):
+        self._fcmd2b("<BBBBBB", 0x72, x, y, w, h)
+
+    def rect_outline_no_clip(self, x, y, w, h):
+        self._fcmd2b("<BBBBBB", 0x57, x, y, w, h)
+
+    def rect_interior_no_clip(self, x, y, w, h):
+        self._fcmd2b("<BBBBBB", 0x51, x, y, w, h)
+
+    def line_no_clip(self, x1, y1, x2, y2):
+        self._fcmd2b("<BBBBBB", 0x4C, x1, y1, x2, y2)
+
+    def poly_dot(self, data):
+        if len(data) & 1:
+            raise ValueError("must specify even number of bytes")
+        self._fcmd2("<BBB", 0x71, len(data) // 2)
+        self._send(data)
+
+    def poly_line(self, data):
+        if len(data) & 1:
+            raise ValueError("must specify even number of bytes")
+        self._fcmd2("<BBB", 0x78, len(data) // 2)
+        self._send(data)
+
+    #### TOUCH COMMANDS ####
+
+    def touch_config(self, calib=False, save=False, irq=None):
+        self._fcmd2("<BBBB", 0x7A, (irq is not None) << 2 | save << 1 | calib, bool(irq) << 7)
+
+    def is_touched(self):
+        self._send(b"\x02T")
+        b = self.buf[4]
+        self._waitfor(3, b)
+        return b[1] >> 7 != 0
+
+    def get_touch(self):
+        self._send(b"\x02T")  # implicit LCD output flush
+        b = self.buf[4]
+        self._waitfor(3, b)
+        return b[1] >> 7, b[2], b[3]
+
+    #### ADVANCED COMMANDS ####
+
+    def set_spi_win(self, x, y, w, h):
+        pack_into(
+            "<BBBHHHHHHHH", self.buf19, 0, 2, 0x55, 10, x, y, x + w - 1, y + h - 1, 0, 0, 0, 0xFFFF
+        )
+        self._send(self.buf19)
+
+    def fast_spi(self, flush=True):
+        self._send(b"\x02\x12")
+        if flush:
+            self.oflush()
+        return self.spi
+
+    def show_framebuf(self, buf):
+        self.fast_spi().write(buf)
+
+    def set_scroll(self, on):
+        self._fcmd2("<BBB", 0x15, on)
+
+    def set_scroll_win(self, win, x=-1, y=0, w=0, h=0, vec=0, pat=0, fill=0x07E0, color=0):
+        pack_into("<BBBHHHHHHHH", self.buf19, 0, 2, 0x55, win, x, y, w, h, vec, pat, fill, color)
+        self._send(self.buf19)
+
+    def set_scroll_win_param(self, win, param, value):
+        self._fcmd2b("<BBBBH", 0x75, win, param, value)
+
+    def set_scroll_buf(self, s):
+        l = len(s)
+        if l > 32:
+            raise ValueError("length must be 32 or less")
+        self._fcmd2("<BBB", 0x11, l)
+        self._send(s)
+
+    def jpeg_start(self, l):
+        if l > 0xFFFF:
+            raise ValueError("length must be 65535 or less")
+        self.oflush()
+        self._fcmd2("<BBH", 0x6A, l)
+
+    def jpeg_data(self, buf):
+        self._send(buf)
+
+    def jpeg(self, buf):
+        self.jpeg_start(len(buf))
+        self.jpeg_data(buf)
+
+    def feed_wdt(self):
+        self._send(b"\x02\x17")
+
+    def reset(self):
+        self._send(b"\x02Y\xef\xbe\xad\xde")
+        sleep_ms(15)
diff --git a/micropython/drivers/display/lcd160cr/lcd160cr_test.py b/micropython/drivers/display/lcd160cr/lcd160cr_test.py
new file mode 100644
index 000000000..883c7d3b7
--- /dev/null
+++ b/micropython/drivers/display/lcd160cr/lcd160cr_test.py
@@ -0,0 +1,187 @@
+# Driver test for official MicroPython LCD160CR display
+# MIT license; Copyright (c) 2017 Damien P. George
+
+import time, math, framebuf, lcd160cr
+
+
+def get_lcd(lcd):
+    if type(lcd) is str:
+        lcd = lcd160cr.LCD160CR(lcd)
+    return lcd
+
+
+def show_adc(lcd, adc):
+    data = [adc.read_core_temp(), adc.read_core_vbat(), 3.3]
+    try:
+        data[2] = adc.read_vref()
+    except:
+        pass
+    for i in range(3):
+        lcd.set_text_color((825, 1625, 1600)[i], 0)
+        if lcd.h == 160:
+            lcd.set_font(2)
+            lcd.set_pos(0, 100 + i * 16)
+        else:
+            lcd.set_font(2, trans=1)
+            lcd.set_pos(0, lcd.h - 60 + i * 16)
+        lcd.write("%4s: " % ("TEMP", "VBAT", "VREF")[i])
+        if i > 0:
+            s = "%6.3fV" % data[i]
+        else:
+            s = "%5.1f°C" % data[i]
+        if lcd.h == 160:
+            lcd.set_font(1, bold=0, scale=1)
+        else:
+            lcd.set_font(1, bold=0, scale=1, trans=1)
+            lcd.set_pos(45, lcd.h - 60 + i * 16)
+        lcd.write(s)
+
+
+def test_features(lcd, orient=lcd160cr.PORTRAIT):
+    # if we run on pyboard then use ADC and RTC features
+    try:
+        import pyb
+
+        adc = pyb.ADCAll(12, 0xF0000)
+        rtc = pyb.RTC()
+    except:
+        adc = None
+        rtc = None
+
+    # set orientation and clear screen
+    lcd = get_lcd(lcd)
+    lcd.set_orient(orient)
+    lcd.set_pen(0, 0)
+    lcd.erase()
+
+    # create M-logo
+    mlogo = framebuf.FrameBuffer(bytearray(17 * 17 * 2), 17, 17, framebuf.RGB565)
+    mlogo.fill(0)
+    mlogo.fill_rect(1, 1, 15, 15, 0xFFFFFF)
+    mlogo.vline(4, 4, 12, 0)
+    mlogo.vline(8, 1, 12, 0)
+    mlogo.vline(12, 4, 12, 0)
+    mlogo.vline(14, 13, 2, 0)
+
+    # create inline framebuf
+    offx = 14
+    offy = 19
+    w = 100
+    h = 75
+    fbuf = framebuf.FrameBuffer(bytearray(w * h * 2), w, h, framebuf.RGB565)
+    lcd.set_spi_win(offx, offy, w, h)
+
+    # initialise loop parameters
+    tx = ty = 0
+    t0 = time.ticks_us()
+
+    for i in range(300):
+        # update position of cross-hair
+        t, tx2, ty2 = lcd.get_touch()
+        if t:
+            tx2 -= offx
+            ty2 -= offy
+            if tx2 >= 0 and ty2 >= 0 and tx2 < w and ty2 < h:
+                tx, ty = tx2, ty2
+        else:
+            tx = (tx + 1) % w
+            ty = (ty + 1) % h
+
+        # create and show the inline framebuf
+        fbuf.fill(lcd.rgb(128 + int(64 * math.cos(0.1 * i)), 128, 192))
+        fbuf.line(
+            w // 2,
+            h // 2,
+            w // 2 + int(40 * math.cos(0.2 * i)),
+            h // 2 + int(40 * math.sin(0.2 * i)),
+            lcd.rgb(128, 255, 64),
+        )
+        fbuf.hline(0, ty, w, lcd.rgb(64, 64, 64))
+        fbuf.vline(tx, 0, h, lcd.rgb(64, 64, 64))
+        fbuf.rect(tx - 3, ty - 3, 7, 7, lcd.rgb(64, 64, 64))
+        for phase in (-0.2, 0, 0.2):
+            x = w // 2 - 8 + int(50 * math.cos(0.05 * i + phase))
+            y = h // 2 - 8 + int(32 * math.sin(0.05 * i + phase))
+            fbuf.blit(mlogo, x, y)
+        for j in range(-3, 3):
+            fbuf.text(
+                "MicroPython",
+                5,
+                h // 2 + 9 * j + int(20 * math.sin(0.1 * (i + j))),
+                lcd.rgb(128 + 10 * j, 0, 128 - 10 * j),
+            )
+        lcd.show_framebuf(fbuf)
+
+        # show results from the ADC
+        if adc:
+            show_adc(lcd, adc)
+
+        # show the time
+        if rtc:
+            lcd.set_pos(2, 0)
+            lcd.set_font(1)
+            t = rtc.datetime()
+            lcd.write(
+                "%4d-%02d-%02d %2d:%02d:%02d.%01d"
+                % (t[0], t[1], t[2], t[4], t[5], t[6], t[7] // 100000)
+            )
+
+        # compute the frame rate
+        t1 = time.ticks_us()
+        dt = time.ticks_diff(t1, t0)
+        t0 = t1
+
+        # show the frame rate
+        lcd.set_pos(2, 9)
+        lcd.write("%.2f fps" % (1000000 / dt))
+
+
+def test_mandel(lcd, orient=lcd160cr.PORTRAIT):
+    # set orientation and clear screen
+    lcd = get_lcd(lcd)
+    lcd.set_orient(orient)
+    lcd.set_pen(0, 0xFFFF)
+    lcd.erase()
+
+    # function to compute Mandelbrot pixels
+    def in_set(c):
+        z = 0
+        for i in range(32):
+            z = z * z + c
+            if abs(z) > 100:
+                return i
+        return 0
+
+    # cache width and height of LCD
+    w = lcd.w
+    h = lcd.h
+
+    # create the buffer for each line and set SPI parameters
+    line = bytearray(w * 2)
+    lcd.set_spi_win(0, 0, w, h)
+    spi = lcd.fast_spi()
+
+    # draw the Mandelbrot set line-by-line
+    hh = (h - 1) / 3.2
+    ww = (w - 1) / 2.4
+    for v in range(h):
+        for u in range(w):
+            c = in_set((v / hh - 2.3) + (u / ww - 1.2) * 1j)
+            if c < 16:
+                rgb = c << 12 | c << 6
+            else:
+                rgb = 0xF800 | c << 6
+            line[2 * u] = rgb
+            line[2 * u + 1] = rgb >> 8
+        spi.write(line)
+
+
+def test_all(lcd, orient=lcd160cr.PORTRAIT):
+    lcd = get_lcd(lcd)
+    test_features(lcd, orient)
+    test_mandel(lcd, orient)
+
+
+print("To run all tests: test_all(<lcd>)")
+print("Individual tests are: test_features, test_mandel")
+print('<lcd> argument should be a connection, eg "X", or an LCD160CR object')
diff --git a/micropython/drivers/display/lcd160cr/manifest.py b/micropython/drivers/display/lcd160cr/manifest.py
new file mode 100644
index 000000000..62a19eb2b
--- /dev/null
+++ b/micropython/drivers/display/lcd160cr/manifest.py
@@ -0,0 +1,6 @@
+options.defaults(test=False)
+
+module("lcd160cr.py", opt=3)
+
+if options.test:
+    module("lcd160cr_test.py", opt=3)

From a5e2f3239c8023cf8d009fafa948d7f139cb87ff Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:18:36 +1000
Subject: [PATCH 069/343] micropython/drivers: Move "ssd1306" display driver
 from main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../drivers/display/ssd1306/manifest.py       |   1 +
 .../drivers/display/ssd1306/ssd1306.py        | 163 ++++++++++++++++++
 2 files changed, 164 insertions(+)
 create mode 100644 micropython/drivers/display/ssd1306/manifest.py
 create mode 100644 micropython/drivers/display/ssd1306/ssd1306.py

diff --git a/micropython/drivers/display/ssd1306/manifest.py b/micropython/drivers/display/ssd1306/manifest.py
new file mode 100644
index 000000000..51580080e
--- /dev/null
+++ b/micropython/drivers/display/ssd1306/manifest.py
@@ -0,0 +1 @@
+module("ssd1306.py", opt=3)
diff --git a/micropython/drivers/display/ssd1306/ssd1306.py b/micropython/drivers/display/ssd1306/ssd1306.py
new file mode 100644
index 000000000..a504cdadc
--- /dev/null
+++ b/micropython/drivers/display/ssd1306/ssd1306.py
@@ -0,0 +1,163 @@
+# MicroPython SSD1306 OLED driver, I2C and SPI interfaces
+
+from micropython import const
+import framebuf
+
+
+# register definitions
+SET_CONTRAST = const(0x81)
+SET_ENTIRE_ON = const(0xA4)
+SET_NORM_INV = const(0xA6)
+SET_DISP = const(0xAE)
+SET_MEM_ADDR = const(0x20)
+SET_COL_ADDR = const(0x21)
+SET_PAGE_ADDR = const(0x22)
+SET_DISP_START_LINE = const(0x40)
+SET_SEG_REMAP = const(0xA0)
+SET_MUX_RATIO = const(0xA8)
+SET_IREF_SELECT = const(0xAD)
+SET_COM_OUT_DIR = const(0xC0)
+SET_DISP_OFFSET = const(0xD3)
+SET_COM_PIN_CFG = const(0xDA)
+SET_DISP_CLK_DIV = const(0xD5)
+SET_PRECHARGE = const(0xD9)
+SET_VCOM_DESEL = const(0xDB)
+SET_CHARGE_PUMP = const(0x8D)
+
+# Subclassing FrameBuffer provides support for graphics primitives
+# http://docs.micropython.org/en/latest/pyboard/library/framebuf.html
+class SSD1306(framebuf.FrameBuffer):
+    def __init__(self, width, height, external_vcc):
+        self.width = width
+        self.height = height
+        self.external_vcc = external_vcc
+        self.pages = self.height // 8
+        self.buffer = bytearray(self.pages * self.width)
+        super().__init__(self.buffer, self.width, self.height, framebuf.MONO_VLSB)
+        self.init_display()
+
+    def init_display(self):
+        for cmd in (
+            SET_DISP,  # display off
+            # address setting
+            SET_MEM_ADDR,
+            0x00,  # horizontal
+            # resolution and layout
+            SET_DISP_START_LINE,  # start at line 0
+            SET_SEG_REMAP | 0x01,  # column addr 127 mapped to SEG0
+            SET_MUX_RATIO,
+            self.height - 1,
+            SET_COM_OUT_DIR | 0x08,  # scan from COM[N] to COM0
+            SET_DISP_OFFSET,
+            0x00,
+            SET_COM_PIN_CFG,
+            0x02 if self.width > 2 * self.height else 0x12,
+            # timing and driving scheme
+            SET_DISP_CLK_DIV,
+            0x80,
+            SET_PRECHARGE,
+            0x22 if self.external_vcc else 0xF1,
+            SET_VCOM_DESEL,
+            0x30,  # 0.83*Vcc
+            # display
+            SET_CONTRAST,
+            0xFF,  # maximum
+            SET_ENTIRE_ON,  # output follows RAM contents
+            SET_NORM_INV,  # not inverted
+            SET_IREF_SELECT,
+            0x30,  # enable internal IREF during display on
+            # charge pump
+            SET_CHARGE_PUMP,
+            0x10 if self.external_vcc else 0x14,
+            SET_DISP | 0x01,  # display on
+        ):  # on
+            self.write_cmd(cmd)
+        self.fill(0)
+        self.show()
+
+    def poweroff(self):
+        self.write_cmd(SET_DISP)
+
+    def poweron(self):
+        self.write_cmd(SET_DISP | 0x01)
+
+    def contrast(self, contrast):
+        self.write_cmd(SET_CONTRAST)
+        self.write_cmd(contrast)
+
+    def invert(self, invert):
+        self.write_cmd(SET_NORM_INV | (invert & 1))
+
+    def rotate(self, rotate):
+        self.write_cmd(SET_COM_OUT_DIR | ((rotate & 1) << 3))
+        self.write_cmd(SET_SEG_REMAP | (rotate & 1))
+
+    def show(self):
+        x0 = 0
+        x1 = self.width - 1
+        if self.width != 128:
+            # narrow displays use centred columns
+            col_offset = (128 - self.width) // 2
+            x0 += col_offset
+            x1 += col_offset
+        self.write_cmd(SET_COL_ADDR)
+        self.write_cmd(x0)
+        self.write_cmd(x1)
+        self.write_cmd(SET_PAGE_ADDR)
+        self.write_cmd(0)
+        self.write_cmd(self.pages - 1)
+        self.write_data(self.buffer)
+
+
+class SSD1306_I2C(SSD1306):
+    def __init__(self, width, height, i2c, addr=0x3C, external_vcc=False):
+        self.i2c = i2c
+        self.addr = addr
+        self.temp = bytearray(2)
+        self.write_list = [b"\x40", None]  # Co=0, D/C#=1
+        super().__init__(width, height, external_vcc)
+
+    def write_cmd(self, cmd):
+        self.temp[0] = 0x80  # Co=1, D/C#=0
+        self.temp[1] = cmd
+        self.i2c.writeto(self.addr, self.temp)
+
+    def write_data(self, buf):
+        self.write_list[1] = buf
+        self.i2c.writevto(self.addr, self.write_list)
+
+
+class SSD1306_SPI(SSD1306):
+    def __init__(self, width, height, spi, dc, res, cs, external_vcc=False):
+        self.rate = 10 * 1024 * 1024
+        dc.init(dc.OUT, value=0)
+        res.init(res.OUT, value=0)
+        cs.init(cs.OUT, value=1)
+        self.spi = spi
+        self.dc = dc
+        self.res = res
+        self.cs = cs
+        import time
+
+        self.res(1)
+        time.sleep_ms(1)
+        self.res(0)
+        time.sleep_ms(10)
+        self.res(1)
+        super().__init__(width, height, external_vcc)
+
+    def write_cmd(self, cmd):
+        self.spi.init(baudrate=self.rate, polarity=0, phase=0)
+        self.cs(1)
+        self.dc(0)
+        self.cs(0)
+        self.spi.write(bytearray([cmd]))
+        self.cs(1)
+
+    def write_data(self, buf):
+        self.spi.init(baudrate=self.rate, polarity=0, phase=0)
+        self.cs(1)
+        self.dc(1)
+        self.cs(0)
+        self.spi.write(buf)
+        self.cs(1)

From fd84cd92f3e973b3fe640ef351b92ba95b07088a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:19:00 +1000
Subject: [PATCH 070/343] micropython/drivers: Move "lsm9ds1" imu driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/imu/lsm9ds1/lsm9ds1.py  | 189 ++++++++++++++++++++
 micropython/drivers/imu/lsm9ds1/manifest.py |   1 +
 2 files changed, 190 insertions(+)
 create mode 100644 micropython/drivers/imu/lsm9ds1/lsm9ds1.py
 create mode 100644 micropython/drivers/imu/lsm9ds1/manifest.py

diff --git a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
new file mode 100644
index 000000000..5d9942a7b
--- /dev/null
+++ b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
@@ -0,0 +1,189 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2013, 2014 Damien P. George
+
+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.
+
+
+LSM9DS1 - 9DOF inertial sensor of STMicro driver for MicroPython.
+The sensor contains an accelerometer / gyroscope / magnetometer
+Uses the internal FIFO to store up to 16 gyro/accel data, use the iter_accel_gyro generator to access it.
+
+Example usage:
+
+import time
+from lsm9ds1 import LSM9DS1
+from machine import Pin, I2C
+
+lsm = LSM9DS1(I2C(1, scl=Pin(15), sda=Pin(14)))
+
+while (True):
+    #for g,a in lsm.iter_accel_gyro(): print(g,a)    # using fifo
+    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.accel()))
+    print('Magnetometer:  x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.magnet()))
+    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.gyro()))
+    print("")
+    time.sleep_ms(100)
+"""
+import array
+
+
+_WHO_AM_I = const(0xF)
+_CTRL_REG1_G = const(0x10)
+_INT_GEN_SRC_G = const(0x14)
+_OUT_TEMP = const(0x15)
+_OUT_G = const(0x18)
+_CTRL_REG4_G = const(0x1E)
+_STATUS_REG = const(0x27)
+_OUT_XL = const(0x28)
+_FIFO_CTRL_REG = const(0x2E)
+_FIFO_SRC = const(0x2F)
+_OFFSET_REG_X_M = const(0x05)
+_CTRL_REG1_M = const(0x20)
+_OUT_M = const(0x28)
+_SCALE_GYRO = const(((245, 0), (500, 1), (2000, 3)))
+_SCALE_ACCEL = const(((2, 0), (4, 2), (8, 3), (16, 1)))
+
+
+class LSM9DS1:
+    def __init__(self, i2c, address_gyro=0x6B, address_magnet=0x1E):
+        self.i2c = i2c
+        self.address_gyro = address_gyro
+        self.address_magnet = address_magnet
+        # check id's of accelerometer/gyro and magnetometer
+        if (self.magent_id() != b"=") or (self.gyro_id() != b"h"):
+            raise OSError(
+                "Invalid LSM9DS1 device, using address {}/{}".format(address_gyro, address_magnet)
+            )
+        # allocate scratch buffer for efficient conversions and memread op's
+        self.scratch = array.array("B", [0, 0, 0, 0, 0, 0])
+        self.scratch_int = array.array("h", [0, 0, 0])
+        self.init_gyro_accel()
+        self.init_magnetometer()
+
+    def init_gyro_accel(self, sample_rate=6, scale_gyro=0, scale_accel=0):
+        """Initalizes Gyro and Accelerator.
+        sample rate: 0-6 (off, 14.9Hz, 59.5Hz, 119Hz, 238Hz, 476Hz, 952Hz)
+        scale_gyro: 0-2 (245dps, 500dps, 2000dps )
+        scale_accel: 0-3 (+/-2g, +/-4g, +/-8g, +-16g)
+        """
+        assert sample_rate <= 6, "invalid sampling rate: %d" % sample_rate
+        assert scale_gyro <= 2, "invalid gyro scaling: %d" % scale_gyro
+        assert scale_accel <= 3, "invalid accelerometer scaling: %d" % scale_accel
+
+        i2c = self.i2c
+        addr = self.address_gyro
+        mv = memoryview(self.scratch)
+        # angular control registers 1-3 / Orientation
+        mv[0] = ((sample_rate & 0x07) << 5) | ((_SCALE_GYRO[scale_gyro][1] & 0x3) << 3)
+        mv[1:4] = b"\x00\x00\x00"
+        i2c.writeto_mem(addr, _CTRL_REG1_G, mv[:5])
+        # ctrl4 - enable x,y,z, outputs, no irq latching, no 4D
+        # ctrl5 - enable all axes, no decimation
+        # ctrl6 - set scaling and sample rate of accel
+        # ctrl7,8 - leave at default values
+        # ctrl9 - FIFO enabled
+        mv[0] = mv[1] = 0x38
+        mv[2] = ((sample_rate & 7) << 5) | ((_SCALE_ACCEL[scale_accel][1] & 0x3) << 3)
+        mv[3] = 0x00
+        mv[4] = 0x4
+        mv[5] = 0x2
+        i2c.writeto_mem(addr, _CTRL_REG4_G, mv[:6])
+
+        # fifo: use continous mode (overwrite old data if overflow)
+        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\x00")
+        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\xc0")
+
+        self.scale_gyro = 32768 / _SCALE_GYRO[scale_gyro][0]
+        self.scale_accel = 32768 / _SCALE_ACCEL[scale_accel][0]
+
+    def init_magnetometer(self, sample_rate=7, scale_magnet=0):
+        """
+        sample rates = 0-7 (0.625, 1.25, 2.5, 5, 10, 20, 40, 80Hz)
+        scaling = 0-3 (+/-4, +/-8, +/-12, +/-16 Gauss)
+        """
+        assert sample_rate < 8, "invalid sample rate: %d (0-7)" % sample_rate
+        assert scale_magnet < 4, "invalid scaling: %d (0-3)" % scale_magnet
+        i2c = self.i2c
+        addr = self.address_magnet
+        mv = memoryview(self.scratch)
+        mv[0] = 0x40 | (sample_rate << 2)  # ctrl1: high performance mode
+        mv[1] = scale_magnet << 5  # ctrl2: scale, normal mode, no reset
+        mv[2] = 0x00  # ctrl3: continous conversion, no low power, I2C
+        mv[3] = 0x08  # ctrl4: high performance z-axis
+        mv[4] = 0x00  # ctr5: no fast read, no block update
+        i2c.writeto_mem(addr, _CTRL_REG1_M, mv[:5])
+        self.scale_factor_magnet = 32768 / ((scale_magnet + 1) * 4)
+
+    def calibrate_magnet(self, offset):
+        """
+        offset is a magnet vecor that will be substracted by the magnetometer
+        for each measurement. It is written to the magnetometer's offset register
+        """
+        offset = [int(i * self.scale_factor_magnet) for i in offset]
+        mv = memoryview(self.scratch)
+        mv[0] = offset[0] & 0xFF
+        mv[1] = offset[0] >> 8
+        mv[2] = offset[1] & 0xFF
+        mv[3] = offset[1] >> 8
+        mv[4] = offset[2] & 0xFF
+        mv[5] = offset[2] >> 8
+        self.i2c.writeto_mem(self.address_magnet, _OFFSET_REG_X_M, mv[:6])
+
+    def gyro_id(self):
+        return self.i2c.readfrom_mem(self.address_gyro, _WHO_AM_I, 1)
+
+    def magent_id(self):
+        return self.i2c.readfrom_mem(self.address_magnet, _WHO_AM_I, 1)
+
+    def magnet(self):
+        """Returns magnetometer vector in gauss.
+        raw_values: if True, the non-scaled adc values are returned
+        """
+        mv = memoryview(self.scratch_int)
+        f = self.scale_factor_magnet
+        self.i2c.readfrom_mem_into(self.address_magnet, _OUT_M | 0x80, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def gyro(self):
+        """Returns gyroscope vector in degrees/sec."""
+        mv = memoryview(self.scratch_int)
+        f = self.scale_gyro
+        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_G | 0x80, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def accel(self):
+        """Returns acceleration vector in gravity units (9.81m/s^2)."""
+        mv = memoryview(self.scratch_int)
+        f = self.scale_accel
+        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_XL | 0x80, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def iter_accel_gyro(self):
+        """A generator that returns tuples of (gyro,accelerometer) data from the fifo."""
+        while True:
+            fifo_state = int.from_bytes(
+                self.i2c.readfrom_mem(self.address_gyro, _FIFO_SRC, 1), "big"
+            )
+            if fifo_state & 0x3F:
+                # print("Available samples=%d" % (fifo_state & 0x1f))
+                yield self.gyro(), self.accel()
+            else:
+                break
diff --git a/micropython/drivers/imu/lsm9ds1/manifest.py b/micropython/drivers/imu/lsm9ds1/manifest.py
new file mode 100644
index 000000000..6779362de
--- /dev/null
+++ b/micropython/drivers/imu/lsm9ds1/manifest.py
@@ -0,0 +1 @@
+module("lsm9ds1.py", opt=3)

From 75d129b96f480acd8ec918657d20b09023551572 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:19:13 +1000
Subject: [PATCH 071/343] micropython/drivers: Move "lsm6sox" imu driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/imu/lsm6dsox/lsm6dsox.py  | 271 ++++++++++++++++++
 .../drivers/imu/lsm6dsox/lsm6dsox_basic.py    |  15 +
 .../drivers/imu/lsm6dsox/lsm6dsox_mlc.py      |  48 ++++
 micropython/drivers/imu/lsm6dsox/manifest.py  |   1 +
 4 files changed, 335 insertions(+)
 create mode 100644 micropython/drivers/imu/lsm6dsox/lsm6dsox.py
 create mode 100644 micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py
 create mode 100644 micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
 create mode 100644 micropython/drivers/imu/lsm6dsox/manifest.py

diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
new file mode 100644
index 000000000..98e19fa4c
--- /dev/null
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
@@ -0,0 +1,271 @@
+"""
+LSM6DSOX STMicro driver for MicroPython based on LSM9DS1:
+Source repo: https://github.com/hoihu/projects/tree/master/raspi-hat
+
+The MIT License (MIT)
+
+Copyright (c) 2021 Damien P. George
+Copyright (c) 2021-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+
+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.
+
+Basic example usage:
+
+import time
+from lsm6dsox import LSM6DSOX
+
+from machine import Pin, SPI, I2C
+# Init in I2C mode.
+lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
+
+# Or init in SPI mode.
+#lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
+
+while (True):
+    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_accel()))
+    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_gyro()))
+    print("")
+    time.sleep_ms(100)
+"""
+
+import array
+from micropython import const
+
+
+class LSM6DSOX:
+    _CTRL3_C = const(0x12)
+    _CTRL1_XL = const(0x10)
+    _CTRL8_XL = const(0x17)
+    _CTRL9_XL = const(0x18)
+
+    _CTRL2_G = const(0x11)
+    _CTRL7_G = const(0x16)
+
+    _OUTX_L_G = const(0x22)
+    _OUTX_L_XL = const(0x28)
+    _MLC_STATUS = const(0x38)
+
+    _DEFAULT_ADDR = const(0x6A)
+    _WHO_AM_I_REG = const(0x0F)
+
+    _FUNC_CFG_ACCESS = const(0x01)
+    _FUNC_CFG_BANK_USER = const(0)
+    _FUNC_CFG_BANK_HUB = const(1)
+    _FUNC_CFG_BANK_EMBED = const(2)
+
+    _MLC0_SRC = const(0x70)
+    _MLC_INT1 = const(0x0D)
+    _TAP_CFG0 = const(0x56)
+
+    _EMB_FUNC_EN_A = const(0x04)
+    _EMB_FUNC_EN_B = const(0x05)
+
+    def __init__(
+        self,
+        bus,
+        cs_pin=None,
+        address=_DEFAULT_ADDR,
+        gyro_odr=104,
+        accel_odr=104,
+        gyro_scale=2000,
+        accel_scale=4,
+        ucf=None,
+    ):
+        """Initalizes Gyro and Accelerator.
+        accel_odr: (0, 1.6Hz, 3.33Hz, 6.66Hz, 12.5Hz, 26Hz, 52Hz, 104Hz, 208Hz, 416Hz, 888Hz)
+        gyro_odr:  (0, 1.6Hz, 3.33Hz, 6.66Hz, 12.5Hz, 26Hz, 52Hz, 104Hz, 208Hz, 416Hz, 888Hz)
+        gyro_scale:  (245dps, 500dps, 1000dps, 2000dps)
+        accel_scale: (+/-2g, +/-4g, +/-8g, +-16g)
+        ucf: MLC program to load.
+        """
+        self.bus = bus
+        self.cs_pin = cs_pin
+        self.address = address
+        self._use_i2c = hasattr(self.bus, "readfrom_mem")
+
+        if not self._use_i2c and cs_pin is None:
+            raise ValueError("A CS pin must be provided in SPI mode")
+
+        # check the id of the Accelerometer/Gyro
+        if self.__read_reg(_WHO_AM_I_REG) != 108:
+            raise OSError("No LSM6DS device was found at address 0x%x" % (self.address))
+
+        # allocate scratch buffer for efficient conversions and memread op's
+        self.scratch_int = array.array("h", [0, 0, 0])
+
+        SCALE_GYRO = {250: 0, 500: 1, 1000: 2, 2000: 3}
+        SCALE_ACCEL = {2: 0, 4: 2, 8: 3, 16: 1}
+        # XL_HM_MODE = 0 by default. G_HM_MODE = 0 by default.
+        ODR = {
+            0: 0x00,
+            1.6: 0x08,
+            3.33: 0x09,
+            6.66: 0x0A,
+            12.5: 0x01,
+            26: 0x02,
+            52: 0x03,
+            104: 0x04,
+            208: 0x05,
+            416: 0x06,
+            888: 0x07,
+        }
+
+        gyro_odr = round(gyro_odr, 2)
+        accel_odr = round(accel_odr, 2)
+
+        # Sanity checks
+        if not gyro_odr in ODR:
+            raise ValueError("Invalid sampling rate: %d" % accel_odr)
+        if not gyro_scale in SCALE_GYRO:
+            raise ValueError("invalid gyro scaling: %d" % gyro_scale)
+        if not accel_odr in ODR:
+            raise ValueError("Invalid sampling rate: %d" % accel_odr)
+        if not accel_scale in SCALE_ACCEL:
+            raise ValueError("invalid accelerometer scaling: %d" % accel_scale)
+
+        # Soft-reset the device.
+        self.reset()
+
+        # Load and configure MLC if UCF file is provided
+        if ucf != None:
+            self.load_mlc(ucf)
+
+        # Set Gyroscope datarate and scale.
+        # Note output from LPF2 second filtering stage is selected. See Figure 18.
+        self.__write_reg(_CTRL1_XL, (ODR[accel_odr] << 4) | (SCALE_ACCEL[accel_scale] << 2) | 2)
+
+        # Enable LPF2 and HPF fast-settling mode, ODR/4
+        self.__write_reg(_CTRL8_XL, 0x09)
+
+        # Set Gyroscope datarate and scale.
+        self.__write_reg(_CTRL2_G, (ODR[gyro_odr] << 4) | (SCALE_GYRO[gyro_scale] << 2) | 0)
+
+        self.gyro_scale = 32768 / gyro_scale
+        self.accel_scale = 32768 / accel_scale
+
+    def __read_reg(self, reg, size=1):
+        if self._use_i2c:
+            buf = self.bus.readfrom_mem(self.address, reg, size)
+        else:
+            try:
+                self.cs_pin(0)
+                self.bus.write(bytes([reg | 0x80]))
+                buf = self.bus.read(size)
+            finally:
+                self.cs_pin(1)
+        if size == 1:
+            return int(buf[0])
+        return [int(x) for x in buf]
+
+    def __write_reg(self, reg, val):
+        if self._use_i2c:
+            self.bus.writeto_mem(self.address, reg, bytes([val]))
+        else:
+            try:
+                self.cs_pin(0)
+                self.bus.write(bytes([reg, val]))
+            finally:
+                self.cs_pin(1)
+
+    def __read_reg_into(self, reg, buf):
+        if self._use_i2c:
+            self.bus.readfrom_mem_into(self.address, reg, buf)
+        else:
+            try:
+                self.cs_pin(0)
+                self.bus.write(bytes([reg | 0x80]))
+                self.bus.readinto(buf)
+            finally:
+                self.cs_pin(1)
+
+    def reset(self):
+        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x1)
+        for i in range(0, 10):
+            if (self.__read_reg(_CTRL3_C) & 0x01) == 0:
+                return
+            time.sleep_ms(10)
+        raise OSError("Failed to reset LSM6DS device.")
+
+    def set_mem_bank(self, bank):
+        cfg = self.__read_reg(_FUNC_CFG_ACCESS) & 0x3F
+        self.__write_reg(_FUNC_CFG_ACCESS, cfg | (bank << 6))
+
+    def set_embedded_functions(self, enable, emb_ab=None):
+        self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
+        if enable:
+            self.__write_reg(_EMB_FUNC_EN_A, emb_ab[0])
+            self.__write_reg(_EMB_FUNC_EN_B, emb_ab[1])
+        else:
+            emb_a = self.__read_reg(_EMB_FUNC_EN_A)
+            emb_b = self.__read_reg(_EMB_FUNC_EN_B)
+            self.__write_reg(_EMB_FUNC_EN_A, (emb_a & 0xC7))
+            self.__write_reg(_EMB_FUNC_EN_B, (emb_b & 0xE6))
+            emb_ab = (emb_a, emb_b)
+
+        self.set_mem_bank(_FUNC_CFG_BANK_USER)
+        return emb_ab
+
+    def load_mlc(self, ucf):
+        # Load MLC config from file
+        with open(ucf, "r") as ucf_file:
+            for l in ucf_file:
+                if l.startswith("Ac"):
+                    v = [int(v, 16) for v in l.strip().split(" ")[1:3]]
+                    self.__write_reg(v[0], v[1])
+
+        emb_ab = self.set_embedded_functions(False)
+
+        # Disable I3C interface
+        self.__write_reg(_CTRL9_XL, self.__read_reg(_CTRL9_XL) | 0x01)
+
+        # Enable Block Data Update
+        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x40)
+
+        # Route signals on interrupt pin 1
+        self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
+        self.__write_reg(_MLC_INT1, self.__read_reg(_MLC_INT1) & 0x01)
+        self.set_mem_bank(_FUNC_CFG_BANK_USER)
+
+        # Configure interrupt pin mode
+        self.__write_reg(_TAP_CFG0, self.__read_reg(_TAP_CFG0) | 0x41)
+
+        self.set_embedded_functions(True, emb_ab)
+
+    def read_mlc_output(self):
+        buf = None
+        if self.__read_reg(_MLC_STATUS) & 0x1:
+            self.__read_reg(0x1A, size=12)
+            self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
+            buf = self.__read_reg(_MLC0_SRC, 8)
+            self.set_mem_bank(_FUNC_CFG_BANK_USER)
+        return buf
+
+    def read_gyro(self):
+        """Returns gyroscope vector in degrees/sec."""
+        mv = memoryview(self.scratch_int)
+        f = self.gyro_scale
+        self.__read_reg_into(_OUTX_L_G, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def read_accel(self):
+        """Returns acceleration vector in gravity units (9.81m/s^2)."""
+        mv = memoryview(self.scratch_int)
+        f = self.accel_scale
+        self.__read_reg_into(_OUTX_L_XL, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py
new file mode 100644
index 000000000..0ffe9e92b
--- /dev/null
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py
@@ -0,0 +1,15 @@
+# LSM6DSOX Basic Example.
+import time
+from lsm6dsox import LSM6DSOX
+
+from machine import Pin, I2C
+
+lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
+# Or init in SPI mode.
+# lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
+
+while True:
+    print("Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_accel()))
+    print("Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_gyro()))
+    print("")
+    time.sleep_ms(100)
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
new file mode 100644
index 000000000..866498d0c
--- /dev/null
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
@@ -0,0 +1,48 @@
+# LSM6DSOX IMU MLC (Machine Learning Core) Example.
+# Download the raw UCF file, copy to storage and reset.
+
+# NOTE: The pre-trained models (UCF files) for the examples can be found here:
+# https://github.com/STMicroelectronics/STMems_Machine_Learning_Core/tree/master/application_examples/lsm6dsox
+
+import time
+from lsm6dsox import LSM6DSOX
+from machine import Pin, I2C
+
+INT_MODE = True  # Run in interrupt mode.
+INT_FLAG = False  # Set True on interrupt.
+
+
+def imu_int_handler(pin):
+    global INT_FLAG
+    INT_FLAG = True
+
+
+if INT_MODE == True:
+    int_pin = Pin(24)
+    int_pin.irq(handler=imu_int_handler, trigger=Pin.IRQ_RISING)
+
+i2c = I2C(0, scl=Pin(13), sda=Pin(12))
+
+# Vibration detection example
+UCF_FILE = "lsm6dsox_vibration_monitoring.ucf"
+UCF_LABELS = {0: "no vibration", 1: "low vibration", 2: "high vibration"}
+# NOTE: Selected data rate and scale must match the MLC data rate and scale.
+lsm = LSM6DSOX(i2c, gyro_odr=26, accel_odr=26, gyro_scale=2000, accel_scale=4, ucf=UCF_FILE)
+
+# Head gestures example
+# UCF_FILE = "lsm6dsox_head_gestures.ucf"
+# UCF_LABELS = {0:"Nod", 1:"Shake", 2:"Stationary", 3:"Swing", 4:"Walk"}
+# NOTE: Selected data rate and scale must match the MLC data rate and scale.
+# lsm = LSM6DSOX(i2c, gyro_odr=26, accel_odr=26, gyro_scale=250, accel_scale=2, ucf=UCF_FILE)
+
+print("MLC configured...")
+
+while True:
+    if INT_MODE:
+        if INT_FLAG:
+            INT_FLAG = False
+            print(UCF_LABELS[lsm.read_mlc_output()[0]])
+    else:
+        buf = lsm.read_mlc_output()
+        if buf != None:
+            print(UCF_LABELS[buf[0]])
diff --git a/micropython/drivers/imu/lsm6dsox/manifest.py b/micropython/drivers/imu/lsm6dsox/manifest.py
new file mode 100644
index 000000000..28f4b3565
--- /dev/null
+++ b/micropython/drivers/imu/lsm6dsox/manifest.py
@@ -0,0 +1 @@
+module("lsm6dsox.py", opt=3)

From f46401f849394a30c11e9b48051be59ee82f43ef Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:19:34 +1000
Subject: [PATCH 072/343] micropython/drivers: Move "neopixel" led driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/led/neopixel/manifest.py |  1 +
 micropython/drivers/led/neopixel/neopixel.py | 50 ++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 micropython/drivers/led/neopixel/manifest.py
 create mode 100644 micropython/drivers/led/neopixel/neopixel.py

diff --git a/micropython/drivers/led/neopixel/manifest.py b/micropython/drivers/led/neopixel/manifest.py
new file mode 100644
index 000000000..561d19574
--- /dev/null
+++ b/micropython/drivers/led/neopixel/manifest.py
@@ -0,0 +1 @@
+module("neopixel.py", opt=3)
diff --git a/micropython/drivers/led/neopixel/neopixel.py b/micropython/drivers/led/neopixel/neopixel.py
new file mode 100644
index 000000000..caa12dc84
--- /dev/null
+++ b/micropython/drivers/led/neopixel/neopixel.py
@@ -0,0 +1,50 @@
+# NeoPixel driver for MicroPython
+# MIT license; Copyright (c) 2016 Damien P. George, 2021 Jim Mussared
+
+from machine import bitstream
+
+
+class NeoPixel:
+    # G R B W
+    ORDER = (1, 0, 2, 3)
+
+    def __init__(self, pin, n, bpp=3, timing=1):
+        self.pin = pin
+        self.n = n
+        self.bpp = bpp
+        self.buf = bytearray(n * bpp)
+        self.pin.init(pin.OUT)
+        # Timing arg can either be 1 for 800kHz or 0 for 400kHz,
+        # or a user-specified timing ns tuple (high_0, low_0, high_1, low_1).
+        self.timing = (
+            ((400, 850, 800, 450) if timing else (800, 1700, 1600, 900))
+            if isinstance(timing, int)
+            else timing
+        )
+
+    def __len__(self):
+        return self.n
+
+    def __setitem__(self, i, v):
+        offset = i * self.bpp
+        for i in range(self.bpp):
+            self.buf[offset + self.ORDER[i]] = v[i]
+
+    def __getitem__(self, i):
+        offset = i * self.bpp
+        return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
+
+    def fill(self, v):
+        b = self.buf
+        l = len(self.buf)
+        bpp = self.bpp
+        for i in range(bpp):
+            c = v[i]
+            j = self.ORDER[i]
+            while j < l:
+                b[j] = c
+                j += bpp
+
+    def write(self):
+        # BITSTREAM_TYPE_HIGH_LOW = 0
+        bitstream(self.pin, 0, self.timing, self.buf)

From c1c0eb0c39f0de122fdaddf00764051641d73a05 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:19:54 +1000
Subject: [PATCH 073/343] micropython/drivers: Move "nrf24l01" radio driver
 from main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../drivers/radio/nrf24l01/manifest.py        |   1 +
 .../drivers/radio/nrf24l01/nrf24l01.py        | 252 ++++++++++++++++++
 .../drivers/radio/nrf24l01/nrf24l01test.py    | 150 +++++++++++
 3 files changed, 403 insertions(+)
 create mode 100644 micropython/drivers/radio/nrf24l01/manifest.py
 create mode 100644 micropython/drivers/radio/nrf24l01/nrf24l01.py
 create mode 100644 micropython/drivers/radio/nrf24l01/nrf24l01test.py

diff --git a/micropython/drivers/radio/nrf24l01/manifest.py b/micropython/drivers/radio/nrf24l01/manifest.py
new file mode 100644
index 000000000..babdb7a52
--- /dev/null
+++ b/micropython/drivers/radio/nrf24l01/manifest.py
@@ -0,0 +1 @@
+module("nrf24l01.py", opt=3)
diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01.py b/micropython/drivers/radio/nrf24l01/nrf24l01.py
new file mode 100644
index 000000000..76d55312f
--- /dev/null
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01.py
@@ -0,0 +1,252 @@
+"""NRF24L01 driver for MicroPython
+"""
+
+from micropython import const
+import utime
+
+# nRF24L01+ registers
+CONFIG = const(0x00)
+EN_RXADDR = const(0x02)
+SETUP_AW = const(0x03)
+SETUP_RETR = const(0x04)
+RF_CH = const(0x05)
+RF_SETUP = const(0x06)
+STATUS = const(0x07)
+RX_ADDR_P0 = const(0x0A)
+TX_ADDR = const(0x10)
+RX_PW_P0 = const(0x11)
+FIFO_STATUS = const(0x17)
+DYNPD = const(0x1C)
+
+# CONFIG register
+EN_CRC = const(0x08)  # enable CRC
+CRCO = const(0x04)  # CRC encoding scheme; 0=1 byte, 1=2 bytes
+PWR_UP = const(0x02)  # 1=power up, 0=power down
+PRIM_RX = const(0x01)  # RX/TX control; 0=PTX, 1=PRX
+
+# RF_SETUP register
+POWER_0 = const(0x00)  # -18 dBm
+POWER_1 = const(0x02)  # -12 dBm
+POWER_2 = const(0x04)  # -6 dBm
+POWER_3 = const(0x06)  # 0 dBm
+SPEED_1M = const(0x00)
+SPEED_2M = const(0x08)
+SPEED_250K = const(0x20)
+
+# STATUS register
+RX_DR = const(0x40)  # RX data ready; write 1 to clear
+TX_DS = const(0x20)  # TX data sent; write 1 to clear
+MAX_RT = const(0x10)  # max retransmits reached; write 1 to clear
+
+# FIFO_STATUS register
+RX_EMPTY = const(0x01)  # 1 if RX FIFO is empty
+
+# constants for instructions
+R_RX_PL_WID = const(0x60)  # read RX payload width
+R_RX_PAYLOAD = const(0x61)  # read RX payload
+W_TX_PAYLOAD = const(0xA0)  # write TX payload
+FLUSH_TX = const(0xE1)  # flush TX FIFO
+FLUSH_RX = const(0xE2)  # flush RX FIFO
+NOP = const(0xFF)  # use to read STATUS register
+
+
+class NRF24L01:
+    def __init__(self, spi, cs, ce, channel=46, payload_size=16):
+        assert payload_size <= 32
+
+        self.buf = bytearray(1)
+
+        # store the pins
+        self.spi = spi
+        self.cs = cs
+        self.ce = ce
+
+        # init the SPI bus and pins
+        self.init_spi(4000000)
+
+        # reset everything
+        ce.init(ce.OUT, value=0)
+        cs.init(cs.OUT, value=1)
+
+        self.payload_size = payload_size
+        self.pipe0_read_addr = None
+        utime.sleep_ms(5)
+
+        # set address width to 5 bytes and check for device present
+        self.reg_write(SETUP_AW, 0b11)
+        if self.reg_read(SETUP_AW) != 0b11:
+            raise OSError("nRF24L01+ Hardware not responding")
+
+        # disable dynamic payloads
+        self.reg_write(DYNPD, 0)
+
+        # auto retransmit delay: 1750us
+        # auto retransmit count: 8
+        self.reg_write(SETUP_RETR, (6 << 4) | 8)
+
+        # set rf power and speed
+        self.set_power_speed(POWER_3, SPEED_250K)  # Best for point to point links
+
+        # init CRC
+        self.set_crc(2)
+
+        # clear status flags
+        self.reg_write(STATUS, RX_DR | TX_DS | MAX_RT)
+
+        # set channel
+        self.set_channel(channel)
+
+        # flush buffers
+        self.flush_rx()
+        self.flush_tx()
+
+    def init_spi(self, baudrate):
+        try:
+            master = self.spi.MASTER
+        except AttributeError:
+            self.spi.init(baudrate=baudrate, polarity=0, phase=0)
+        else:
+            self.spi.init(master, baudrate=baudrate, polarity=0, phase=0)
+
+    def reg_read(self, reg):
+        self.cs(0)
+        self.spi.readinto(self.buf, reg)
+        self.spi.readinto(self.buf)
+        self.cs(1)
+        return self.buf[0]
+
+    def reg_write_bytes(self, reg, buf):
+        self.cs(0)
+        self.spi.readinto(self.buf, 0x20 | reg)
+        self.spi.write(buf)
+        self.cs(1)
+        return self.buf[0]
+
+    def reg_write(self, reg, value):
+        self.cs(0)
+        self.spi.readinto(self.buf, 0x20 | reg)
+        ret = self.buf[0]
+        self.spi.readinto(self.buf, value)
+        self.cs(1)
+        return ret
+
+    def flush_rx(self):
+        self.cs(0)
+        self.spi.readinto(self.buf, FLUSH_RX)
+        self.cs(1)
+
+    def flush_tx(self):
+        self.cs(0)
+        self.spi.readinto(self.buf, FLUSH_TX)
+        self.cs(1)
+
+    # power is one of POWER_x defines; speed is one of SPEED_x defines
+    def set_power_speed(self, power, speed):
+        setup = self.reg_read(RF_SETUP) & 0b11010001
+        self.reg_write(RF_SETUP, setup | power | speed)
+
+    # length in bytes: 0, 1 or 2
+    def set_crc(self, length):
+        config = self.reg_read(CONFIG) & ~(CRCO | EN_CRC)
+        if length == 0:
+            pass
+        elif length == 1:
+            config |= EN_CRC
+        else:
+            config |= EN_CRC | CRCO
+        self.reg_write(CONFIG, config)
+
+    def set_channel(self, channel):
+        self.reg_write(RF_CH, min(channel, 125))
+
+    # address should be a bytes object 5 bytes long
+    def open_tx_pipe(self, address):
+        assert len(address) == 5
+        self.reg_write_bytes(RX_ADDR_P0, address)
+        self.reg_write_bytes(TX_ADDR, address)
+        self.reg_write(RX_PW_P0, self.payload_size)
+
+    # address should be a bytes object 5 bytes long
+    # pipe 0 and 1 have 5 byte address
+    # pipes 2-5 use same 4 most-significant bytes as pipe 1, plus 1 extra byte
+    def open_rx_pipe(self, pipe_id, address):
+        assert len(address) == 5
+        assert 0 <= pipe_id <= 5
+        if pipe_id == 0:
+            self.pipe0_read_addr = address
+        if pipe_id < 2:
+            self.reg_write_bytes(RX_ADDR_P0 + pipe_id, address)
+        else:
+            self.reg_write(RX_ADDR_P0 + pipe_id, address[0])
+        self.reg_write(RX_PW_P0 + pipe_id, self.payload_size)
+        self.reg_write(EN_RXADDR, self.reg_read(EN_RXADDR) | (1 << pipe_id))
+
+    def start_listening(self):
+        self.reg_write(CONFIG, self.reg_read(CONFIG) | PWR_UP | PRIM_RX)
+        self.reg_write(STATUS, RX_DR | TX_DS | MAX_RT)
+
+        if self.pipe0_read_addr is not None:
+            self.reg_write_bytes(RX_ADDR_P0, self.pipe0_read_addr)
+
+        self.flush_rx()
+        self.flush_tx()
+        self.ce(1)
+        utime.sleep_us(130)
+
+    def stop_listening(self):
+        self.ce(0)
+        self.flush_tx()
+        self.flush_rx()
+
+    # returns True if any data available to recv
+    def any(self):
+        return not bool(self.reg_read(FIFO_STATUS) & RX_EMPTY)
+
+    def recv(self):
+        # get the data
+        self.cs(0)
+        self.spi.readinto(self.buf, R_RX_PAYLOAD)
+        buf = self.spi.read(self.payload_size)
+        self.cs(1)
+        # clear RX ready flag
+        self.reg_write(STATUS, RX_DR)
+
+        return buf
+
+    # blocking wait for tx complete
+    def send(self, buf, timeout=500):
+        self.send_start(buf)
+        start = utime.ticks_ms()
+        result = None
+        while result is None and utime.ticks_diff(utime.ticks_ms(), start) < timeout:
+            result = self.send_done()  # 1 == success, 2 == fail
+        if result == 2:
+            raise OSError("send failed")
+
+    # non-blocking tx
+    def send_start(self, buf):
+        # power up
+        self.reg_write(CONFIG, (self.reg_read(CONFIG) | PWR_UP) & ~PRIM_RX)
+        utime.sleep_us(150)
+        # send the data
+        self.cs(0)
+        self.spi.readinto(self.buf, W_TX_PAYLOAD)
+        self.spi.write(buf)
+        if len(buf) < self.payload_size:
+            self.spi.write(b"\x00" * (self.payload_size - len(buf)))  # pad out data
+        self.cs(1)
+
+        # enable the chip so it can send the data
+        self.ce(1)
+        utime.sleep_us(15)  # needs to be >10us
+        self.ce(0)
+
+    # returns None if send still in progress, 1 for success, 2 for fail
+    def send_done(self):
+        if not (self.reg_read(STATUS) & (TX_DS | MAX_RT)):
+            return None  # tx not finished
+
+        # either finished or failed: get and clear status flags, power down
+        status = self.reg_write(STATUS, RX_DR | TX_DS | MAX_RT)
+        self.reg_write(CONFIG, self.reg_read(CONFIG) & ~PWR_UP)
+        return 1 if status & TX_DS else 2
diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01test.py b/micropython/drivers/radio/nrf24l01/nrf24l01test.py
new file mode 100644
index 000000000..56bdb6e26
--- /dev/null
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01test.py
@@ -0,0 +1,150 @@
+"""Test for nrf24l01 module.  Portable between MicroPython targets."""
+
+import usys
+import ustruct as struct
+import utime
+from machine import Pin, SPI
+from nrf24l01 import NRF24L01
+from micropython import const
+
+# Slave pause between receiving data and checking for further packets.
+_RX_POLL_DELAY = const(15)
+# Slave pauses an additional _SLAVE_SEND_DELAY ms after receiving data and before
+# transmitting to allow the (remote) master time to get into receive mode. The
+# master may be a slow device. Value tested with Pyboard, ESP32 and ESP8266.
+_SLAVE_SEND_DELAY = const(10)
+
+if usys.platform == "pyboard":
+    cfg = {"spi": 2, "miso": "Y7", "mosi": "Y8", "sck": "Y6", "csn": "Y5", "ce": "Y4"}
+elif usys.platform == "esp8266":  # Hardware SPI
+    cfg = {"spi": 1, "miso": 12, "mosi": 13, "sck": 14, "csn": 4, "ce": 5}
+elif usys.platform == "esp32":  # Software SPI
+    cfg = {"spi": -1, "miso": 32, "mosi": 33, "sck": 25, "csn": 26, "ce": 27}
+else:
+    raise ValueError("Unsupported platform {}".format(usys.platform))
+
+# Addresses are in little-endian format. They correspond to big-endian
+# 0xf0f0f0f0e1, 0xf0f0f0f0d2
+pipes = (b"\xe1\xf0\xf0\xf0\xf0", b"\xd2\xf0\xf0\xf0\xf0")
+
+
+def master():
+    csn = Pin(cfg["csn"], mode=Pin.OUT, value=1)
+    ce = Pin(cfg["ce"], mode=Pin.OUT, value=0)
+    if cfg["spi"] == -1:
+        spi = SPI(-1, sck=Pin(cfg["sck"]), mosi=Pin(cfg["mosi"]), miso=Pin(cfg["miso"]))
+        nrf = NRF24L01(spi, csn, ce, payload_size=8)
+    else:
+        nrf = NRF24L01(SPI(cfg["spi"]), csn, ce, payload_size=8)
+
+    nrf.open_tx_pipe(pipes[0])
+    nrf.open_rx_pipe(1, pipes[1])
+    nrf.start_listening()
+
+    num_needed = 16
+    num_successes = 0
+    num_failures = 0
+    led_state = 0
+
+    print("NRF24L01 master mode, sending %d packets..." % num_needed)
+
+    while num_successes < num_needed and num_failures < num_needed:
+        # stop listening and send packet
+        nrf.stop_listening()
+        millis = utime.ticks_ms()
+        led_state = max(1, (led_state << 1) & 0x0F)
+        print("sending:", millis, led_state)
+        try:
+            nrf.send(struct.pack("ii", millis, led_state))
+        except OSError:
+            pass
+
+        # start listening again
+        nrf.start_listening()
+
+        # wait for response, with 250ms timeout
+        start_time = utime.ticks_ms()
+        timeout = False
+        while not nrf.any() and not timeout:
+            if utime.ticks_diff(utime.ticks_ms(), start_time) > 250:
+                timeout = True
+
+        if timeout:
+            print("failed, response timed out")
+            num_failures += 1
+
+        else:
+            # recv packet
+            (got_millis,) = struct.unpack("i", nrf.recv())
+
+            # print response and round-trip delay
+            print(
+                "got response:",
+                got_millis,
+                "(delay",
+                utime.ticks_diff(utime.ticks_ms(), got_millis),
+                "ms)",
+            )
+            num_successes += 1
+
+        # delay then loop
+        utime.sleep_ms(250)
+
+    print("master finished sending; successes=%d, failures=%d" % (num_successes, num_failures))
+
+
+def slave():
+    csn = Pin(cfg["csn"], mode=Pin.OUT, value=1)
+    ce = Pin(cfg["ce"], mode=Pin.OUT, value=0)
+    if cfg["spi"] == -1:
+        spi = SPI(-1, sck=Pin(cfg["sck"]), mosi=Pin(cfg["mosi"]), miso=Pin(cfg["miso"]))
+        nrf = NRF24L01(spi, csn, ce, payload_size=8)
+    else:
+        nrf = NRF24L01(SPI(cfg["spi"]), csn, ce, payload_size=8)
+
+    nrf.open_tx_pipe(pipes[1])
+    nrf.open_rx_pipe(1, pipes[0])
+    nrf.start_listening()
+
+    print("NRF24L01 slave mode, waiting for packets... (ctrl-C to stop)")
+
+    while True:
+        if nrf.any():
+            while nrf.any():
+                buf = nrf.recv()
+                millis, led_state = struct.unpack("ii", buf)
+                print("received:", millis, led_state)
+                for led in leds:
+                    if led_state & 1:
+                        led.on()
+                    else:
+                        led.off()
+                    led_state >>= 1
+                utime.sleep_ms(_RX_POLL_DELAY)
+
+            # Give master time to get into receive mode.
+            utime.sleep_ms(_SLAVE_SEND_DELAY)
+            nrf.stop_listening()
+            try:
+                nrf.send(struct.pack("i", millis))
+            except OSError:
+                pass
+            print("sent response")
+            nrf.start_listening()
+
+
+try:
+    import pyb
+
+    leds = [pyb.LED(i + 1) for i in range(4)]
+except:
+    leds = []
+
+print("NRF24L01 test module loaded")
+print("NRF24L01 pinout for test:")
+print("    CE on", cfg["ce"])
+print("    CSN on", cfg["csn"])
+print("    SCK on", cfg["sck"])
+print("    MISO on", cfg["miso"])
+print("    MOSI on", cfg["mosi"])
+print("run nrf24l01test.slave() on slave, then nrf24l01test.master() on master")

From 0382c9cffa18210016ce4819dcb217f38938f1e6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:20:12 +1000
Subject: [PATCH 074/343] micropython/drivers: Move "dht" sensor driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/sensor/dht/dht.py      | 46 ++++++++++++++++++++++
 micropython/drivers/sensor/dht/manifest.py |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 micropython/drivers/sensor/dht/dht.py
 create mode 100644 micropython/drivers/sensor/dht/manifest.py

diff --git a/micropython/drivers/sensor/dht/dht.py b/micropython/drivers/sensor/dht/dht.py
new file mode 100644
index 000000000..411e9a8d2
--- /dev/null
+++ b/micropython/drivers/sensor/dht/dht.py
@@ -0,0 +1,46 @@
+# DHT11/DHT22 driver for MicroPython on ESP8266
+# MIT license; Copyright (c) 2016 Damien P. George
+
+import sys
+
+if sys.platform.startswith("esp"):
+    from esp import dht_readinto
+elif sys.platform == "mimxrt":
+    from mimxrt import dht_readinto
+elif sys.platform == "rp2":
+    from rp2 import dht_readinto
+elif sys.platform == "pyboard":
+    from pyb import dht_readinto
+else:
+    from machine import dht_readinto
+
+
+class DHTBase:
+    def __init__(self, pin):
+        self.pin = pin
+        self.buf = bytearray(5)
+
+    def measure(self):
+        buf = self.buf
+        dht_readinto(self.pin, buf)
+        if (buf[0] + buf[1] + buf[2] + buf[3]) & 0xFF != buf[4]:
+            raise Exception("checksum error")
+
+
+class DHT11(DHTBase):
+    def humidity(self):
+        return self.buf[0]
+
+    def temperature(self):
+        return self.buf[2]
+
+
+class DHT22(DHTBase):
+    def humidity(self):
+        return (self.buf[0] << 8 | self.buf[1]) * 0.1
+
+    def temperature(self):
+        t = ((self.buf[2] & 0x7F) << 8 | self.buf[3]) * 0.1
+        if self.buf[2] & 0x80:
+            t = -t
+        return t
diff --git a/micropython/drivers/sensor/dht/manifest.py b/micropython/drivers/sensor/dht/manifest.py
new file mode 100644
index 000000000..72a4e0d24
--- /dev/null
+++ b/micropython/drivers/sensor/dht/manifest.py
@@ -0,0 +1 @@
+module("dht.py", opt=3)

From a336c29cc5d9117bc56059c7f9dc13008fa9af4c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:20:26 +1000
Subject: [PATCH 075/343] micropython/drivers: Move "dx18x20" sensor driver
 from main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/sensor/ds18x20/ds18x20.py | 52 +++++++++++++++++++
 .../drivers/sensor/ds18x20/manifest.py        |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 micropython/drivers/sensor/ds18x20/ds18x20.py
 create mode 100644 micropython/drivers/sensor/ds18x20/manifest.py

diff --git a/micropython/drivers/sensor/ds18x20/ds18x20.py b/micropython/drivers/sensor/ds18x20/ds18x20.py
new file mode 100644
index 000000000..ad2d9f52c
--- /dev/null
+++ b/micropython/drivers/sensor/ds18x20/ds18x20.py
@@ -0,0 +1,52 @@
+# DS18x20 temperature sensor driver for MicroPython.
+# MIT license; Copyright (c) 2016 Damien P. George
+
+from micropython import const
+
+_CONVERT = const(0x44)
+_RD_SCRATCH = const(0xBE)
+_WR_SCRATCH = const(0x4E)
+
+
+class DS18X20:
+    def __init__(self, onewire):
+        self.ow = onewire
+        self.buf = bytearray(9)
+
+    def scan(self):
+        return [rom for rom in self.ow.scan() if rom[0] in (0x10, 0x22, 0x28)]
+
+    def convert_temp(self):
+        self.ow.reset(True)
+        self.ow.writebyte(self.ow.SKIP_ROM)
+        self.ow.writebyte(_CONVERT)
+
+    def read_scratch(self, rom):
+        self.ow.reset(True)
+        self.ow.select_rom(rom)
+        self.ow.writebyte(_RD_SCRATCH)
+        self.ow.readinto(self.buf)
+        if self.ow.crc8(self.buf):
+            raise Exception("CRC error")
+        return self.buf
+
+    def write_scratch(self, rom, buf):
+        self.ow.reset(True)
+        self.ow.select_rom(rom)
+        self.ow.writebyte(_WR_SCRATCH)
+        self.ow.write(buf)
+
+    def read_temp(self, rom):
+        buf = self.read_scratch(rom)
+        if rom[0] == 0x10:
+            if buf[1]:
+                t = buf[0] >> 1 | 0x80
+                t = -((~t + 1) & 0xFF)
+            else:
+                t = buf[0] >> 1
+            return t - 0.25 + (buf[7] - buf[6]) / buf[7]
+        else:
+            t = buf[1] << 8 | buf[0]
+            if t & 0x8000:  # sign bit set
+                t = -((t ^ 0xFFFF) + 1)
+            return t / 16
diff --git a/micropython/drivers/sensor/ds18x20/manifest.py b/micropython/drivers/sensor/ds18x20/manifest.py
new file mode 100644
index 000000000..01f7ae035
--- /dev/null
+++ b/micropython/drivers/sensor/ds18x20/manifest.py
@@ -0,0 +1,2 @@
+require("onewire")
+module("ds18x20.py", opt=3)

From b3e443ca8ebb2dd8fbdcd8477f247df52b647d76 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:20:35 +1000
Subject: [PATCH 076/343] micropython/drivers: Move "hts221" sensor driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/sensor/hts221/hts221.py   | 91 +++++++++++++++++++
 micropython/drivers/sensor/hts221/manifest.py |  1 +
 2 files changed, 92 insertions(+)
 create mode 100644 micropython/drivers/sensor/hts221/hts221.py
 create mode 100644 micropython/drivers/sensor/hts221/manifest.py

diff --git a/micropython/drivers/sensor/hts221/hts221.py b/micropython/drivers/sensor/hts221/hts221.py
new file mode 100644
index 000000000..fec52a738
--- /dev/null
+++ b/micropython/drivers/sensor/hts221/hts221.py
@@ -0,0 +1,91 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2013-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+Copyright (c) 2013-2022 Kwabena W. Agyeman <kwagyeman@openmv.io>
+
+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.
+
+HTS221 driver driver for MicroPython.
+Original source: https://github.com/ControlEverythingCommunity/HTS221/blob/master/Python/HTS221.py
+
+Example usage:
+
+import time
+import hts221
+from machine import Pin, I2C
+
+bus = I2C(1, scl=Pin(15), sda=Pin(14))
+hts = hts221.HTS221(bus)
+
+while (True):
+    rH   = hts.humidity()
+    temp = hts.temperature()
+    print ("rH: %.2f%% T: %.2fC" %(rH, temp))
+    time.sleep_ms(100)
+"""
+
+import struct
+
+
+class HTS221:
+    def __init__(self, i2c, data_rate=1, address=0x5F):
+        self.bus = i2c
+        self.odr = data_rate
+        self.slv_addr = address
+
+        # Set configuration register
+        # Humidity and temperature average configuration
+        self.bus.writeto_mem(self.slv_addr, 0x10, b"\x1B")
+
+        # Set control register
+        # PD | BDU | ODR
+        cfg = 0x80 | 0x04 | (self.odr & 0x3)
+        self.bus.writeto_mem(self.slv_addr, 0x20, bytes([cfg]))
+
+        # Read Calibration values from non-volatile memory of the device
+        # Humidity Calibration values
+        self.H0 = self._read_reg(0x30, 1) / 2
+        self.H1 = self._read_reg(0x31, 1) / 2
+        self.H2 = self._read_reg(0x36, 2)
+        self.H3 = self._read_reg(0x3A, 2)
+
+        # Temperature Calibration values
+        raw = self._read_reg(0x35, 1)
+        self.T0 = ((raw & 0x03) * 256) + self._read_reg(0x32, 1)
+        self.T1 = ((raw & 0x0C) * 64) + self._read_reg(0x33, 1)
+        self.T2 = self._read_reg(0x3C, 2)
+        self.T3 = self._read_reg(0x3E, 2)
+
+    def _read_reg(self, reg_addr, size):
+        fmt = "B" if size == 1 else "H"
+        reg_addr = reg_addr if size == 1 else reg_addr | 0x80
+        return struct.unpack(fmt, self.bus.readfrom_mem(self.slv_addr, reg_addr, size))[0]
+
+    def humidity(self):
+        rH = self._read_reg(0x28, 2)
+        return (self.H1 - self.H0) * (rH - self.H2) / (self.H3 - self.H2) + self.H0
+
+    def temperature(self):
+        temp = self._read_reg(0x2A, 2)
+        if temp > 32767:
+            temp -= 65536
+        return ((self.T1 - self.T0) / 8.0) * (temp - self.T2) / (self.T3 - self.T2) + (
+            self.T0 / 8.0
+        )
diff --git a/micropython/drivers/sensor/hts221/manifest.py b/micropython/drivers/sensor/hts221/manifest.py
new file mode 100644
index 000000000..5f1792665
--- /dev/null
+++ b/micropython/drivers/sensor/hts221/manifest.py
@@ -0,0 +1 @@
+module("hts221.py", opt=3)

From 33b5132312e38dbe0708f5267547e901391f5d69 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:20:50 +1000
Subject: [PATCH 077/343] micropython/drivers: Move "lps22h" sensor driver from
 main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/sensor/lps22h/lps22h.py   | 109 ++++++++++++++++++
 micropython/drivers/sensor/lps22h/manifest.py |   1 +
 2 files changed, 110 insertions(+)
 create mode 100644 micropython/drivers/sensor/lps22h/lps22h.py
 create mode 100644 micropython/drivers/sensor/lps22h/manifest.py

diff --git a/micropython/drivers/sensor/lps22h/lps22h.py b/micropython/drivers/sensor/lps22h/lps22h.py
new file mode 100644
index 000000000..ca29efce2
--- /dev/null
+++ b/micropython/drivers/sensor/lps22h/lps22h.py
@@ -0,0 +1,109 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2016-2019 shaoziyang <shaoziyang@micropython.org.cn>
+Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+
+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.
+
+LPS22HB/HH pressure sensor driver for MicroPython.
+
+Example usage:
+
+import time
+from lps22h import LPS22H
+from machine import Pin, I2C
+
+bus = I2C(1, scl=Pin(15), sda=Pin(14))
+lps = LPS22H(bus, oneshot=False)
+
+while (True):
+    print("Pressure: %.2f hPa Temperature: %.2f C"%(lps.pressure(), lps.temperature()))
+    time.sleep_ms(10)
+"""
+import machine
+
+_LPS22_CTRL_REG1 = const(0x10)
+_LPS22_CTRL_REG2 = const(0x11)
+_LPS22_STATUS = const(0x27)
+_LPS22_TEMP_OUT_L = const(0x2B)
+_LPS22_PRESS_OUT_XL = const(0x28)
+_LPS22_PRESS_OUT_L = const(0x29)
+
+
+class LPS22H:
+    def __init__(self, i2c, address=0x5C, oneshot=False):
+        self.i2c = i2c
+        self.addr = address
+        self.oneshot = oneshot
+        self.buf = bytearray(1)
+        # ODR=1 EN_LPFP=1 BDU=1
+        self._write_reg(_LPS22_CTRL_REG1, 0x1A)
+        self.set_oneshot_mode(self.oneshot)
+
+    def _int16(self, d):
+        return d if d < 0x8000 else d - 0x10000
+
+    def _write_reg(self, reg, dat):
+        self.buf[0] = dat
+        self.i2c.writeto_mem(self.addr, reg, self.buf)
+
+    def _read_reg(self, reg, width=8):
+        self.i2c.readfrom_mem_into(self.addr, reg, self.buf)
+        val = self.buf[0]
+        if width == 16:
+            val |= self._read_reg(reg + 1) << 8
+        return val
+
+    def _tigger_oneshot(self, b):
+        if self.oneshot:
+            self._write_reg(_LPS22_CTRL_REG2, self._read_reg(_LPS22_CTRL_REG2) | 0x01)
+            self._read_reg(0x28 + b * 2)
+            while True:
+                if self._read_reg(_LPS22_STATUS) & b:
+                    return
+                machine.idle()
+
+    def set_oneshot_mode(self, oneshot):
+        self._read_reg(_LPS22_CTRL_REG1)
+        self.oneshot = oneshot
+        if oneshot:
+            self.buf[0] &= 0x0F
+        else:
+            self.buf[0] |= 0x10
+        self._write_reg(_LPS22_CTRL_REG1, self.buf[0])
+
+    def pressure(self):
+        if self.oneshot:
+            self._tigger_oneshot(1)
+        return (
+            self._read_reg(_LPS22_PRESS_OUT_XL) + self._read_reg(_LPS22_PRESS_OUT_L, 16) * 256
+        ) / 4096
+
+    def temperature(self):
+        if self.oneshot:
+            self._tigger_oneshot(2)
+        return self._int16(self._read_reg(_LPS22_TEMP_OUT_L, 16)) / 100
+
+    def altitude(self):
+        return (
+            (((1013.25 / self.pressure()) ** (1 / 5.257)) - 1.0)
+            * (self.temperature() + 273.15)
+            / 0.0065
+        )
diff --git a/micropython/drivers/sensor/lps22h/manifest.py b/micropython/drivers/sensor/lps22h/manifest.py
new file mode 100644
index 000000000..d30108d93
--- /dev/null
+++ b/micropython/drivers/sensor/lps22h/manifest.py
@@ -0,0 +1 @@
+module("lps22h.py", opt=3)

From cf5ed97b4d93972594c1f265187b8bf9f9989708 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:21:00 +1000
Subject: [PATCH 078/343] micropython/drivers: Move "sdcard" driver from main
 repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../drivers/storage/sdcard/manifest.py        |   1 +
 micropython/drivers/storage/sdcard/sdcard.py  | 299 ++++++++++++++++++
 micropython/drivers/storage/sdcard/sdtest.py  |  61 ++++
 3 files changed, 361 insertions(+)
 create mode 100644 micropython/drivers/storage/sdcard/manifest.py
 create mode 100644 micropython/drivers/storage/sdcard/sdcard.py
 create mode 100644 micropython/drivers/storage/sdcard/sdtest.py

diff --git a/micropython/drivers/storage/sdcard/manifest.py b/micropython/drivers/storage/sdcard/manifest.py
new file mode 100644
index 000000000..e584b97d9
--- /dev/null
+++ b/micropython/drivers/storage/sdcard/manifest.py
@@ -0,0 +1 @@
+module("sdcard.py", opt=3)
diff --git a/micropython/drivers/storage/sdcard/sdcard.py b/micropython/drivers/storage/sdcard/sdcard.py
new file mode 100644
index 000000000..df28bd953
--- /dev/null
+++ b/micropython/drivers/storage/sdcard/sdcard.py
@@ -0,0 +1,299 @@
+"""
+MicroPython driver for SD cards using SPI bus.
+
+Requires an SPI bus and a CS pin.  Provides readblocks and writeblocks
+methods so the device can be mounted as a filesystem.
+
+Example usage on pyboard:
+
+    import pyb, sdcard, os
+    sd = sdcard.SDCard(pyb.SPI(1), pyb.Pin.board.X5)
+    pyb.mount(sd, '/sd2')
+    os.listdir('/')
+
+Example usage on ESP8266:
+
+    import machine, sdcard, os
+    sd = sdcard.SDCard(machine.SPI(1), machine.Pin(15))
+    os.mount(sd, '/sd')
+    os.listdir('/')
+
+"""
+
+from micropython import const
+import time
+
+
+_CMD_TIMEOUT = const(100)
+
+_R1_IDLE_STATE = const(1 << 0)
+# R1_ERASE_RESET = const(1 << 1)
+_R1_ILLEGAL_COMMAND = const(1 << 2)
+# R1_COM_CRC_ERROR = const(1 << 3)
+# R1_ERASE_SEQUENCE_ERROR = const(1 << 4)
+# R1_ADDRESS_ERROR = const(1 << 5)
+# R1_PARAMETER_ERROR = const(1 << 6)
+_TOKEN_CMD25 = const(0xFC)
+_TOKEN_STOP_TRAN = const(0xFD)
+_TOKEN_DATA = const(0xFE)
+
+
+class SDCard:
+    def __init__(self, spi, cs, baudrate=1320000):
+        self.spi = spi
+        self.cs = cs
+
+        self.cmdbuf = bytearray(6)
+        self.dummybuf = bytearray(512)
+        self.tokenbuf = bytearray(1)
+        for i in range(512):
+            self.dummybuf[i] = 0xFF
+        self.dummybuf_memoryview = memoryview(self.dummybuf)
+
+        # initialise the card
+        self.init_card(baudrate)
+
+    def init_spi(self, baudrate):
+        try:
+            master = self.spi.MASTER
+        except AttributeError:
+            # on ESP8266
+            self.spi.init(baudrate=baudrate, phase=0, polarity=0)
+        else:
+            # on pyboard
+            self.spi.init(master, baudrate=baudrate, phase=0, polarity=0)
+
+    def init_card(self, baudrate):
+
+        # init CS pin
+        self.cs.init(self.cs.OUT, value=1)
+
+        # init SPI bus; use low data rate for initialisation
+        self.init_spi(100000)
+
+        # clock card at least 100 cycles with cs high
+        for i in range(16):
+            self.spi.write(b"\xff")
+
+        # CMD0: init card; should return _R1_IDLE_STATE (allow 5 attempts)
+        for _ in range(5):
+            if self.cmd(0, 0, 0x95) == _R1_IDLE_STATE:
+                break
+        else:
+            raise OSError("no SD card")
+
+        # CMD8: determine card version
+        r = self.cmd(8, 0x01AA, 0x87, 4)
+        if r == _R1_IDLE_STATE:
+            self.init_card_v2()
+        elif r == (_R1_IDLE_STATE | _R1_ILLEGAL_COMMAND):
+            self.init_card_v1()
+        else:
+            raise OSError("couldn't determine SD card version")
+
+        # get the number of sectors
+        # CMD9: response R2 (R1 byte + 16-byte block read)
+        if self.cmd(9, 0, 0, 0, False) != 0:
+            raise OSError("no response from SD card")
+        csd = bytearray(16)
+        self.readinto(csd)
+        if csd[0] & 0xC0 == 0x40:  # CSD version 2.0
+            self.sectors = ((csd[8] << 8 | csd[9]) + 1) * 1024
+        elif csd[0] & 0xC0 == 0x00:  # CSD version 1.0 (old, <=2GB)
+            c_size = (csd[6] & 0b11) << 10 | csd[7] << 2 | csd[8] >> 6
+            c_size_mult = (csd[9] & 0b11) << 1 | csd[10] >> 7
+            read_bl_len = csd[5] & 0b1111
+            capacity = (c_size + 1) * (2 ** (c_size_mult + 2)) * (2**read_bl_len)
+            self.sectors = capacity // 512
+        else:
+            raise OSError("SD card CSD format not supported")
+        # print('sectors', self.sectors)
+
+        # CMD16: set block length to 512 bytes
+        if self.cmd(16, 512, 0) != 0:
+            raise OSError("can't set 512 block size")
+
+        # set to high data rate now that it's initialised
+        self.init_spi(baudrate)
+
+    def init_card_v1(self):
+        for i in range(_CMD_TIMEOUT):
+            time.sleep_ms(50)
+            self.cmd(55, 0, 0)
+            if self.cmd(41, 0, 0) == 0:
+                # SDSC card, uses byte addressing in read/write/erase commands
+                self.cdv = 512
+                # print("[SDCard] v1 card")
+                return
+        raise OSError("timeout waiting for v1 card")
+
+    def init_card_v2(self):
+        for i in range(_CMD_TIMEOUT):
+            time.sleep_ms(50)
+            self.cmd(58, 0, 0, 4)
+            self.cmd(55, 0, 0)
+            if self.cmd(41, 0x40000000, 0) == 0:
+                self.cmd(58, 0, 0, -4)  # 4-byte response, negative means keep the first byte
+                ocr = self.tokenbuf[0]  # get first byte of response, which is OCR
+                if not ocr & 0x40:
+                    # SDSC card, uses byte addressing in read/write/erase commands
+                    self.cdv = 512
+                else:
+                    # SDHC/SDXC card, uses block addressing in read/write/erase commands
+                    self.cdv = 1
+                # print("[SDCard] v2 card")
+                return
+        raise OSError("timeout waiting for v2 card")
+
+    def cmd(self, cmd, arg, crc, final=0, release=True, skip1=False):
+        self.cs(0)
+
+        # create and send the command
+        buf = self.cmdbuf
+        buf[0] = 0x40 | cmd
+        buf[1] = arg >> 24
+        buf[2] = arg >> 16
+        buf[3] = arg >> 8
+        buf[4] = arg
+        buf[5] = crc
+        self.spi.write(buf)
+
+        if skip1:
+            self.spi.readinto(self.tokenbuf, 0xFF)
+
+        # wait for the response (response[7] == 0)
+        for i in range(_CMD_TIMEOUT):
+            self.spi.readinto(self.tokenbuf, 0xFF)
+            response = self.tokenbuf[0]
+            if not (response & 0x80):
+                # this could be a big-endian integer that we are getting here
+                # if final<0 then store the first byte to tokenbuf and discard the rest
+                if final < 0:
+                    self.spi.readinto(self.tokenbuf, 0xFF)
+                    final = -1 - final
+                for j in range(final):
+                    self.spi.write(b"\xff")
+                if release:
+                    self.cs(1)
+                    self.spi.write(b"\xff")
+                return response
+
+        # timeout
+        self.cs(1)
+        self.spi.write(b"\xff")
+        return -1
+
+    def readinto(self, buf):
+        self.cs(0)
+
+        # read until start byte (0xff)
+        for i in range(_CMD_TIMEOUT):
+            self.spi.readinto(self.tokenbuf, 0xFF)
+            if self.tokenbuf[0] == _TOKEN_DATA:
+                break
+            time.sleep_ms(1)
+        else:
+            self.cs(1)
+            raise OSError("timeout waiting for response")
+
+        # read data
+        mv = self.dummybuf_memoryview
+        if len(buf) != len(mv):
+            mv = mv[: len(buf)]
+        self.spi.write_readinto(mv, buf)
+
+        # read checksum
+        self.spi.write(b"\xff")
+        self.spi.write(b"\xff")
+
+        self.cs(1)
+        self.spi.write(b"\xff")
+
+    def write(self, token, buf):
+        self.cs(0)
+
+        # send: start of block, data, checksum
+        self.spi.read(1, token)
+        self.spi.write(buf)
+        self.spi.write(b"\xff")
+        self.spi.write(b"\xff")
+
+        # check the response
+        if (self.spi.read(1, 0xFF)[0] & 0x1F) != 0x05:
+            self.cs(1)
+            self.spi.write(b"\xff")
+            return
+
+        # wait for write to finish
+        while self.spi.read(1, 0xFF)[0] == 0:
+            pass
+
+        self.cs(1)
+        self.spi.write(b"\xff")
+
+    def write_token(self, token):
+        self.cs(0)
+        self.spi.read(1, token)
+        self.spi.write(b"\xff")
+        # wait for write to finish
+        while self.spi.read(1, 0xFF)[0] == 0x00:
+            pass
+
+        self.cs(1)
+        self.spi.write(b"\xff")
+
+    def readblocks(self, block_num, buf):
+        nblocks = len(buf) // 512
+        assert nblocks and not len(buf) % 512, "Buffer length is invalid"
+        if nblocks == 1:
+            # CMD17: set read address for single block
+            if self.cmd(17, block_num * self.cdv, 0, release=False) != 0:
+                # release the card
+                self.cs(1)
+                raise OSError(5)  # EIO
+            # receive the data and release card
+            self.readinto(buf)
+        else:
+            # CMD18: set read address for multiple blocks
+            if self.cmd(18, block_num * self.cdv, 0, release=False) != 0:
+                # release the card
+                self.cs(1)
+                raise OSError(5)  # EIO
+            offset = 0
+            mv = memoryview(buf)
+            while nblocks:
+                # receive the data and release card
+                self.readinto(mv[offset : offset + 512])
+                offset += 512
+                nblocks -= 1
+            if self.cmd(12, 0, 0xFF, skip1=True):
+                raise OSError(5)  # EIO
+
+    def writeblocks(self, block_num, buf):
+        nblocks, err = divmod(len(buf), 512)
+        assert nblocks and not err, "Buffer length is invalid"
+        if nblocks == 1:
+            # CMD24: set write address for single block
+            if self.cmd(24, block_num * self.cdv, 0) != 0:
+                raise OSError(5)  # EIO
+
+            # send the data
+            self.write(_TOKEN_DATA, buf)
+        else:
+            # CMD25: set write address for first block
+            if self.cmd(25, block_num * self.cdv, 0) != 0:
+                raise OSError(5)  # EIO
+            # send the data
+            offset = 0
+            mv = memoryview(buf)
+            while nblocks:
+                self.write(_TOKEN_CMD25, mv[offset : offset + 512])
+                offset += 512
+                nblocks -= 1
+            self.write_token(_TOKEN_STOP_TRAN)
+
+    def ioctl(self, op, arg):
+        if op == 4:  # get number of blocks
+            return self.sectors
+        if op == 5:  # get block size in bytes
+            return 512
diff --git a/micropython/drivers/storage/sdcard/sdtest.py b/micropython/drivers/storage/sdcard/sdtest.py
new file mode 100644
index 000000000..018ef7c64
--- /dev/null
+++ b/micropython/drivers/storage/sdcard/sdtest.py
@@ -0,0 +1,61 @@
+# Test for sdcard block protocol
+# Peter hinch 30th Jan 2016
+import os, sdcard, machine
+
+
+def sdtest():
+    spi = machine.SPI(1)
+    spi.init()  # Ensure right baudrate
+    sd = sdcard.SDCard(spi, machine.Pin.board.X21)  # Compatible with PCB
+    vfs = os.VfsFat(sd)
+    os.mount(vfs, "/fc")
+    print("Filesystem check")
+    print(os.listdir("/fc"))
+
+    line = "abcdefghijklmnopqrstuvwxyz\n"
+    lines = line * 200  # 5400 chars
+    short = "1234567890\n"
+
+    fn = "/fc/rats.txt"
+    print()
+    print("Multiple block read/write")
+    with open(fn, "w") as f:
+        n = f.write(lines)
+        print(n, "bytes written")
+        n = f.write(short)
+        print(n, "bytes written")
+        n = f.write(lines)
+        print(n, "bytes written")
+
+    with open(fn, "r") as f:
+        result1 = f.read()
+        print(len(result1), "bytes read")
+
+    fn = "/fc/rats1.txt"
+    print()
+    print("Single block read/write")
+    with open(fn, "w") as f:
+        n = f.write(short)  # one block
+        print(n, "bytes written")
+
+    with open(fn, "r") as f:
+        result2 = f.read()
+        print(len(result2), "bytes read")
+
+    os.umount("/fc")
+
+    print()
+    print("Verifying data read back")
+    success = True
+    if result1 == "".join((lines, short, lines)):
+        print("Large file Pass")
+    else:
+        print("Large file Fail")
+        success = False
+    if result2 == short:
+        print("Small file Pass")
+    else:
+        print("Small file Fail")
+        success = False
+    print()
+    print("Tests", "passed" if success else "failed")

From cc2cdeb94bb1cac3bb6b32fcd06ddae323ceb771 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:25:21 +1000
Subject: [PATCH 079/343] micropython/net: Add "webrepl" server from main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/net/webrepl/manifest.py      |   2 +
 micropython/net/webrepl/webrepl.py       | 177 +++++++++++++++++++++++
 micropython/net/webrepl/webrepl_setup.py | 107 ++++++++++++++
 3 files changed, 286 insertions(+)
 create mode 100644 micropython/net/webrepl/manifest.py
 create mode 100644 micropython/net/webrepl/webrepl.py
 create mode 100644 micropython/net/webrepl/webrepl_setup.py

diff --git a/micropython/net/webrepl/manifest.py b/micropython/net/webrepl/manifest.py
new file mode 100644
index 000000000..6d1a31421
--- /dev/null
+++ b/micropython/net/webrepl/manifest.py
@@ -0,0 +1,2 @@
+module("webrepl.py", opt=3)
+module("webrepl_setup.py", opt=3)
diff --git a/micropython/net/webrepl/webrepl.py b/micropython/net/webrepl/webrepl.py
new file mode 100644
index 000000000..56767d8b7
--- /dev/null
+++ b/micropython/net/webrepl/webrepl.py
@@ -0,0 +1,177 @@
+# This module should be imported from REPL, not run from command line.
+import binascii
+import hashlib
+import network
+import os
+import socket
+import sys
+import websocket
+import _webrepl
+
+listen_s = None
+client_s = None
+
+DEBUG = 0
+
+_DEFAULT_STATIC_HOST = const("https://micropython.org/webrepl/")
+static_host = _DEFAULT_STATIC_HOST
+
+
+def server_handshake(cl):
+    req = cl.makefile("rwb", 0)
+    # Skip HTTP GET line.
+    l = req.readline()
+    if DEBUG:
+        sys.stdout.write(repr(l))
+
+    webkey = None
+    upgrade = False
+    websocket = False
+
+    while True:
+        l = req.readline()
+        if not l:
+            # EOF in headers.
+            return False
+        if l == b"\r\n":
+            break
+        if DEBUG:
+            sys.stdout.write(l)
+        h, v = [x.strip() for x in l.split(b":", 1)]
+        if DEBUG:
+            print((h, v))
+        if h == b"Sec-WebSocket-Key":
+            webkey = v
+        elif h == b"Connection" and b"Upgrade" in v:
+            upgrade = True
+        elif h == b"Upgrade" and v == b"websocket":
+            websocket = True
+
+    if not (upgrade and websocket and webkey):
+        return False
+
+    if DEBUG:
+        print("Sec-WebSocket-Key:", webkey, len(webkey))
+
+    d = hashlib.sha1(webkey)
+    d.update(b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
+    respkey = d.digest()
+    respkey = binascii.b2a_base64(respkey)[:-1]
+    if DEBUG:
+        print("respkey:", respkey)
+
+    cl.send(
+        b"""\
+HTTP/1.1 101 Switching Protocols\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Sec-WebSocket-Accept: """
+    )
+    cl.send(respkey)
+    cl.send("\r\n\r\n")
+
+    return True
+
+
+def send_html(cl):
+    cl.send(
+        b"""\
+HTTP/1.0 200 OK\r
+\r
+<base href=\""""
+    )
+    cl.send(static_host)
+    cl.send(
+        b"""\"></base>\r
+<script src="webrepl_content.js"></script>\r
+"""
+    )
+    cl.close()
+
+
+def setup_conn(port, accept_handler):
+    global listen_s
+    listen_s = socket.socket()
+    listen_s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+
+    ai = socket.getaddrinfo("0.0.0.0", port)
+    addr = ai[0][4]
+
+    listen_s.bind(addr)
+    listen_s.listen(1)
+    if accept_handler:
+        listen_s.setsockopt(socket.SOL_SOCKET, 20, accept_handler)
+    for i in (network.AP_IF, network.STA_IF):
+        iface = network.WLAN(i)
+        if iface.active():
+            print("WebREPL server started on http://%s:%d/" % (iface.ifconfig()[0], port))
+    return listen_s
+
+
+def accept_conn(listen_sock):
+    global client_s
+    cl, remote_addr = listen_sock.accept()
+
+    if not server_handshake(cl):
+        send_html(cl)
+        return False
+
+    prev = os.dupterm(None)
+    os.dupterm(prev)
+    if prev:
+        print("\nConcurrent WebREPL connection from", remote_addr, "rejected")
+        cl.close()
+        return False
+    print("\nWebREPL connection from:", remote_addr)
+    client_s = cl
+
+    ws = websocket.websocket(cl, True)
+    ws = _webrepl._webrepl(ws)
+    cl.setblocking(False)
+    # notify REPL on socket incoming data (ESP32/ESP8266-only)
+    if hasattr(os, "dupterm_notify"):
+        cl.setsockopt(socket.SOL_SOCKET, 20, os.dupterm_notify)
+    os.dupterm(ws)
+
+    return True
+
+
+def stop():
+    global listen_s, client_s
+    os.dupterm(None)
+    if client_s:
+        client_s.close()
+    if listen_s:
+        listen_s.close()
+
+
+def start(port=8266, password=None, accept_handler=accept_conn):
+    global static_host
+    stop()
+    webrepl_pass = password
+    if webrepl_pass is None:
+        try:
+            import webrepl_cfg
+
+            webrepl_pass = webrepl_cfg.PASS
+            if hasattr(webrepl_cfg, "BASE"):
+                static_host = webrepl_cfg.BASE
+        except:
+            print("WebREPL is not configured, run 'import webrepl_setup'")
+
+    _webrepl.password(webrepl_pass)
+    s = setup_conn(port, accept_handler)
+
+    if accept_handler is None:
+        print("Starting webrepl in foreground mode")
+        # Run accept_conn to serve HTML until we get a websocket connection.
+        while not accept_conn(s):
+            pass
+    elif password is None:
+        print("Started webrepl in normal mode")
+    else:
+        print("Started webrepl in manual override mode")
+
+
+def start_foreground(port=8266, password=None):
+    start(port, password, None)
diff --git a/micropython/net/webrepl/webrepl_setup.py b/micropython/net/webrepl/webrepl_setup.py
new file mode 100644
index 000000000..16e5f76e6
--- /dev/null
+++ b/micropython/net/webrepl/webrepl_setup.py
@@ -0,0 +1,107 @@
+import sys
+
+import os
+import machine
+
+RC = "./boot.py"
+CONFIG = "./webrepl_cfg.py"
+
+
+def input_choice(prompt, choices):
+    while 1:
+        resp = input(prompt)
+        if resp in choices:
+            return resp
+
+
+def getpass(prompt):
+    return input(prompt)
+
+
+def input_pass():
+    while 1:
+        passwd1 = getpass("New password (4-9 chars): ")
+        if len(passwd1) < 4 or len(passwd1) > 9:
+            print("Invalid password length")
+            continue
+        passwd2 = getpass("Confirm password: ")
+        if passwd1 == passwd2:
+            return passwd1
+        print("Passwords do not match")
+
+
+def exists(fname):
+    try:
+        with open(fname):
+            pass
+        return True
+    except OSError:
+        return False
+
+
+def get_daemon_status():
+    with open(RC) as f:
+        for l in f:
+            if "webrepl" in l:
+                if l.startswith("#"):
+                    return False
+                return True
+        return None
+
+
+def change_daemon(action):
+    LINES = ("import webrepl", "webrepl.start()")
+    with open(RC) as old_f, open(RC + ".tmp", "w") as new_f:
+        found = False
+        for l in old_f:
+            for patt in LINES:
+                if patt in l:
+                    found = True
+                    if action and l.startswith("#"):
+                        l = l[1:]
+                    elif not action and not l.startswith("#"):
+                        l = "#" + l
+            new_f.write(l)
+        if not found:
+            new_f.write("import webrepl\nwebrepl.start()\n")
+    # FatFs rename() is not POSIX compliant, will raise OSError if
+    # dest file exists.
+    os.remove(RC)
+    os.rename(RC + ".tmp", RC)
+
+
+def main():
+    status = get_daemon_status()
+
+    print("WebREPL daemon auto-start status:", "enabled" if status else "disabled")
+    print("\nWould you like to (E)nable or (D)isable it running on boot?")
+    print("(Empty line to quit)")
+    resp = input("> ").upper()
+
+    if resp == "E":
+        if exists(CONFIG):
+            resp2 = input_choice(
+                "Would you like to change WebREPL password? (y/n) ", ("y", "n", "")
+            )
+        else:
+            print("To enable WebREPL, you must set password for it")
+            resp2 = "y"
+
+        if resp2 == "y":
+            passwd = input_pass()
+            with open(CONFIG, "w") as f:
+                f.write("PASS = %r\n" % passwd)
+
+    if resp not in ("D", "E") or (resp == "D" and not status) or (resp == "E" and status):
+        print("No further action required")
+        sys.exit()
+
+    change_daemon(resp == "E")
+
+    print("Changes will be activated after reboot")
+    resp = input_choice("Would you like to reboot now? (y/n) ", ("y", "n", ""))
+    if resp == "y":
+        machine.reset()
+
+
+main()

From 58f8bec54d5b3b959247b73a6e8f28e8493bd30b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:26:12 +1000
Subject: [PATCH 080/343] micropython/net: Add "ntptime" client from main repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/net/ntptime/manifest.py |  1 +
 micropython/net/ntptime/ntptime.py  | 48 +++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 micropython/net/ntptime/manifest.py
 create mode 100644 micropython/net/ntptime/ntptime.py

diff --git a/micropython/net/ntptime/manifest.py b/micropython/net/ntptime/manifest.py
new file mode 100644
index 000000000..fa444ec75
--- /dev/null
+++ b/micropython/net/ntptime/manifest.py
@@ -0,0 +1 @@
+module("ntptime.py", opt=3)
diff --git a/micropython/net/ntptime/ntptime.py b/micropython/net/ntptime/ntptime.py
new file mode 100644
index 000000000..05d7e9717
--- /dev/null
+++ b/micropython/net/ntptime/ntptime.py
@@ -0,0 +1,48 @@
+import utime
+
+try:
+    import usocket as socket
+except:
+    import socket
+try:
+    import ustruct as struct
+except:
+    import struct
+
+# The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
+host = "pool.ntp.org"
+
+
+def time():
+    NTP_QUERY = bytearray(48)
+    NTP_QUERY[0] = 0x1B
+    addr = socket.getaddrinfo(host, 123)[0][-1]
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        s.settimeout(1)
+        res = s.sendto(NTP_QUERY, addr)
+        msg = s.recv(48)
+    finally:
+        s.close()
+    val = struct.unpack("!I", msg[40:44])[0]
+
+    EPOCH_YEAR = utime.gmtime(0)[0]
+    if EPOCH_YEAR == 2000:
+        # (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
+        NTP_DELTA = 3155673600
+    elif EPOCH_YEAR == 1970:
+        # (date(1970, 1, 1) - date(1900, 1, 1)).days * 24*60*60
+        NTP_DELTA = 2208988800
+    else:
+        raise Exception("Unsupported epoch: {}".format(EPOCH_YEAR))
+
+    return val - NTP_DELTA
+
+
+# There's currently no timezone support in MicroPython, and the RTC is set in UTC time.
+def settime():
+    t = time()
+    import machine
+
+    tm = utime.gmtime(t)
+    machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))

From 64e752cce61897410f46b18c1eba4feb19d4e4ac Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 15:57:52 +1000
Subject: [PATCH 081/343] aioble/client.py: Use characteristic end handle (when
 available).

The `bluetooth` module replaced the def_handle field with end_handle
in the characteristic result IRQ. Use this when querying for
descriptors.

In the case where this is not available (older versions of micropython)
continue the existing behavior of searching just past the value handle,
although decrease this to +2 to avoid finding other characteristic's
descriptors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/client.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/client.py b/micropython/bluetooth/aioble/aioble/client.py
index 35e33a526..e6702e975 100644
--- a/micropython/bluetooth/aioble/aioble/client.py
+++ b/micropython/bluetooth/aioble/aioble/client.py
@@ -48,9 +48,9 @@ def _client_irq(event, data):
         conn_handle, status = data
         ClientDiscover._discover_done(conn_handle, status)
     elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
-        conn_handle, def_handle, value_handle, properties, uuid = data
+        conn_handle, end_handle, value_handle, properties, uuid = data
         ClientDiscover._discover_result(
-            conn_handle, def_handle, value_handle, properties, bluetooth.UUID(uuid)
+            conn_handle, end_handle, value_handle, properties, bluetooth.UUID(uuid)
         )
     elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
         conn_handle, status = data
@@ -284,12 +284,15 @@ def _write_done(conn_handle, value_handle, status):
 # this class directly, instead use `async for characteristic in
 # service.characteristics([uuid])` or `await service.characteristic(uuid)`.
 class ClientCharacteristic(BaseClientCharacteristic):
-    def __init__(self, service, def_handle, value_handle, properties, uuid):
+    def __init__(self, service, end_handle, value_handle, properties, uuid):
         self.service = service
         self.connection = service.connection
 
+        # Used for descriptor discovery. If available, otherwise assume just
+        # past the value handle (enough for two descriptors without risking
+        # going into the next characteristic).
+        self._end_handle = end_handle if end_handle > value_handle else value_handle + 2
         # Used for read/write/notify ops.
-        self._def_handle = def_handle
         self._value_handle = value_handle
 
         # Which operations are supported.
@@ -323,7 +326,7 @@ def __init__(self, service, def_handle, value_handle, properties, uuid):
 
     def __str__(self):
         return "Characteristic: {} {} {} {}".format(
-            self._def_handle, self._value_handle, self.properties, self.uuid
+            self._end_handle, self._value_handle, self.properties, self.uuid
         )
 
     def _connection(self):
@@ -444,9 +447,7 @@ def __init__(self, characteristic, dsc_handle, uuid):
         self.properties = _FLAG_READ | _FLAG_WRITE_NO_RESPONSE
 
     def __str__(self):
-        return "Descriptor: {} {} {} {}".format(
-            self._def_handle, self._value_handle, self.properties, self.uuid
-        )
+        return "Descriptor: {} {} {}".format(self._value_handle, self.properties, self.uuid)
 
     def _connection(self):
         return self.characteristic.service.connection
@@ -456,5 +457,5 @@ def _start_discovery(characteristic, uuid=None):
         ble.gattc_discover_descriptors(
             characteristic._connection()._conn_handle,
             characteristic._value_handle,
-            characteristic._value_handle + 5,
+            characteristic._end_handle,
         )

From 765f14b501785e6f7bbf3b6be5827c48d52a3eb8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 15:59:09 +1000
Subject: [PATCH 082/343] aioble/server.py: Fix registration for descriptors.

This allows a server to register descriptors, which was previously not
fully implemented.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/server.py | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index 39d3a0105..d01d3e4c4 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -83,10 +83,6 @@ def _register(self, value_handle):
             self.write(self._initial)
             self._initial = None
 
-    # Generate tuple for gatts_register_services.
-    def _tuple(self):
-        return (self.uuid, self.flags)
-
     # Read value from local db.
     def read(self):
         if self._value_handle is None:
@@ -105,8 +101,9 @@ def write(self, data, send_update=False):
     # the write, or a tuple of (connection, value) if capture is enabled for
     # this characteristics.
     async def written(self, timeout_ms=None):
-        if not self._write_event:
-            raise ValueError()
+        if not hasattr(self, "_write_event"):
+            # Not a writable characteristic.
+            return
 
         # If the queue is empty, then we need to wait. However, if the queue
         # has a single item, we also need to do a no-op wait in order to
@@ -200,6 +197,14 @@ def __init__(
         self._value_handle = None
         self._initial = initial
 
+    # Generate tuple for gatts_register_services.
+    def _tuple(self):
+        if self.descriptors:
+            return (self.uuid, self.flags, tuple(d._tuple() for d in self.descriptors))
+        else:
+            # Workaround: v1.19 and below can't handle an empty descriptor tuple.
+            return (self.uuid, self.flags)
+
     def notify(self, connection, data=None):
         if not (self.flags & _FLAG_NOTIFY):
             raise ValueError("Not supported")
@@ -257,8 +262,8 @@ def __init__(self, characteristic, uuid, read=False, write=False, initial=None):
         if read:
             flags |= _FLAG_DESC_READ
         if write:
-            self._write_connection = None
             self._write_event = asyncio.ThreadSafeFlag()
+            self._write_queue = deque((), 1)
             flags |= _FLAG_DESC_WRITE
 
         self.uuid = uuid
@@ -266,6 +271,10 @@ def __init__(self, characteristic, uuid, read=False, write=False, initial=None):
         self._value_handle = None
         self._initial = initial
 
+    # Generate tuple for gatts_register_services.
+    def _tuple(self):
+        return (self.uuid, self.flags)
+
 
 # Turn the Service/Characteristic/Descriptor classes into a registration tuple
 # and then extract their value handles.

From e58b609572fbded51eb1c04c98a91ab987a338b4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 16:34:34 +1000
Subject: [PATCH 083/343] aioble/client.py: Make read/write events work for
 descriptors.

Descriptors were missing common initialisation for events shared with
characteristics.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/client.py | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/client.py b/micropython/bluetooth/aioble/aioble/client.py
index e6702e975..0ccc70866 100644
--- a/micropython/bluetooth/aioble/aioble/client.py
+++ b/micropython/bluetooth/aioble/aioble/client.py
@@ -193,6 +193,29 @@ def _start_discovery(connection, uuid=None):
 
 
 class BaseClientCharacteristic:
+    def __init__(self, value_handle, properties, uuid):
+        # Used for read/write/notify ops.
+        self._value_handle = value_handle
+
+        # Which operations are supported.
+        self.properties = properties
+
+        # Allows comparison to a known uuid.
+        self.uuid = uuid
+
+        if properties & _FLAG_READ:
+            # Fired for each read result and read done IRQ.
+            self._read_event = None
+            self._read_data = None
+            # Used to indicate that the read is complete.
+            self._read_status = None
+
+        if (properties & _FLAG_WRITE) or (properties & _FLAG_WRITE_NO_RESPONSE):
+            # Fired for the write done IRQ.
+            self._write_event = None
+            # Used to indicate that the write is complete.
+            self._write_status = None
+
     # Register this value handle so events can find us.
     def _register_with_connection(self):
         self._connection()._characteristics[self._value_handle] = self
@@ -292,27 +315,8 @@ def __init__(self, service, end_handle, value_handle, properties, uuid):
         # past the value handle (enough for two descriptors without risking
         # going into the next characteristic).
         self._end_handle = end_handle if end_handle > value_handle else value_handle + 2
-        # Used for read/write/notify ops.
-        self._value_handle = value_handle
-
-        # Which operations are supported.
-        self.properties = properties
 
-        # Allows comparison to a known uuid.
-        self.uuid = uuid
-
-        if properties & _FLAG_READ:
-            # Fired for each read result and read done IRQ.
-            self._read_event = None
-            self._read_data = None
-            # Used to indicate that the read is complete.
-            self._read_status = None
-
-        if (properties & _FLAG_WRITE) or (properties & _FLAG_WRITE_NO_RESPONSE):
-            # Fired for the write done IRQ.
-            self._write_event = None
-            # Used to indicate that the write is complete.
-            self._write_status = None
+        super().__init__(value_handle, properties, uuid)
 
         if properties & _FLAG_NOTIFY:
             # Fired when a notification arrives.
@@ -437,14 +441,7 @@ class ClientDescriptor(BaseClientCharacteristic):
     def __init__(self, characteristic, dsc_handle, uuid):
         self.characteristic = characteristic
 
-        # Allows comparison to a known uuid.
-        self.uuid = uuid
-
-        # Used for read/write.
-        self._value_handle = dsc_handle
-
-        # Default flags
-        self.properties = _FLAG_READ | _FLAG_WRITE_NO_RESPONSE
+        super().__init__(dsc_handle, _FLAG_READ | _FLAG_WRITE_NO_RESPONSE, uuid)
 
     def __str__(self):
         return "Descriptor: {} {} {}".format(self._value_handle, self.properties, self.uuid)

From d080924d12ad5e24d78de77b5e2d1bb24ed79569 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 16:35:58 +1000
Subject: [PATCH 084/343] aioble/multitests: Add descriptor multitest.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../aioble/multitests/ble_descriptor.py       | 136 ++++++++++++++++++
 .../aioble/multitests/ble_descriptor.py.exp   |  24 ++++
 2 files changed, 160 insertions(+)
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_descriptor.py
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_descriptor.py.exp

diff --git a/micropython/bluetooth/aioble/multitests/ble_descriptor.py b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
new file mode 100644
index 000000000..2354dff6b
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
@@ -0,0 +1,136 @@
+# Test descriptor discovery/read/write from both GATTS and GATTC.
+
+import sys
+
+sys.path.append("")
+
+from micropython import const
+import time, machine
+
+import uasyncio as asyncio
+import aioble
+import bluetooth
+
+TIMEOUT_MS = 5000
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR1_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR1_DESC1_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444445")
+CHAR1_DESC2_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444446")
+CHAR2_UUID = bluetooth.UUID("00000000-1111-2222-3333-555555555555")
+CHAR3_UUID = bluetooth.UUID("00000000-1111-2222-3333-666666666666")
+CHAR3_DESC1_UUID = bluetooth.UUID("00000000-1111-2222-3333-666666666667")
+
+
+# Acting in peripheral role.
+async def instance0_task():
+    service = aioble.Service(SERVICE_UUID)
+    char1 = aioble.Characteristic(
+        service, CHAR1_UUID, read=True, write=True, notify=True, indicate=True
+    )
+    char1_desc1 = aioble.Descriptor(char1, CHAR1_DESC1_UUID, read=True)
+    char1_desc1.write("char1_desc1")
+    char1_desc2 = aioble.Descriptor(char1, CHAR1_DESC2_UUID, read=True, write=True)
+    char1_desc2.write("char1_desc2")
+    char2 = aioble.Characteristic(
+        service, CHAR2_UUID, read=True, write=True, notify=True, indicate=True
+    )
+    char3 = aioble.Characteristic(
+        service, CHAR3_UUID, read=True, write=True, notify=True, indicate=True
+    )
+    char3_desc1 = aioble.Descriptor(char3, CHAR3_DESC1_UUID, read=True)
+    char3_desc1.write("char3_desc1")
+    aioble.register_services(service)
+
+    multitest.globals(BDADDR=aioble.config("mac"))
+    multitest.next()
+
+    # Wait for central to connect to us.
+    print("advertise")
+    connection = await aioble.advertise(
+        20_000, adv_data=b"\x02\x01\x06\x04\xffMPY", timeout_ms=TIMEOUT_MS
+    )
+    print("connected")
+
+    await char1_desc2.written()
+    print("written", char1_desc2.read())
+
+    # Wait for the central to disconnect.
+    await connection.disconnected(timeout_ms=TIMEOUT_MS)
+    print("disconnected")
+
+
+def instance0():
+    try:
+        asyncio.run(instance0_task())
+    finally:
+        aioble.stop()
+
+
+# Acting in central role.
+async def instance1_task():
+    multitest.next()
+
+    # Connect to peripheral and then disconnect.
+    print("connect")
+    device = aioble.Device(*BDADDR)
+    connection = await device.connect(timeout_ms=TIMEOUT_MS)
+
+    service = await connection.service(SERVICE_UUID)
+    print("service", service.uuid)
+
+    # Discover characteristics.
+    uuids = []
+    async for char in service.characteristics():
+        uuids.append(char.uuid)
+    print("found", sorted(uuids))
+
+    char1 = await service.characteristic(CHAR1_UUID)
+    print("char1", char1.uuid)
+
+    uuids = []
+    async for desc in char1.descriptors():
+        uuids.append(desc.uuid)
+    print("char1 descs", sorted(uuids))
+
+    char1_desc1 = await char1.descriptor(CHAR1_DESC1_UUID)
+    print("char1 desc1", char1_desc1.uuid)
+    print("read", await char1_desc1.read())
+
+    char1_desc2 = await char1.descriptor(CHAR1_DESC2_UUID)
+    print("char1 desc2", char1_desc2.uuid)
+    print("read", await char1_desc2.read())
+    print("write")
+    await char1_desc2.write("update")
+
+    char2 = await service.characteristic(CHAR2_UUID)
+    print("char2", char2.uuid)
+
+    uuids = []
+    async for desc in char2.descriptors():
+        uuids.append(desc.uuid)
+    print("char2 descs", sorted(uuids))
+
+    char3 = await service.characteristic(CHAR3_UUID)
+    print("char3", char3.uuid)
+
+    uuids = []
+    async for desc in char3.descriptors():
+        uuids.append(desc.uuid)
+    print("char3 descs", sorted(uuids))
+
+    char3_desc1 = await char3.descriptor(CHAR3_DESC1_UUID)
+    print("char3 desc1", char3_desc1.uuid)
+    print("read", await char3_desc1.read())
+
+    # Disconnect from peripheral.
+    print("disconnect")
+    await connection.disconnect(timeout_ms=TIMEOUT_MS)
+    print("disconnected")
+
+
+def instance1():
+    try:
+        asyncio.run(instance1_task())
+    finally:
+        aioble.stop()
diff --git a/micropython/bluetooth/aioble/multitests/ble_descriptor.py.exp b/micropython/bluetooth/aioble/multitests/ble_descriptor.py.exp
new file mode 100644
index 000000000..44ed4797b
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_descriptor.py.exp
@@ -0,0 +1,24 @@
+--- instance0 ---
+advertise
+connected
+written b'update'
+disconnected
+--- instance1 ---
+connect
+service UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+found [UUID('00000000-1111-2222-3333-444444444444'), UUID('00000000-1111-2222-3333-555555555555'), UUID('00000000-1111-2222-3333-666666666666')]
+char1 UUID('00000000-1111-2222-3333-444444444444')
+char1 descs [UUID(0x2902), UUID('00000000-1111-2222-3333-444444444445'), UUID('00000000-1111-2222-3333-444444444446')]
+char1 desc1 UUID('00000000-1111-2222-3333-444444444445')
+read b'char1_desc1'
+char1 desc2 UUID('00000000-1111-2222-3333-444444444446')
+read b'char1_desc2'
+write
+char2 UUID('00000000-1111-2222-3333-555555555555')
+char2 descs [UUID(0x2902)]
+char3 UUID('00000000-1111-2222-3333-666666666666')
+char3 descs [UUID(0x2902), UUID('00000000-1111-2222-3333-666666666667')]
+char3 desc1 UUID('00000000-1111-2222-3333-666666666667')
+read b'char3_desc1'
+disconnect
+disconnected

From 8a03f7b91f3fa8273ee7a3a0ad7062ccc37e47d4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 10 Sep 2022 01:47:35 +1000
Subject: [PATCH 085/343] python-stdlib: Remove pystone (and variants).

We have a more useful version of this in the main repo's performance tests.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/pystone/manifest.py             |   3 -
 python-stdlib/pystone/pystone.py              | 294 ------------------
 python-stdlib/pystone_lowmem/manifest.py      |   3 -
 .../pystone_lowmem/pystone_lowmem.py          | 294 ------------------
 python-stdlib/test.pystone/manifest.py        |   3 -
 python-stdlib/test.pystone/test/pystone.py    | 294 ------------------
 6 files changed, 891 deletions(-)
 delete mode 100644 python-stdlib/pystone/manifest.py
 delete mode 100755 python-stdlib/pystone/pystone.py
 delete mode 100644 python-stdlib/pystone_lowmem/manifest.py
 delete mode 100755 python-stdlib/pystone_lowmem/pystone_lowmem.py
 delete mode 100644 python-stdlib/test.pystone/manifest.py
 delete mode 100755 python-stdlib/test.pystone/test/pystone.py

diff --git a/python-stdlib/pystone/manifest.py b/python-stdlib/pystone/manifest.py
deleted file mode 100644
index 2a25db815..000000000
--- a/python-stdlib/pystone/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-metadata(version="3.4.2-2")
-
-module("pystone.py")
diff --git a/python-stdlib/pystone/pystone.py b/python-stdlib/pystone/pystone.py
deleted file mode 100755
index dbe1afcde..000000000
--- a/python-stdlib/pystone/pystone.py
+++ /dev/null
@@ -1,294 +0,0 @@
-#! /usr/bin/env python3
-
-"""
-"PYSTONE" Benchmark Program
-
-Version:        Python/1.2 (corresponds to C/1.1 plus 3 Pystone fixes)
-
-Author:         Reinhold P. Weicker,  CACM Vol 27, No 10, 10/84 pg. 1013.
-
-                Translated from ADA to C by Rick Richardson.
-                Every method to preserve ADA-likeness has been used,
-                at the expense of C-ness.
-
-                Translated from C to Python by Guido van Rossum.
-
-Version History:
-
-                Version 1.1 corrects two bugs in version 1.0:
-
-                First, it leaked memory: in Proc1(), NextRecord ends
-                up having a pointer to itself.  I have corrected this
-                by zapping NextRecord.PtrComp at the end of Proc1().
-
-                Second, Proc3() used the operator != to compare a
-                record to None.  This is rather inefficient and not
-                true to the intention of the original benchmark (where
-                a pointer comparison to None is intended; the !=
-                operator attempts to find a method __cmp__ to do value
-                comparison of the record).  Version 1.1 runs 5-10
-                percent faster than version 1.0, so benchmark figures
-                of different versions can't be compared directly.
-
-                Version 1.2 changes the division to floor division.
-
-                Under Python 3 version 1.1 would use the normal division
-                operator, resulting in some of the operations mistakenly
-                yielding floats. Version 1.2 instead uses floor division
-                making the benchmark a integer benchmark again.
-
-"""
-
-LOOPS = 50000
-
-from utime import clock
-
-__version__ = "1.2"
-
-[Ident1, Ident2, Ident3, Ident4, Ident5] = range(1, 6)
-
-
-class Record:
-    def __init__(self, PtrComp=None, Discr=0, EnumComp=0, IntComp=0, StringComp=0):
-        self.PtrComp = PtrComp
-        self.Discr = Discr
-        self.EnumComp = EnumComp
-        self.IntComp = IntComp
-        self.StringComp = StringComp
-
-    def copy(self):
-        return Record(self.PtrComp, self.Discr, self.EnumComp, self.IntComp, self.StringComp)
-
-
-TRUE = 1
-FALSE = 0
-
-
-def main(loops=LOOPS):
-    benchtime, stones = pystones(loops)
-    print("Pystone(%s) time for %d passes = %g" % (__version__, loops, benchtime))
-    print("This machine benchmarks at %g pystones/second" % stones)
-
-
-def pystones(loops=LOOPS):
-    return Proc0(loops)
-
-
-IntGlob = 0
-BoolGlob = FALSE
-Char1Glob = "\0"
-Char2Glob = "\0"
-Array1Glob = [0] * 51
-Array2Glob = [x[:] for x in [Array1Glob] * 51]
-PtrGlb = None
-PtrGlbNext = None
-
-
-def Proc0(loops=LOOPS):
-    global IntGlob
-    global BoolGlob
-    global Char1Glob
-    global Char2Glob
-    global Array1Glob
-    global Array2Glob
-    global PtrGlb
-    global PtrGlbNext
-
-    starttime = clock()
-    for i in range(loops):
-        pass
-    nulltime = clock() - starttime
-
-    PtrGlbNext = Record()
-    PtrGlb = Record()
-    PtrGlb.PtrComp = PtrGlbNext
-    PtrGlb.Discr = Ident1
-    PtrGlb.EnumComp = Ident3
-    PtrGlb.IntComp = 40
-    PtrGlb.StringComp = "DHRYSTONE PROGRAM, SOME STRING"
-    String1Loc = "DHRYSTONE PROGRAM, 1'ST STRING"
-    Array2Glob[8][7] = 10
-
-    starttime = clock()
-
-    for i in range(loops):
-        Proc5()
-        Proc4()
-        IntLoc1 = 2
-        IntLoc2 = 3
-        String2Loc = "DHRYSTONE PROGRAM, 2'ND STRING"
-        EnumLoc = Ident2
-        BoolGlob = not Func2(String1Loc, String2Loc)
-        while IntLoc1 < IntLoc2:
-            IntLoc3 = 5 * IntLoc1 - IntLoc2
-            IntLoc3 = Proc7(IntLoc1, IntLoc2)
-            IntLoc1 = IntLoc1 + 1
-        Proc8(Array1Glob, Array2Glob, IntLoc1, IntLoc3)
-        PtrGlb = Proc1(PtrGlb)
-        CharIndex = "A"
-        while CharIndex <= Char2Glob:
-            if EnumLoc == Func1(CharIndex, "C"):
-                EnumLoc = Proc6(Ident1)
-            CharIndex = chr(ord(CharIndex) + 1)
-        IntLoc3 = IntLoc2 * IntLoc1
-        IntLoc2 = IntLoc3 // IntLoc1
-        IntLoc2 = 7 * (IntLoc3 - IntLoc2) - IntLoc1
-        IntLoc1 = Proc2(IntLoc1)
-
-    benchtime = clock() - starttime - nulltime
-    if benchtime == 0.0:
-        loopsPerBenchtime = 0.0
-    else:
-        loopsPerBenchtime = loops / benchtime
-    return benchtime, loopsPerBenchtime
-
-
-def Proc1(PtrParIn):
-    PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
-    PtrParIn.IntComp = 5
-    NextRecord.IntComp = PtrParIn.IntComp
-    NextRecord.PtrComp = PtrParIn.PtrComp
-    NextRecord.PtrComp = Proc3(NextRecord.PtrComp)
-    if NextRecord.Discr == Ident1:
-        NextRecord.IntComp = 6
-        NextRecord.EnumComp = Proc6(PtrParIn.EnumComp)
-        NextRecord.PtrComp = PtrGlb.PtrComp
-        NextRecord.IntComp = Proc7(NextRecord.IntComp, 10)
-    else:
-        PtrParIn = NextRecord.copy()
-    NextRecord.PtrComp = None
-    return PtrParIn
-
-
-def Proc2(IntParIO):
-    IntLoc = IntParIO + 10
-    while 1:
-        if Char1Glob == "A":
-            IntLoc = IntLoc - 1
-            IntParIO = IntLoc - IntGlob
-            EnumLoc = Ident1
-        if EnumLoc == Ident1:
-            break
-    return IntParIO
-
-
-def Proc3(PtrParOut):
-    global IntGlob
-
-    if PtrGlb is not None:
-        PtrParOut = PtrGlb.PtrComp
-    else:
-        IntGlob = 100
-    PtrGlb.IntComp = Proc7(10, IntGlob)
-    return PtrParOut
-
-
-def Proc4():
-    global Char2Glob
-
-    BoolLoc = Char1Glob == "A"
-    BoolLoc = BoolLoc or BoolGlob
-    Char2Glob = "B"
-
-
-def Proc5():
-    global Char1Glob
-    global BoolGlob
-
-    Char1Glob = "A"
-    BoolGlob = FALSE
-
-
-def Proc6(EnumParIn):
-    EnumParOut = EnumParIn
-    if not Func3(EnumParIn):
-        EnumParOut = Ident4
-    if EnumParIn == Ident1:
-        EnumParOut = Ident1
-    elif EnumParIn == Ident2:
-        if IntGlob > 100:
-            EnumParOut = Ident1
-        else:
-            EnumParOut = Ident4
-    elif EnumParIn == Ident3:
-        EnumParOut = Ident2
-    elif EnumParIn == Ident4:
-        pass
-    elif EnumParIn == Ident5:
-        EnumParOut = Ident3
-    return EnumParOut
-
-
-def Proc7(IntParI1, IntParI2):
-    IntLoc = IntParI1 + 2
-    IntParOut = IntParI2 + IntLoc
-    return IntParOut
-
-
-def Proc8(Array1Par, Array2Par, IntParI1, IntParI2):
-    global IntGlob
-
-    IntLoc = IntParI1 + 5
-    Array1Par[IntLoc] = IntParI2
-    Array1Par[IntLoc + 1] = Array1Par[IntLoc]
-    Array1Par[IntLoc + 30] = IntLoc
-    for IntIndex in range(IntLoc, IntLoc + 2):
-        Array2Par[IntLoc][IntIndex] = IntLoc
-    Array2Par[IntLoc][IntLoc - 1] = Array2Par[IntLoc][IntLoc - 1] + 1
-    Array2Par[IntLoc + 20][IntLoc] = Array1Par[IntLoc]
-    IntGlob = 5
-
-
-def Func1(CharPar1, CharPar2):
-    CharLoc1 = CharPar1
-    CharLoc2 = CharLoc1
-    if CharLoc2 != CharPar2:
-        return Ident1
-    else:
-        return Ident2
-
-
-def Func2(StrParI1, StrParI2):
-    IntLoc = 1
-    while IntLoc <= 1:
-        if Func1(StrParI1[IntLoc], StrParI2[IntLoc + 1]) == Ident1:
-            CharLoc = "A"
-            IntLoc = IntLoc + 1
-    if CharLoc >= "W" and CharLoc <= "Z":
-        IntLoc = 7
-    if CharLoc == "X":
-        return TRUE
-    else:
-        if StrParI1 > StrParI2:
-            IntLoc = IntLoc + 7
-            return TRUE
-        else:
-            return FALSE
-
-
-def Func3(EnumParIn):
-    EnumLoc = EnumParIn
-    if EnumLoc == Ident3:
-        return TRUE
-    return FALSE
-
-
-if __name__ == "__main__":
-    import sys
-
-    def error(msg):
-        print(msg, end=" ", file=sys.stderr)
-        print("usage: %s [number_of_loops]" % sys.argv[0], file=sys.stderr)
-        sys.exit(100)
-
-    nargs = len(sys.argv) - 1
-    if nargs > 1:
-        error("%d arguments are too many;" % nargs)
-    elif nargs == 1:
-        try:
-            loops = int(sys.argv[1])
-        except ValueError:
-            error("Invalid argument %r;" % sys.argv[1])
-    else:
-        loops = LOOPS
-    main(loops)
diff --git a/python-stdlib/pystone_lowmem/manifest.py b/python-stdlib/pystone_lowmem/manifest.py
deleted file mode 100644
index c46ec68ef..000000000
--- a/python-stdlib/pystone_lowmem/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-metadata(version="3.4.2-4")
-
-module("pystone_lowmem.py")
diff --git a/python-stdlib/pystone_lowmem/pystone_lowmem.py b/python-stdlib/pystone_lowmem/pystone_lowmem.py
deleted file mode 100755
index 739d61376..000000000
--- a/python-stdlib/pystone_lowmem/pystone_lowmem.py
+++ /dev/null
@@ -1,294 +0,0 @@
-#! /usr/bin/env python3
-
-"""
-"PYSTONE" Benchmark Program
-
-Version:        Python/1.2 (corresponds to C/1.1 plus 3 Pystone fixes)
-
-Author:         Reinhold P. Weicker,  CACM Vol 27, No 10, 10/84 pg. 1013.
-
-                Translated from ADA to C by Rick Richardson.
-                Every method to preserve ADA-likeness has been used,
-                at the expense of C-ness.
-
-                Translated from C to Python by Guido van Rossum.
-
-Version History:
-
-                Version 1.1 corrects two bugs in version 1.0:
-
-                First, it leaked memory: in Proc1(), NextRecord ends
-                up having a pointer to itself.  I have corrected this
-                by zapping NextRecord.PtrComp at the end of Proc1().
-
-                Second, Proc3() used the operator != to compare a
-                record to None.  This is rather inefficient and not
-                true to the intention of the original benchmark (where
-                a pointer comparison to None is intended; the !=
-                operator attempts to find a method __cmp__ to do value
-                comparison of the record).  Version 1.1 runs 5-10
-                percent faster than version 1.0, so benchmark figures
-                of different versions can't be compared directly.
-
-                Version 1.2 changes the division to floor division.
-
-                Under Python 3 version 1.1 would use the normal division
-                operator, resulting in some of the operations mistakenly
-                yielding floats. Version 1.2 instead uses floor division
-                making the benchmark a integer benchmark again.
-
-"""
-
-LOOPS = 500
-
-from utime import ticks_ms, ticks_diff
-
-__version__ = "1.2"
-
-[Ident1, Ident2, Ident3, Ident4, Ident5] = range(1, 6)
-
-
-class Record:
-    def __init__(self, PtrComp=None, Discr=0, EnumComp=0, IntComp=0, StringComp=0):
-        self.PtrComp = PtrComp
-        self.Discr = Discr
-        self.EnumComp = EnumComp
-        self.IntComp = IntComp
-        self.StringComp = StringComp
-
-    def copy(self):
-        return Record(self.PtrComp, self.Discr, self.EnumComp, self.IntComp, self.StringComp)
-
-
-TRUE = 1
-FALSE = 0
-
-
-def main(loops=LOOPS):
-    benchtime, stones = pystones(loops)
-    print("Pystone(%s) time for %d passes = %gms" % (__version__, loops, benchtime))
-    print("This machine benchmarks at %g pystones/second" % stones)
-
-
-def pystones(loops=LOOPS):
-    return Proc0(loops)
-
-
-IntGlob = 0
-BoolGlob = FALSE
-Char1Glob = "\0"
-Char2Glob = "\0"
-Array1Glob = [0] * (51 // 2)
-Array2Glob = [x[:] for x in [Array1Glob] * (51 // 2)]
-PtrGlb = None
-PtrGlbNext = None
-
-
-def Proc0(loops=LOOPS):
-    global IntGlob
-    global BoolGlob
-    global Char1Glob
-    global Char2Glob
-    global Array1Glob
-    global Array2Glob
-    global PtrGlb
-    global PtrGlbNext
-
-    starttime = ticks_ms()
-    for i in range(loops):
-        pass
-    nulltime = ticks_diff(ticks_ms(), starttime)
-
-    PtrGlbNext = Record()
-    PtrGlb = Record()
-    PtrGlb.PtrComp = PtrGlbNext
-    PtrGlb.Discr = Ident1
-    PtrGlb.EnumComp = Ident3
-    PtrGlb.IntComp = 40
-    PtrGlb.StringComp = "DHRYSTONE PROGRAM, SOME STRING"
-    String1Loc = "DHRYSTONE PROGRAM, 1'ST STRING"
-    Array2Glob[8 // 2][7 // 2] = 10
-
-    starttime = ticks_ms()
-
-    for i in range(loops):
-        Proc5()
-        Proc4()
-        IntLoc1 = 2
-        IntLoc2 = 3
-        String2Loc = "DHRYSTONE PROGRAM, 2'ND STRING"
-        EnumLoc = Ident2
-        BoolGlob = not Func2(String1Loc, String2Loc)
-        while IntLoc1 < IntLoc2:
-            IntLoc3 = 5 * IntLoc1 - IntLoc2
-            IntLoc3 = Proc7(IntLoc1, IntLoc2)
-            IntLoc1 = IntLoc1 + 1
-        Proc8(Array1Glob, Array2Glob, IntLoc1, IntLoc3)
-        PtrGlb = Proc1(PtrGlb)
-        CharIndex = "A"
-        while CharIndex <= Char2Glob:
-            if EnumLoc == Func1(CharIndex, "C"):
-                EnumLoc = Proc6(Ident1)
-            CharIndex = chr(ord(CharIndex) + 1)
-        IntLoc3 = IntLoc2 * IntLoc1
-        IntLoc2 = IntLoc3 // IntLoc1
-        IntLoc2 = 7 * (IntLoc3 - IntLoc2) - IntLoc1
-        IntLoc1 = Proc2(IntLoc1)
-
-    benchtime = ticks_diff(ticks_ms(), starttime) - nulltime
-    if benchtime == 0:
-        loopsPerBenchtime = 0
-    else:
-        loopsPerBenchtime = loops * 1000 // benchtime
-    return benchtime, loopsPerBenchtime
-
-
-def Proc1(PtrParIn):
-    PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
-    PtrParIn.IntComp = 5
-    NextRecord.IntComp = PtrParIn.IntComp
-    NextRecord.PtrComp = PtrParIn.PtrComp
-    NextRecord.PtrComp = Proc3(NextRecord.PtrComp)
-    if NextRecord.Discr == Ident1:
-        NextRecord.IntComp = 6
-        NextRecord.EnumComp = Proc6(PtrParIn.EnumComp)
-        NextRecord.PtrComp = PtrGlb.PtrComp
-        NextRecord.IntComp = Proc7(NextRecord.IntComp, 10)
-    else:
-        PtrParIn = NextRecord.copy()
-    NextRecord.PtrComp = None
-    return PtrParIn
-
-
-def Proc2(IntParIO):
-    IntLoc = IntParIO + 10
-    while 1:
-        if Char1Glob == "A":
-            IntLoc = IntLoc - 1
-            IntParIO = IntLoc - IntGlob
-            EnumLoc = Ident1
-        if EnumLoc == Ident1:
-            break
-    return IntParIO
-
-
-def Proc3(PtrParOut):
-    global IntGlob
-
-    if PtrGlb is not None:
-        PtrParOut = PtrGlb.PtrComp
-    else:
-        IntGlob = 100
-    PtrGlb.IntComp = Proc7(10, IntGlob)
-    return PtrParOut
-
-
-def Proc4():
-    global Char2Glob
-
-    BoolLoc = Char1Glob == "A"
-    BoolLoc = BoolLoc or BoolGlob
-    Char2Glob = "B"
-
-
-def Proc5():
-    global Char1Glob
-    global BoolGlob
-
-    Char1Glob = "A"
-    BoolGlob = FALSE
-
-
-def Proc6(EnumParIn):
-    EnumParOut = EnumParIn
-    if not Func3(EnumParIn):
-        EnumParOut = Ident4
-    if EnumParIn == Ident1:
-        EnumParOut = Ident1
-    elif EnumParIn == Ident2:
-        if IntGlob > 100:
-            EnumParOut = Ident1
-        else:
-            EnumParOut = Ident4
-    elif EnumParIn == Ident3:
-        EnumParOut = Ident2
-    elif EnumParIn == Ident4:
-        pass
-    elif EnumParIn == Ident5:
-        EnumParOut = Ident3
-    return EnumParOut
-
-
-def Proc7(IntParI1, IntParI2):
-    IntLoc = IntParI1 + 2
-    IntParOut = IntParI2 + IntLoc
-    return IntParOut
-
-
-def Proc8(Array1Par, Array2Par, IntParI1, IntParI2):
-    global IntGlob
-
-    IntLoc = IntParI1 + 5
-    Array1Par[IntLoc // 2] = IntParI2
-    Array1Par[(IntLoc + 1) // 2] = Array1Par[IntLoc // 2]
-    Array1Par[(IntLoc + 30) // 2] = IntLoc
-    for IntIndex in range(IntLoc, IntLoc + 2):
-        Array2Par[IntLoc // 2][IntIndex // 2] = IntLoc
-    Array2Par[IntLoc // 2][(IntLoc - 1) // 2] = Array2Par[IntLoc // 2][(IntLoc - 1) // 2] + 1
-    Array2Par[(IntLoc + 20) // 2][IntLoc // 2] = Array1Par[IntLoc // 2]
-    IntGlob = 5
-
-
-def Func1(CharPar1, CharPar2):
-    CharLoc1 = CharPar1
-    CharLoc2 = CharLoc1
-    if CharLoc2 != CharPar2:
-        return Ident1
-    else:
-        return Ident2
-
-
-def Func2(StrParI1, StrParI2):
-    IntLoc = 1
-    while IntLoc <= 1:
-        if Func1(StrParI1[IntLoc], StrParI2[IntLoc + 1]) == Ident1:
-            CharLoc = "A"
-            IntLoc = IntLoc + 1
-    if CharLoc >= "W" and CharLoc <= "Z":
-        IntLoc = 7
-    if CharLoc == "X":
-        return TRUE
-    else:
-        if StrParI1 > StrParI2:
-            IntLoc = IntLoc + 7
-            return TRUE
-        else:
-            return FALSE
-
-
-def Func3(EnumParIn):
-    EnumLoc = EnumParIn
-    if EnumLoc == Ident3:
-        return TRUE
-    return FALSE
-
-
-if __name__ == "__main__":
-    import sys
-
-    def error(msg):
-        print(msg, end=" ", file=sys.stderr)
-        print("usage: %s [number_of_loops]" % sys.argv[0], file=sys.stderr)
-        sys.exit(100)
-
-    nargs = len(sys.argv) - 1
-    if nargs > 1:
-        error("%d arguments are too many;" % nargs)
-    elif nargs == 1:
-        try:
-            loops = int(sys.argv[1])
-        except ValueError:
-            error("Invalid argument %r;" % sys.argv[1])
-    else:
-        loops = LOOPS
-    main(loops)
diff --git a/python-stdlib/test.pystone/manifest.py b/python-stdlib/test.pystone/manifest.py
deleted file mode 100644
index a1bd59123..000000000
--- a/python-stdlib/test.pystone/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-metadata(version="1.0.1")
-
-package("test")
diff --git a/python-stdlib/test.pystone/test/pystone.py b/python-stdlib/test.pystone/test/pystone.py
deleted file mode 100755
index ac2b8cdd7..000000000
--- a/python-stdlib/test.pystone/test/pystone.py
+++ /dev/null
@@ -1,294 +0,0 @@
-#! /usr/bin/env python3
-
-"""
-"PYSTONE" Benchmark Program
-
-Version:        Python/1.2 (corresponds to C/1.1 plus 3 Pystone fixes)
-
-Author:         Reinhold P. Weicker,  CACM Vol 27, No 10, 10/84 pg. 1013.
-
-                Translated from ADA to C by Rick Richardson.
-                Every method to preserve ADA-likeness has been used,
-                at the expense of C-ness.
-
-                Translated from C to Python by Guido van Rossum.
-
-Version History:
-
-                Version 1.1 corrects two bugs in version 1.0:
-
-                First, it leaked memory: in Proc1(), NextRecord ends
-                up having a pointer to itself.  I have corrected this
-                by zapping NextRecord.PtrComp at the end of Proc1().
-
-                Second, Proc3() used the operator != to compare a
-                record to None.  This is rather inefficient and not
-                true to the intention of the original benchmark (where
-                a pointer comparison to None is intended; the !=
-                operator attempts to find a method __cmp__ to do value
-                comparison of the record).  Version 1.1 runs 5-10
-                percent faster than version 1.0, so benchmark figures
-                of different versions can't be compared directly.
-
-                Version 1.2 changes the division to floor division.
-
-                Under Python 3 version 1.1 would use the normal division
-                operator, resulting in some of the operations mistakenly
-                yielding floats. Version 1.2 instead uses floor division
-                making the benchmark a integer benchmark again.
-
-"""
-
-LOOPS = 50000
-
-from time import clock
-
-__version__ = "1.2"
-
-[Ident1, Ident2, Ident3, Ident4, Ident5] = range(1, 6)
-
-
-class Record:
-    def __init__(self, PtrComp=None, Discr=0, EnumComp=0, IntComp=0, StringComp=0):
-        self.PtrComp = PtrComp
-        self.Discr = Discr
-        self.EnumComp = EnumComp
-        self.IntComp = IntComp
-        self.StringComp = StringComp
-
-    def copy(self):
-        return Record(self.PtrComp, self.Discr, self.EnumComp, self.IntComp, self.StringComp)
-
-
-TRUE = 1
-FALSE = 0
-
-
-def main(loops=LOOPS):
-    benchtime, stones = pystones(loops)
-    print("Pystone(%s) time for %d passes = %g" % (__version__, loops, benchtime))
-    print("This machine benchmarks at %g pystones/second" % stones)
-
-
-def pystones(loops=LOOPS):
-    return Proc0(loops)
-
-
-IntGlob = 0
-BoolGlob = FALSE
-Char1Glob = "\0"
-Char2Glob = "\0"
-Array1Glob = [0] * 51
-Array2Glob = [x[:] for x in [Array1Glob] * 51]
-PtrGlb = None
-PtrGlbNext = None
-
-
-def Proc0(loops=LOOPS):
-    global IntGlob
-    global BoolGlob
-    global Char1Glob
-    global Char2Glob
-    global Array1Glob
-    global Array2Glob
-    global PtrGlb
-    global PtrGlbNext
-
-    starttime = clock()
-    for i in range(loops):
-        pass
-    nulltime = clock() - starttime
-
-    PtrGlbNext = Record()
-    PtrGlb = Record()
-    PtrGlb.PtrComp = PtrGlbNext
-    PtrGlb.Discr = Ident1
-    PtrGlb.EnumComp = Ident3
-    PtrGlb.IntComp = 40
-    PtrGlb.StringComp = "DHRYSTONE PROGRAM, SOME STRING"
-    String1Loc = "DHRYSTONE PROGRAM, 1'ST STRING"
-    Array2Glob[8][7] = 10
-
-    starttime = clock()
-
-    for i in range(loops):
-        Proc5()
-        Proc4()
-        IntLoc1 = 2
-        IntLoc2 = 3
-        String2Loc = "DHRYSTONE PROGRAM, 2'ND STRING"
-        EnumLoc = Ident2
-        BoolGlob = not Func2(String1Loc, String2Loc)
-        while IntLoc1 < IntLoc2:
-            IntLoc3 = 5 * IntLoc1 - IntLoc2
-            IntLoc3 = Proc7(IntLoc1, IntLoc2)
-            IntLoc1 = IntLoc1 + 1
-        Proc8(Array1Glob, Array2Glob, IntLoc1, IntLoc3)
-        PtrGlb = Proc1(PtrGlb)
-        CharIndex = "A"
-        while CharIndex <= Char2Glob:
-            if EnumLoc == Func1(CharIndex, "C"):
-                EnumLoc = Proc6(Ident1)
-            CharIndex = chr(ord(CharIndex) + 1)
-        IntLoc3 = IntLoc2 * IntLoc1
-        IntLoc2 = IntLoc3 // IntLoc1
-        IntLoc2 = 7 * (IntLoc3 - IntLoc2) - IntLoc1
-        IntLoc1 = Proc2(IntLoc1)
-
-    benchtime = clock() - starttime - nulltime
-    if benchtime == 0.0:
-        loopsPerBenchtime = 0.0
-    else:
-        loopsPerBenchtime = loops / benchtime
-    return benchtime, loopsPerBenchtime
-
-
-def Proc1(PtrParIn):
-    PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
-    PtrParIn.IntComp = 5
-    NextRecord.IntComp = PtrParIn.IntComp
-    NextRecord.PtrComp = PtrParIn.PtrComp
-    NextRecord.PtrComp = Proc3(NextRecord.PtrComp)
-    if NextRecord.Discr == Ident1:
-        NextRecord.IntComp = 6
-        NextRecord.EnumComp = Proc6(PtrParIn.EnumComp)
-        NextRecord.PtrComp = PtrGlb.PtrComp
-        NextRecord.IntComp = Proc7(NextRecord.IntComp, 10)
-    else:
-        PtrParIn = NextRecord.copy()
-    NextRecord.PtrComp = None
-    return PtrParIn
-
-
-def Proc2(IntParIO):
-    IntLoc = IntParIO + 10
-    while 1:
-        if Char1Glob == "A":
-            IntLoc = IntLoc - 1
-            IntParIO = IntLoc - IntGlob
-            EnumLoc = Ident1
-        if EnumLoc == Ident1:
-            break
-    return IntParIO
-
-
-def Proc3(PtrParOut):
-    global IntGlob
-
-    if PtrGlb is not None:
-        PtrParOut = PtrGlb.PtrComp
-    else:
-        IntGlob = 100
-    PtrGlb.IntComp = Proc7(10, IntGlob)
-    return PtrParOut
-
-
-def Proc4():
-    global Char2Glob
-
-    BoolLoc = Char1Glob == "A"
-    BoolLoc = BoolLoc or BoolGlob
-    Char2Glob = "B"
-
-
-def Proc5():
-    global Char1Glob
-    global BoolGlob
-
-    Char1Glob = "A"
-    BoolGlob = FALSE
-
-
-def Proc6(EnumParIn):
-    EnumParOut = EnumParIn
-    if not Func3(EnumParIn):
-        EnumParOut = Ident4
-    if EnumParIn == Ident1:
-        EnumParOut = Ident1
-    elif EnumParIn == Ident2:
-        if IntGlob > 100:
-            EnumParOut = Ident1
-        else:
-            EnumParOut = Ident4
-    elif EnumParIn == Ident3:
-        EnumParOut = Ident2
-    elif EnumParIn == Ident4:
-        pass
-    elif EnumParIn == Ident5:
-        EnumParOut = Ident3
-    return EnumParOut
-
-
-def Proc7(IntParI1, IntParI2):
-    IntLoc = IntParI1 + 2
-    IntParOut = IntParI2 + IntLoc
-    return IntParOut
-
-
-def Proc8(Array1Par, Array2Par, IntParI1, IntParI2):
-    global IntGlob
-
-    IntLoc = IntParI1 + 5
-    Array1Par[IntLoc] = IntParI2
-    Array1Par[IntLoc + 1] = Array1Par[IntLoc]
-    Array1Par[IntLoc + 30] = IntLoc
-    for IntIndex in range(IntLoc, IntLoc + 2):
-        Array2Par[IntLoc][IntIndex] = IntLoc
-    Array2Par[IntLoc][IntLoc - 1] = Array2Par[IntLoc][IntLoc - 1] + 1
-    Array2Par[IntLoc + 20][IntLoc] = Array1Par[IntLoc]
-    IntGlob = 5
-
-
-def Func1(CharPar1, CharPar2):
-    CharLoc1 = CharPar1
-    CharLoc2 = CharLoc1
-    if CharLoc2 != CharPar2:
-        return Ident1
-    else:
-        return Ident2
-
-
-def Func2(StrParI1, StrParI2):
-    IntLoc = 1
-    while IntLoc <= 1:
-        if Func1(StrParI1[IntLoc], StrParI2[IntLoc + 1]) == Ident1:
-            CharLoc = "A"
-            IntLoc = IntLoc + 1
-    if CharLoc >= "W" and CharLoc <= "Z":
-        IntLoc = 7
-    if CharLoc == "X":
-        return TRUE
-    else:
-        if StrParI1 > StrParI2:
-            IntLoc = IntLoc + 7
-            return TRUE
-        else:
-            return FALSE
-
-
-def Func3(EnumParIn):
-    EnumLoc = EnumParIn
-    if EnumLoc == Ident3:
-        return TRUE
-    return FALSE
-
-
-if __name__ == "__main__":
-    import sys
-
-    def error(msg):
-        print(msg, end=" ", file=sys.stderr)
-        print("usage: %s [number_of_loops]" % sys.argv[0], file=sys.stderr)
-        sys.exit(100)
-
-    nargs = len(sys.argv) - 1
-    if nargs > 1:
-        error("%d arguments are too many;" % nargs)
-    elif nargs == 1:
-        try:
-            loops = int(sys.argv[1])
-        except ValueError:
-            error("Invalid argument %r;" % sys.argv[1])
-    else:
-        loops = LOOPS
-    main(loops)

From cb88a6a55429a6e858d508d20126c8e7fde59985 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Sep 2022 22:15:33 +1000
Subject: [PATCH 086/343] argparse: Move back to python-stdlib.

Although this primarily makes sense for the unix port, there's nothing
preventing it being used on any port, and it's written for MicroPython.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 {unix-ffi => python-stdlib}/argparse/argparse.py      | 0
 {unix-ffi => python-stdlib}/argparse/manifest.py      | 0
 {unix-ffi => python-stdlib}/argparse/test_argparse.py | 0
 unix-ffi/unittest/manifest.py                         | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename {unix-ffi => python-stdlib}/argparse/argparse.py (100%)
 rename {unix-ffi => python-stdlib}/argparse/manifest.py (100%)
 rename {unix-ffi => python-stdlib}/argparse/test_argparse.py (100%)

diff --git a/unix-ffi/argparse/argparse.py b/python-stdlib/argparse/argparse.py
similarity index 100%
rename from unix-ffi/argparse/argparse.py
rename to python-stdlib/argparse/argparse.py
diff --git a/unix-ffi/argparse/manifest.py b/python-stdlib/argparse/manifest.py
similarity index 100%
rename from unix-ffi/argparse/manifest.py
rename to python-stdlib/argparse/manifest.py
diff --git a/unix-ffi/argparse/test_argparse.py b/python-stdlib/argparse/test_argparse.py
similarity index 100%
rename from unix-ffi/argparse/test_argparse.py
rename to python-stdlib/argparse/test_argparse.py
diff --git a/unix-ffi/unittest/manifest.py b/unix-ffi/unittest/manifest.py
index 3f4ddae59..85a5f4015 100644
--- a/unix-ffi/unittest/manifest.py
+++ b/unix-ffi/unittest/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.9.0")
 
-require("argparse", unix_ffi=True)
+require("argparse")
 require("fnmatch")
 
 module("unittest.py")

From 796a5986cd65e8f2c76d06267b92497ff602eca6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 10 Sep 2022 01:18:24 +1000
Subject: [PATCH 087/343] unittest: Move back to python-stdlib.

In order to make this more suitable for non-unix ports, the discovery
functionality is moved to a separate 'extension' module which can be
optionally installed.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/unittest-discover/manifest.py   |   7 +
 .../unittest-discover/tests/isolated.py       |   4 +
 .../tests/test_isolated_1.py                  |   8 +
 .../tests/test_isolated_2.py                  |   8 +
 .../unittest-discover/unittest_discover.py    | 140 ++++++++++++++
 python-stdlib/unittest/manifest.py            |   3 +
 .../unittest/tests/test_assertions.py         |  25 ---
 python-stdlib/unittest/tests/test_basics.py   |  29 +++
 python-stdlib/unittest/tests/test_setup.py    |  28 +++
 .../unittest/unittest.py                      | 172 +++++++-----------
 unix-ffi/unittest/manifest.py                 |   6 -
 unix-ffi/unittest/test_unittest_isolated.py   |  15 --
 unix-ffi/unittest/unittest_discover.py        |  70 -------
 13 files changed, 290 insertions(+), 225 deletions(-)
 create mode 100644 python-stdlib/unittest-discover/manifest.py
 create mode 100644 python-stdlib/unittest-discover/tests/isolated.py
 create mode 100644 python-stdlib/unittest-discover/tests/test_isolated_1.py
 create mode 100644 python-stdlib/unittest-discover/tests/test_isolated_2.py
 create mode 100644 python-stdlib/unittest-discover/unittest_discover.py
 create mode 100644 python-stdlib/unittest/manifest.py
 rename unix-ffi/unittest/test_unittest.py => python-stdlib/unittest/tests/test_assertions.py (84%)
 create mode 100644 python-stdlib/unittest/tests/test_basics.py
 create mode 100644 python-stdlib/unittest/tests/test_setup.py
 rename {unix-ffi => python-stdlib}/unittest/unittest.py (77%)
 delete mode 100644 unix-ffi/unittest/manifest.py
 delete mode 100644 unix-ffi/unittest/test_unittest_isolated.py
 delete mode 100644 unix-ffi/unittest/unittest_discover.py

diff --git a/python-stdlib/unittest-discover/manifest.py b/python-stdlib/unittest-discover/manifest.py
new file mode 100644
index 000000000..28874c7ee
--- /dev/null
+++ b/python-stdlib/unittest-discover/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1.0")
+
+require("argparse")
+require("fnmatch")
+require("unittest")
+
+module("unittest_discover.py")
diff --git a/python-stdlib/unittest-discover/tests/isolated.py b/python-stdlib/unittest-discover/tests/isolated.py
new file mode 100644
index 000000000..21b905c15
--- /dev/null
+++ b/python-stdlib/unittest-discover/tests/isolated.py
@@ -0,0 +1,4 @@
+# Module that is used in both test_isolated_1.py and test_isolated_2.py.
+# The module should be clean reloaded for each.
+
+state = None
diff --git a/python-stdlib/unittest-discover/tests/test_isolated_1.py b/python-stdlib/unittest-discover/tests/test_isolated_1.py
new file mode 100644
index 000000000..a2bd83b11
--- /dev/null
+++ b/python-stdlib/unittest-discover/tests/test_isolated_1.py
@@ -0,0 +1,8 @@
+import unittest
+import isolated
+
+
+class TestUnittestIsolated1(unittest.TestCase):
+    def test_NotChangedByOtherTest(self):
+        self.assertIsNone(isolated.state)
+        isolated.state = True
diff --git a/python-stdlib/unittest-discover/tests/test_isolated_2.py b/python-stdlib/unittest-discover/tests/test_isolated_2.py
new file mode 100644
index 000000000..1beb99618
--- /dev/null
+++ b/python-stdlib/unittest-discover/tests/test_isolated_2.py
@@ -0,0 +1,8 @@
+import unittest
+import isolated
+
+
+class TestUnittestIsolated2(unittest.TestCase):
+    def test_NotChangedByOtherTest(self):
+        self.assertIsNone(isolated.state)
+        isolated.state = True
diff --git a/python-stdlib/unittest-discover/unittest_discover.py b/python-stdlib/unittest-discover/unittest_discover.py
new file mode 100644
index 000000000..b57ccf39b
--- /dev/null
+++ b/python-stdlib/unittest-discover/unittest_discover.py
@@ -0,0 +1,140 @@
+# Extension for "unittest" that adds the ability to run via "micropython -m unittest".
+
+import argparse
+import os
+import sys
+from fnmatch import fnmatch
+from micropython import const
+
+from unittest import TestRunner, TestResult, TestSuite
+
+
+# Run a single test in a clean environment.
+def _run_test_module(runner: TestRunner, module_name: str, *extra_paths: list[str]):
+    module_snapshot = {k: v for k, v in sys.modules.items()}
+    path_snapshot = sys.path[:]
+    try:
+        for path in reversed(extra_paths):
+            if path:
+                sys.path.insert(0, path)
+
+        module = __import__(module_name)
+        suite = TestSuite(module_name)
+        suite._load_module(module)
+        return runner.run(suite)
+    finally:
+        sys.path[:] = path_snapshot
+        sys.modules.clear()
+        sys.modules.update(module_snapshot)
+
+
+_DIR_TYPE = const(0x4000)
+
+
+def _run_all_in_dir(runner: TestRunner, path: str, pattern: str, top: str):
+    result = TestResult()
+    for fname, ftype, *_ in os.ilistdir(path):
+        if fname in ("..", "."):
+            continue
+        if ftype == _DIR_TYPE:
+            result += _run_all_in_dir(
+                runner=runner,
+                path="/".join((path, fname)),
+                pattern=pattern,
+                top=top,
+            )
+        if fnmatch(fname, pattern):
+            module_name = fname.rsplit(".", 1)[0]
+            result += _run_test_module(runner, module_name, path, top)
+    return result
+
+
+# Implements discovery inspired by https://docs.python.org/3/library/unittest.html#test-discovery
+def _discover(runner: TestRunner):
+    parser = argparse.ArgumentParser()
+    # parser.add_argument(
+    #     "-v",
+    #     "--verbose",
+    #     action="store_true",
+    #     help="Verbose output",
+    # )
+    parser.add_argument(
+        "-s",
+        "--start-directory",
+        dest="start",
+        default=".",
+        help="Directory to start discovery",
+    )
+    parser.add_argument(
+        "-p",
+        "--pattern ",
+        dest="pattern",
+        default="test*.py",
+        help="Pattern to match test files",
+    )
+    parser.add_argument(
+        "-t",
+        "--top-level-directory",
+        dest="top",
+        help="Top level directory of project (defaults to start directory)",
+    )
+    args = parser.parse_args(args=sys.argv[2:])
+
+    path = args.start
+    top = args.top or path
+
+    return _run_all_in_dir(
+        runner=runner,
+        path=path,
+        pattern=args.pattern,
+        top=top,
+    )
+
+
+# TODO: Use os.path for path handling.
+PATH_SEP = getattr(os, "sep", "/")
+
+
+# foo/bar/x.y.z --> foo/bar, x.y
+def _dirname_filename_no_ext(path):
+    # Workaround: The Windows port currently reports "/" for os.sep
+    # (and MicroPython doesn't have os.altsep). So for now just
+    # always work with os.sep (i.e. "/").
+    path = path.replace("\\", PATH_SEP)
+
+    split = path.rsplit(PATH_SEP, 1)
+    if len(split) == 1:
+        dirname, filename = "", split[0]
+    else:
+        dirname, filename = split
+    return dirname, filename.rsplit(".", 1)[0]
+
+
+# This is called from unittest when __name__ == "__main__".
+def discover_main():
+    failures = 0
+    runner = TestRunner()
+
+    if len(sys.argv) == 1 or (
+        len(sys.argv) >= 2
+        and _dirname_filename_no_ext(sys.argv[0])[1] == "unittest"
+        and sys.argv[1] == "discover"
+    ):
+        # No args, or `python -m unittest discover ...`.
+        result = _discover(runner)
+        failures += result.failuresNum or result.errorsNum
+    else:
+        for test_spec in sys.argv[1:]:
+            try:
+                os.stat(test_spec)
+                # File exists, strip extension and import with its parent directory in sys.path.
+                dirname, module_name = _dirname_filename_no_ext(test_spec)
+                result = _run_test_module(runner, module_name, dirname)
+            except OSError:
+                # Not a file, treat as named module to import.
+                result = _run_test_module(runner, test_spec)
+
+            failures += result.failuresNum or result.errorsNum
+
+    # Terminate with non zero return code in case of failures.
+    sys.exit(failures)
diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
new file mode 100644
index 000000000..34c800754
--- /dev/null
+++ b/python-stdlib/unittest/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.10.0")
+
+module("unittest.py")
diff --git a/unix-ffi/unittest/test_unittest.py b/python-stdlib/unittest/tests/test_assertions.py
similarity index 84%
rename from unix-ffi/unittest/test_unittest.py
rename to python-stdlib/unittest/tests/test_assertions.py
index 8e108995a..089a528aa 100644
--- a/unix-ffi/unittest/test_unittest.py
+++ b/python-stdlib/unittest/tests/test_assertions.py
@@ -1,5 +1,4 @@
 import unittest
-from test_unittest_isolated import global_context
 
 
 class TestUnittestAssertions(unittest.TestCase):
@@ -143,11 +142,6 @@ def testInner():
         else:
             self.fail("Unexpected success was not detected")
 
-    def test_NotChangedByOtherTest(self):
-        global global_context
-        assert global_context is None
-        global_context = True
-
     def test_subtest_even(self):
         """
         Test that numbers between 0 and 5 are all even.
@@ -157,24 +151,5 @@ def test_subtest_even(self):
                 self.assertEqual(i % 2, 0)
 
 
-class TestUnittestSetup(unittest.TestCase):
-    class_setup_var = 0
-
-    def setUpClass(self):
-        TestUnittestSetup.class_setup_var += 1
-
-    def tearDownClass(self):
-        # Not sure how to actually test this, but we can check (in the test case below)
-        # that it hasn't been run already at least.
-        TestUnittestSetup.class_setup_var = -1
-
-    def testSetUpTearDownClass_1(self):
-        assert TestUnittestSetup.class_setup_var == 1, TestUnittestSetup.class_setup_var
-
-    def testSetUpTearDownClass_2(self):
-        # Test this twice, as if setUpClass() gets run like setUp() it would be run twice
-        assert TestUnittestSetup.class_setup_var == 1, TestUnittestSetup.class_setup_var
-
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/python-stdlib/unittest/tests/test_basics.py b/python-stdlib/unittest/tests/test_basics.py
new file mode 100644
index 000000000..70f0dd616
--- /dev/null
+++ b/python-stdlib/unittest/tests/test_basics.py
@@ -0,0 +1,29 @@
+import unittest
+
+
+class TestWithRunTest(unittest.TestCase):
+    run = False
+
+    def runTest(self):
+        TestWithRunTest.run = True
+
+    def testRunTest(self):
+        self.fail()
+
+    @staticmethod
+    def tearDownClass():
+        if not TestWithRunTest.run:
+            raise ValueError()
+
+
+def test_func():
+    pass
+
+
+@unittest.expectedFailure
+def test_foo():
+    raise ValueError()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/python-stdlib/unittest/tests/test_setup.py b/python-stdlib/unittest/tests/test_setup.py
new file mode 100644
index 000000000..43fdcece7
--- /dev/null
+++ b/python-stdlib/unittest/tests/test_setup.py
@@ -0,0 +1,28 @@
+import unittest
+
+
+class TestUnittestSetup(unittest.TestCase):
+    class_setup_var = 0
+
+    @classmethod
+    def setUpClass(cls):
+        assert cls is TestUnittestSetup
+        TestUnittestSetup.class_setup_var += 1
+
+    @classmethod
+    def tearDownClass(cls):
+        assert cls is TestUnittestSetup
+        # Not sure how to actually test this, but we can check (in the test case below)
+        # that it hasn't been run already at least.
+        TestUnittestSetup.class_setup_var = -1
+
+    def testSetUpTearDownClass_1(self):
+        assert TestUnittestSetup.class_setup_var == 1, TestUnittestSetup.class_setup_var
+
+    def testSetUpTearDownClass_2(self):
+        # Test this twice, as if setUpClass() gets run like setUp() it would be run twice
+        assert TestUnittestSetup.class_setup_var == 1, TestUnittestSetup.class_setup_var
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/unix-ffi/unittest/unittest.py b/python-stdlib/unittest/unittest.py
similarity index 77%
rename from unix-ffi/unittest/unittest.py
rename to python-stdlib/unittest/unittest.py
index b61686981..35ed14acd 100644
--- a/unix-ffi/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -1,22 +1,13 @@
+import io
+import os
 import sys
-import uos
 
 try:
-    import io
     import traceback
 except ImportError:
-    import uio as io
-
     traceback = None
 
 
-def _snapshot_modules():
-    return {k: v for k, v in sys.modules.items()}
-
-
-__modules__ = _snapshot_modules()
-
-
 class SkipTest(Exception):
     pass
 
@@ -61,7 +52,7 @@ def __exit__(self, *exc_info):
                 detail = ", ".join(f"{k}={v}" for k, v in self.params.items())
                 test_details += (f" ({detail})",)
 
-            handle_test_exception(test_details, __test_result__, exc_info, False)
+            _handle_test_exception(test_details, __test_result__, exc_info, False)
         # Suppress the exception as we've captured it above
         return True
 
@@ -258,9 +249,17 @@ def addTest(self, cls):
 
     def run(self, result):
         for c in self._tests:
-            run_suite(c, result, self.name)
+            _run_suite(c, result, self.name)
         return result
 
+    def _load_module(self, mod):
+        for tn in dir(mod):
+            c = getattr(mod, tn)
+            if isinstance(c, object) and isinstance(c, type) and issubclass(c, TestCase):
+                self.addTest(c)
+            elif tn.startswith("test") and callable(c):
+                self.addTest(c)
+
 
 class TestRunner:
     def run(self, suite: TestSuite):
@@ -331,7 +330,7 @@ def __add__(self, other):
         return self
 
 
-def capture_exc(exc, traceback):
+def _capture_exc(exc, traceback):
     buf = io.StringIO()
     if hasattr(sys, "print_exception"):
         sys.print_exception(exc, buf)
@@ -340,12 +339,12 @@ def capture_exc(exc, traceback):
     return buf.getvalue()
 
 
-def handle_test_exception(
+def _handle_test_exception(
     current_test: tuple, test_result: TestResult, exc_info: tuple, verbose=True
 ):
     exc = exc_info[1]
     traceback = exc_info[2]
-    ex_str = capture_exc(exc, traceback)
+    ex_str = _capture_exc(exc, traceback)
     if isinstance(exc, AssertionError):
         test_result.failuresNum += 1
         test_result.failures.append((current_test, ex_str))
@@ -359,7 +358,7 @@ def handle_test_exception(
     test_result._newFailures += 1
 
 
-def run_suite(c, test_result: TestResult, suite_name=""):
+def _run_suite(c, test_result: TestResult, suite_name=""):
     if isinstance(c, TestSuite):
         c.run(test_result)
         return
@@ -388,9 +387,7 @@ def run_one(test_function):
         try:
             test_result._newFailures = 0
             test_result.testsRun += 1
-            test_globals = dict(**globals())
-            test_globals["test_function"] = test_function
-            exec("test_function()", test_globals, test_globals)
+            test_function()
             # No exception occurred, test passed
             if test_result._newFailures:
                 print(" FAIL")
@@ -402,7 +399,7 @@ def run_one(test_function):
             test_result.skippedNum += 1
             test_result.skipped.append((name, c, reason))
         except Exception as ex:
-            handle_test_exception(
+            _handle_test_exception(
                 current_test=(name, c), test_result=test_result, exc_info=sys.exc_info()
             )
             # Uncomment to investigate failure in detail
@@ -417,102 +414,59 @@ def run_one(test_function):
                 pass
 
     set_up_class()
-
-    if hasattr(o, "runTest"):
-        name = str(o)
-        run_one(o.runTest)
-        return
-
-    for name in dir(o):
-        if name.startswith("test"):
-            m = getattr(o, name)
-            if not callable(m):
-                continue
-            run_one(m)
-
-    if callable(o):
-        name = o.__name__
-        run_one(o)
-
-    tear_down_class()
-
-    return exceptions
-
-
-def _test_cases(mod):
-    for tn in dir(mod):
-        c = getattr(mod, tn)
-        if isinstance(c, object) and isinstance(c, type) and issubclass(c, TestCase):
-            yield c
-        elif tn.startswith("test_") and callable(c):
-            yield c
-
-
-def run_module(runner, module, path, top):
-    if not module:
-        raise ValueError("Empty module name")
-
-    # Reset the python environment before running test
-    sys.modules.clear()
-    sys.modules.update(__modules__)
-
-    sys_path_initial = sys.path[:]
-    # Add script dir and top dir to import path
-    sys.path.insert(0, str(path))
-    if top:
-        sys.path.insert(1, top)
     try:
-        suite = TestSuite(module)
-        m = __import__(module) if isinstance(module, str) else module
-        for c in _test_cases(m):
-            suite.addTest(c)
-        result = runner.run(suite)
-        return result
-
-    finally:
-        sys.path[:] = sys_path_initial
+        if hasattr(o, "runTest"):
+            name = str(o)
+            run_one(o.runTest)
+            return
 
+        for name in dir(o):
+            if name.startswith("test"):
+                m = getattr(o, name)
+                if not callable(m):
+                    continue
+                run_one(m)
 
-def discover(runner: TestRunner):
-    from unittest_discover import discover
+        if callable(o):
+            name = o.__name__
+            run_one(o)
+    finally:
+        tear_down_class()
 
-    global __modules__
-    __modules__ = _snapshot_modules()
-    return discover(runner=runner)
+    return exceptions
 
 
+# This supports either:
+#
+# >>> import mytest
+# >>> unitttest.main(mytest)
+#
+# >>> unittest.main("mytest")
+#
+# Or, a script that ends with:
+# if __name__ == "__main__":
+#     unittest.main()
+# e.g. run via `mpremote run mytest.py`
 def main(module="__main__", testRunner=None):
-    if testRunner:
-        if isinstance(testRunner, type):
-            runner = testRunner()
-        else:
-            runner = testRunner
-    else:
-        runner = TestRunner()
-
-    if len(sys.argv) <= 1:
-        result = discover(runner)
-    elif sys.argv[0].split(".")[0] == "unittest" and sys.argv[1] == "discover":
-        result = discover(runner)
-    else:
-        for test_spec in sys.argv[1:]:
-            try:
-                uos.stat(test_spec)
-                # test_spec is a local file, run it directly
-                if "/" in test_spec:
-                    path, fname = test_spec.rsplit("/", 1)
-                else:
-                    path, fname = ".", test_spec
-                modname = fname.rsplit(".", 1)[0]
-                result = run_module(runner, modname, path, None)
+    if testRunner is None:
+        testRunner = TestRunner()
+    elif isinstance(testRunner, type):
+        testRunner = testRunner()
 
-            except OSError:
-                # Not a file, treat as import name
-                result = run_module(runner, test_spec, ".", None)
-
-    # Terminate with non zero return code in case of failures
-    sys.exit(result.failuresNum or result.errorsNum)
+    if isinstance(module, str):
+        module = __import__(module)
+    suite = TestSuite(module.__name__)
+    suite._load_module(module)
+    return testRunner.run(suite)
 
 
+# Support `micropython -m unittest` (only useful if unitest-discover is
+# installed).
 if __name__ == "__main__":
-    main()
+    try:
+        # If unitest-discover is installed, use the main() provided there.
+        from unittest_discover import discover_main
+
+        discover_main()
+    except ImportError:
+        pass
diff --git a/unix-ffi/unittest/manifest.py b/unix-ffi/unittest/manifest.py
deleted file mode 100644
index 85a5f4015..000000000
--- a/unix-ffi/unittest/manifest.py
+++ /dev/null
@@ -1,6 +0,0 @@
-metadata(version="0.9.0")
-
-require("argparse")
-require("fnmatch")
-
-module("unittest.py")
diff --git a/unix-ffi/unittest/test_unittest_isolated.py b/unix-ffi/unittest/test_unittest_isolated.py
deleted file mode 100644
index a828f9a3b..000000000
--- a/unix-ffi/unittest/test_unittest_isolated.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import unittest
-
-
-global_context = None
-
-
-class TestUnittestIsolated(unittest.TestCase):
-    def test_NotChangedByOtherTest(self):
-        global global_context
-        assert global_context is None
-        global_context = True
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/unix-ffi/unittest/unittest_discover.py b/unix-ffi/unittest/unittest_discover.py
deleted file mode 100644
index 7c5abd1f8..000000000
--- a/unix-ffi/unittest/unittest_discover.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import argparse
-import sys
-import uos
-from fnmatch import fnmatch
-
-from unittest import TestRunner, TestResult, run_module
-
-
-def discover(runner: TestRunner):
-    """
-    Implements discover function inspired by https://docs.python.org/3/library/unittest.html#test-discovery
-    """
-    parser = argparse.ArgumentParser()
-    # parser.add_argument(
-    #     "-v",
-    #     "--verbose",
-    #     action="store_true",
-    #     help="Verbose output",
-    # )
-    parser.add_argument(
-        "-s",
-        "--start-directory",
-        dest="start",
-        default=".",
-        help="Directory to start discovery",
-    )
-    parser.add_argument(
-        "-p",
-        "--pattern ",
-        dest="pattern",
-        default="test*.py",
-        help="Pattern to match test files",
-    )
-    parser.add_argument(
-        "-t",
-        "--top-level-directory",
-        dest="top",
-        help="Top level directory of project (defaults to start directory)",
-    )
-    args = parser.parse_args(args=sys.argv[2:])
-
-    path = args.start
-    top = args.top or path
-
-    return run_all_in_dir(
-        runner=runner,
-        path=path,
-        pattern=args.pattern,
-        top=top,
-    )
-
-
-def run_all_in_dir(runner: TestRunner, path: str, pattern: str, top: str):
-    DIR_TYPE = 0x4000
-
-    result = TestResult()
-    for fname, type, *_ in uos.ilistdir(path):
-        if fname in ("..", "."):
-            continue
-        if type == DIR_TYPE:
-            result += run_all_in_dir(
-                runner=runner,
-                path="/".join((path, fname)),
-                pattern=pattern,
-                top=top,
-            )
-        if fnmatch(fname, pattern):
-            modname = fname[: fname.rfind(".")]
-            result += run_module(runner, modname, path, top)
-    return result

From c262628a41a89cc7d417d57cd0070909c95419f6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 12 Sep 2022 14:38:11 +1000
Subject: [PATCH 088/343] os: Rename os.path to os-path.

This is to match the convention for naming "extension" packages.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/{os.path => os-path}/manifest.py  | 1 -
 python-stdlib/{os.path => os-path}/os/path.py   | 0
 python-stdlib/{os.path => os-path}/test_path.py | 0
 python-stdlib/os/os/__init__.py                 | 1 +
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename python-stdlib/{os.path => os-path}/manifest.py (98%)
 rename python-stdlib/{os.path => os-path}/os/path.py (100%)
 rename python-stdlib/{os.path => os-path}/test_path.py (100%)

diff --git a/python-stdlib/os.path/manifest.py b/python-stdlib/os-path/manifest.py
similarity index 98%
rename from python-stdlib/os.path/manifest.py
rename to python-stdlib/os-path/manifest.py
index 920d522c2..dce6d505d 100644
--- a/python-stdlib/os.path/manifest.py
+++ b/python-stdlib/os-path/manifest.py
@@ -3,5 +3,4 @@
 # Originally written by Paul Sokolovsky.
 
 require("os")
-
 package("os")
diff --git a/python-stdlib/os.path/os/path.py b/python-stdlib/os-path/os/path.py
similarity index 100%
rename from python-stdlib/os.path/os/path.py
rename to python-stdlib/os-path/os/path.py
diff --git a/python-stdlib/os.path/test_path.py b/python-stdlib/os-path/test_path.py
similarity index 100%
rename from python-stdlib/os.path/test_path.py
rename to python-stdlib/os-path/test_path.py
diff --git a/python-stdlib/os/os/__init__.py b/python-stdlib/os/os/__init__.py
index c3df8b0a5..2752f2e46 100644
--- a/python-stdlib/os/os/__init__.py
+++ b/python-stdlib/os/os/__init__.py
@@ -1 +1,2 @@
+# Replace built-in os module.
 from uos import *

From f1039fd2f27c6d444e41ec79acabe4715cb76eb7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 12 Sep 2022 14:38:52 +1000
Subject: [PATCH 089/343] collections: Rename collections.* to collections-*.

This is to match the convention for naming "extension" packages.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../collections/defaultdict.py                              | 0
 .../manifest.py                                             | 1 +
 .../test_defaultdict.py                                     | 0
 .../collections/deque.py                                    | 0
 .../{collections.deque => collections-deque}/manifest.py    | 1 +
 python-stdlib/collections/collections/__init__.py           | 6 ++----
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename python-stdlib/{collections.defaultdict => collections-defaultdict}/collections/defaultdict.py (100%)
 rename python-stdlib/{collections.defaultdict => collections-defaultdict}/manifest.py (79%)
 rename python-stdlib/{collections.defaultdict => collections-defaultdict}/test_defaultdict.py (100%)
 rename python-stdlib/{collections.deque => collections-deque}/collections/deque.py (100%)
 rename python-stdlib/{collections.deque => collections-deque}/manifest.py (68%)

diff --git a/python-stdlib/collections.defaultdict/collections/defaultdict.py b/python-stdlib/collections-defaultdict/collections/defaultdict.py
similarity index 100%
rename from python-stdlib/collections.defaultdict/collections/defaultdict.py
rename to python-stdlib/collections-defaultdict/collections/defaultdict.py
diff --git a/python-stdlib/collections.defaultdict/manifest.py b/python-stdlib/collections-defaultdict/manifest.py
similarity index 79%
rename from python-stdlib/collections.defaultdict/manifest.py
rename to python-stdlib/collections-defaultdict/manifest.py
index bbce4be13..f8d566aba 100644
--- a/python-stdlib/collections.defaultdict/manifest.py
+++ b/python-stdlib/collections-defaultdict/manifest.py
@@ -2,4 +2,5 @@
 
 # Originally written by Paul Sokolovsky.
 
+require("collections")
 package("collections")
diff --git a/python-stdlib/collections.defaultdict/test_defaultdict.py b/python-stdlib/collections-defaultdict/test_defaultdict.py
similarity index 100%
rename from python-stdlib/collections.defaultdict/test_defaultdict.py
rename to python-stdlib/collections-defaultdict/test_defaultdict.py
diff --git a/python-stdlib/collections.deque/collections/deque.py b/python-stdlib/collections-deque/collections/deque.py
similarity index 100%
rename from python-stdlib/collections.deque/collections/deque.py
rename to python-stdlib/collections-deque/collections/deque.py
diff --git a/python-stdlib/collections.deque/manifest.py b/python-stdlib/collections-deque/manifest.py
similarity index 68%
rename from python-stdlib/collections.deque/manifest.py
rename to python-stdlib/collections-deque/manifest.py
index e4306faea..0133d2bad 100644
--- a/python-stdlib/collections.deque/manifest.py
+++ b/python-stdlib/collections-deque/manifest.py
@@ -1,3 +1,4 @@
 metadata(version="0.1.3")
 
+require("collections")
 package("collections")
diff --git a/python-stdlib/collections/collections/__init__.py b/python-stdlib/collections/collections/__init__.py
index 471b3a526..7f3be5673 100644
--- a/python-stdlib/collections/collections/__init__.py
+++ b/python-stdlib/collections/collections/__init__.py
@@ -1,9 +1,7 @@
-# Should be reimplemented for MicroPython
-# Reason:
-# CPython implementation brings in metaclasses and other bloat.
-# This is going to be just import-all for other modules in a namespace package
+# Replace built-in collections module.
 from ucollections import *
 
+# Provide optional dependencies (which may be installed separately).
 try:
     from .defaultdict import defaultdict
 except ImportError:

From ad9309b669cd4474bcd4bc0a67a630173222dbec Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 12 Sep 2022 14:44:16 +1000
Subject: [PATCH 090/343] os: Import `path` automatically if available.

This matches CPython behavior:

```
>>> import os
>>> os.path.sep
'/'
```

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/os/os/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/python-stdlib/os/os/__init__.py b/python-stdlib/os/os/__init__.py
index 2752f2e46..6e51bd0d3 100644
--- a/python-stdlib/os/os/__init__.py
+++ b/python-stdlib/os/os/__init__.py
@@ -1,2 +1,8 @@
 # Replace built-in os module.
 from uos import *
+
+# Provide optional dependencies (which may be installed separately).
+try:
+    from . import path
+except ImportError:
+    pass

From 7602843209ee4a23a7375dc483f58f8e1cce6ef0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 13 Aug 2022 23:58:03 +1000
Subject: [PATCH 091/343] micropython/aiorepl: Initial version of an asyncio
 REPL.

This provides an async REPL with the following features:
- Run interactive REPL in the background.
- Execute statements using await.
- Simple history.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aiorepl/README.md   |  95 +++++++++++++++++
 micropython/aiorepl/aiorepl.py  | 178 ++++++++++++++++++++++++++++++++
 micropython/aiorepl/manifest.py |   6 ++
 3 files changed, 279 insertions(+)
 create mode 100644 micropython/aiorepl/README.md
 create mode 100644 micropython/aiorepl/aiorepl.py
 create mode 100644 micropython/aiorepl/manifest.py

diff --git a/micropython/aiorepl/README.md b/micropython/aiorepl/README.md
new file mode 100644
index 000000000..2c3ed843f
--- /dev/null
+++ b/micropython/aiorepl/README.md
@@ -0,0 +1,95 @@
+# aiorepl
+
+This library provides "asyncio REPL", a simple REPL that can be used even
+while your program is running, allowing you to inspect program state, create
+tasks, and await asynchronous functions.
+
+This is inspired by Python's `asyncio` module when run via `python -m asyncio`.
+
+## Background
+
+The MicroPython REPL is unavailable while your program is running. This
+library runs a background REPL using the asyncio scheduler.
+
+Furthermore, it is not possible to `await` at the main REPL because it does
+not know about the asyncio scheduler.
+
+## Usage
+
+To use this library, you need to import the library and then start the REPL task.
+
+For example, in main.py:
+
+```py
+import uasyncio as asyncio
+import aiorepl
+
+async def demo():
+    await asyncio.sleep_ms(1000)
+    print("async demo")
+
+state = 20
+
+async def task1():
+    while state:
+        #print("task 1")
+        await asyncio.sleep_ms(500)
+    print("done")
+
+async def main():
+    print("Starting tasks...")
+
+    # Start other program tasks.
+    t1 = asyncio.create_task(task1())
+
+    # Start the aiorepl task.
+    repl = asyncio.create_task(aiorepl.task())
+
+    await asyncio.gather(t1, repl)
+
+asyncio.run(main())
+```
+
+The optional globals passed to `task([globals])` allows you to specify what
+will be in scope for the REPL. By default it uses `__main__`, which is the
+same scope as the regular REPL (and `main.py`). In the example above, the
+REPL will be able to call the `demo()` function as well as get/set the
+`state` variable.
+
+Instead of the regular `>>> ` prompt, the asyncio REPL will show `--> `.
+
+```
+--> 1+1
+2
+--> await demo()
+async demo
+--> state
+20
+--> import myapp.core
+--> state = await myapp.core.query_state()
+--> 1/0
+ZeroDivisionError: divide by zero
+--> def foo(x): return x + 1
+--> await asyncio.sleep(foo(3))
+--> 
+```
+
+History is supported via the up/down arrow keys.
+
+## Cancellation
+
+During command editing (the "R" phase), pressing Ctrl-C will cancel the current command and display a new prompt, like the regular REPL.
+
+While a command is being executed, Ctrl-C will cancel the task that is executing the command. This will have no effect on blocking code (e.g. `time.sleep()`), but this should be rare in an asyncio-based program.
+
+Ctrl-D at the asyncio REPL command prompt will terminate the current event loop, which will stop the running program and return to the regular REPL.
+
+## Limitations
+
+The following features are unsupported:
+
+* Tab completion is not supported (also unsupported in `python -m asyncio`).
+* Multi-line continuation. However you can do single-line definitions of functions, see demo above.
+* Exception tracebacks. Only the exception type and message is shown, see demo above.
+* Emacs shortcuts (e.g. Ctrl-A, Ctrl-E, to move to start/end of line).
+* Unicode handling for input.
diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
new file mode 100644
index 000000000..326e00ba9
--- /dev/null
+++ b/micropython/aiorepl/aiorepl.py
@@ -0,0 +1,178 @@
+# MIT license; Copyright (c) 2022 Jim Mussared
+
+import micropython
+import re
+import sys
+import time
+import uasyncio as asyncio
+
+# Import statement (needs to be global, and does not return).
+_RE_IMPORT = re.compile("^import ([^ ]+)( as ([^ ]+))?")
+_RE_FROM_IMPORT = re.compile("^from [^ ]+ import ([^ ]+)( as ([^ ]+))?")
+# Global variable assignment.
+_RE_GLOBAL = re.compile("^([a-zA-Z0-9_]+) ?=[^=]")
+# General assignment expression or import statement (does not return a value).
+_RE_ASSIGN = re.compile("[^=]=[^=]")
+
+# Command hist (One reserved slot for the current command).
+_HISTORY_LIMIT = const(5 + 1)
+
+
+async def execute(code, g, s):
+    if not code.strip():
+        return
+
+    try:
+        if "await " in code:
+            # Execute the code snippet in an async context.
+            if m := _RE_IMPORT.match(code) or _RE_FROM_IMPORT.match(code):
+                code = f"global {m.group(3) or m.group(1)}\n    {code}"
+            elif m := _RE_GLOBAL.match(code):
+                code = f"global {m.group(1)}\n    {code}"
+            elif not _RE_ASSIGN.search(code):
+                code = f"return {code}"
+
+            code = f"""
+import uasyncio as asyncio
+async def __code():
+    {code}
+
+__exec_task = asyncio.create_task(__code())
+"""
+
+            async def kbd_intr_task(exec_task, s):
+                while True:
+                    if ord(await s.read(1)) == 0x03:
+                        exec_task.cancel()
+                        return
+
+            l = {"__exec_task": None}
+            exec(code, g, l)
+            exec_task = l["__exec_task"]
+
+            # Concurrently wait for either Ctrl-C from the stream or task
+            # completion.
+            intr_task = asyncio.create_task(kbd_intr_task(exec_task, s))
+
+            try:
+                try:
+                    return await exec_task
+                except asyncio.CancelledError:
+                    pass
+            finally:
+                intr_task.cancel()
+                try:
+                    await intr_task
+                except asyncio.CancelledError:
+                    pass
+        else:
+            # Excute code snippet directly.
+            try:
+                try:
+                    micropython.kbd_intr(3)
+                    try:
+                        return eval(code, g)
+                    except SyntaxError:
+                        # Maybe an assignment, try with exec.
+                        return exec(code, g)
+                except KeyboardInterrupt:
+                    pass
+            finally:
+                micropython.kbd_intr(-1)
+
+    except Exception as err:
+        print(f"{type(err).__name__}: {err}")
+
+
+# REPL task. Invoke this with an optional mutable globals dict.
+async def task(g=None, prompt="--> "):
+    print("Starting asyncio REPL...")
+    if g is None:
+        g = __import__("__main__").__dict__
+    try:
+        micropython.kbd_intr(-1)
+        s = asyncio.StreamReader(sys.stdin)
+        # clear = True
+        hist = [None] * _HISTORY_LIMIT
+        hist_i = 0  # Index of most recent entry.
+        hist_n = 0  # Number of history entries.
+        c = 0  # ord of most recent character.
+        t = 0  # timestamp of most recent character.
+        while True:
+            hist_b = 0  # How far back in the history are we currently.
+            sys.stdout.write(prompt)
+            cmd = ""
+            while True:
+                b = await s.read(1)
+                c = ord(b)
+                pc = c  # save previous character
+                pt = t  # save previous time
+                t = time.ticks_ms()
+                if c < 0x20 or c > 0x7E:
+                    if c == 0x0A:
+                        # CR
+                        sys.stdout.write("\n")
+                        if cmd:
+                            # Push current command.
+                            hist[hist_i] = cmd
+                            # Increase history length if possible, and rotate ring forward.
+                            hist_n = min(_HISTORY_LIMIT - 1, hist_n + 1)
+                            hist_i = (hist_i + 1) % _HISTORY_LIMIT
+
+                            result = await execute(cmd, g, s)
+                            if result is not None:
+                                sys.stdout.write(repr(result))
+                                sys.stdout.write("\n")
+                        break
+                    elif c == 0x08 or c == 0x7F:
+                        # Backspace.
+                        if cmd:
+                            cmd = cmd[:-1]
+                            sys.stdout.write("\x08 \x08")
+                    elif c == 0x02:
+                        # Ctrl-B
+                        continue
+                    elif c == 0x03:
+                        # Ctrl-C
+                        if pc == 0x03 and time.ticks_diff(t, pt) < 20:
+                            # Two very quick Ctrl-C (faster than a human
+                            # typing) likely means mpremote trying to
+                            # escape.
+                            asyncio.new_event_loop()
+                            return
+                        sys.stdout.write("\n")
+                        break
+                    elif c == 0x04:
+                        # Ctrl-D
+                        sys.stdout.write("\n")
+                        # Shutdown asyncio.
+                        asyncio.new_event_loop()
+                        return
+                    elif c == 0x1B:
+                        # Start of escape sequence.
+                        key = await s.read(2)
+                        if key in ("[A", "[B"):
+                            # Stash the current command.
+                            hist[(hist_i - hist_b) % _HISTORY_LIMIT] = cmd
+                            # Clear current command.
+                            b = "\x08" * len(cmd)
+                            sys.stdout.write(b)
+                            sys.stdout.write(" " * len(cmd))
+                            sys.stdout.write(b)
+                            # Go backwards or forwards in the history.
+                            if key == "[A":
+                                hist_b = min(hist_n, hist_b + 1)
+                            else:
+                                hist_b = max(0, hist_b - 1)
+                            # Update current command.
+                            cmd = hist[(hist_i - hist_b) % _HISTORY_LIMIT]
+                            sys.stdout.write(cmd)
+                    else:
+                        # sys.stdout.write("\\x")
+                        # sys.stdout.write(hex(c))
+                        pass
+                else:
+                    sys.stdout.write(b)
+                    cmd += b
+    finally:
+        micropython.kbd_intr(3)
diff --git a/micropython/aiorepl/manifest.py b/micropython/aiorepl/manifest.py
new file mode 100644
index 000000000..5cce6c796
--- /dev/null
+++ b/micropython/aiorepl/manifest.py
@@ -0,0 +1,6 @@
+metadata(
+    version="0.1",
+    description="Provides an asynchronous REPL that can run concurrently with an asyncio, also allowing await expressions.",
+)
+
+module("aiorepl.py")

From 0c5880d2e4bb5394002b9ddb5650b06e94c0ab43 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 16 Sep 2022 11:27:58 +1000
Subject: [PATCH 092/343] aioble/l2cap: Fix psm variable name.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/l2cap.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/l2cap.py b/micropython/bluetooth/aioble/aioble/l2cap.py
index e8e4c0262..713c441fd 100644
--- a/micropython/bluetooth/aioble/aioble/l2cap.py
+++ b/micropython/bluetooth/aioble/aioble/l2cap.py
@@ -178,14 +178,14 @@ async def __aexit__(self, exc_type, exc_val, exc_traceback):
 
 
 # Use connection.l2cap_accept() instead of calling this directly.
-async def accept(connection, psn, mtu, timeout_ms):
+async def accept(connection, psm, mtu, timeout_ms):
     global _listening
 
     channel = L2CAPChannel(connection)
 
     # Start the stack listening if necessary.
     if not _listening:
-        ble.l2cap_listen(psn, mtu)
+        ble.l2cap_listen(psm, mtu)
         _listening = True
 
     # Wait for the connect irq from the remote connection.
@@ -195,14 +195,14 @@ async def accept(connection, psn, mtu, timeout_ms):
 
 
 # Use connection.l2cap_connect() instead of calling this directly.
-async def connect(connection, psn, mtu, timeout_ms):
+async def connect(connection, psm, mtu, timeout_ms):
     if _listening:
         raise ValueError("Can't connect while listening")
 
     channel = L2CAPChannel(connection)
 
     with connection.timeout(timeout_ms):
-        ble.l2cap_connect(connection._conn_handle, psn, mtu)
+        ble.l2cap_connect(connection._conn_handle, psm, mtu)
 
         # Wait for the connect irq from the remote connection.
         # If the connection fails, we get a disconnect event (with status) instead.

From eba897420d96650a372b4b65831c24741d667890 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 19 Sep 2022 10:37:36 +1000
Subject: [PATCH 093/343] aioble/server.py: Maintain write order for captured
 characteristics.

This replaced the per-characteristic queues with a single shared queue,
which means that the characteristics will return from `written()` in the
exact order that the original writes arrived, even if the writes are
occuring across multiple different characteristics.

This work was funded by Planet Innovation.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/server.py | 106 +++++++++++-----
 .../aioble/multitests/ble_write_order.py      | 118 ++++++++++++++++++
 .../aioble/multitests/ble_write_order.py.exp  |  37 ++++++
 3 files changed, 233 insertions(+), 28 deletions(-)
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_write_order.py
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_write_order.py.exp

diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index d01d3e4c4..76374a36d 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -60,6 +60,12 @@ def _server_irq(event, data):
 def _server_shutdown():
     global _registered_characteristics
     _registered_characteristics = {}
+    if hasattr(BaseCharacteristic, "_capture_task"):
+        BaseCharacteristic._capture_task.cancel()
+        del BaseCharacteristic._capture_queue
+        del BaseCharacteristic._capture_write_event
+        del BaseCharacteristic._capture_consumed_event
+        del BaseCharacteristic._capture_task
 
 
 register_irq_handler(_server_irq, _server_shutdown)
@@ -97,6 +103,42 @@ def write(self, data, send_update=False):
         else:
             ble.gatts_write(self._value_handle, data, send_update)
 
+    # When the a capture-enabled characteristic is created, create the
+    # necessary events (if not already created).
+    @staticmethod
+    def _init_capture():
+        if hasattr(BaseCharacteristic, "_capture_queue"):
+            return
+
+        BaseCharacteristic._capture_queue = deque((), _WRITE_CAPTURE_QUEUE_LIMIT)
+        BaseCharacteristic._capture_write_event = asyncio.ThreadSafeFlag()
+        BaseCharacteristic._capture_consumed_event = asyncio.ThreadSafeFlag()
+        BaseCharacteristic._capture_task = asyncio.create_task(
+            BaseCharacteristic._run_capture_task()
+        )
+
+    # Monitor the shared queue for incoming characteristic writes and forward
+    # them sequentially to the individual characteristic events.
+    @staticmethod
+    async def _run_capture_task():
+        write = BaseCharacteristic._capture_write_event
+        consumed = BaseCharacteristic._capture_consumed_event
+        q = BaseCharacteristic._capture_queue
+
+        while True:
+            if len(q):
+                conn, data, characteristic = q.popleft()
+                # Let the characteristic waiting in `written()` know that it
+                # can proceed.
+                characteristic._write_data = (conn, data)
+                characteristic._write_event.set()
+                # Wait for the characteristic to complete `written()` before
+                # continuing.
+                await consumed.wait()
+
+            if not len(q):
+                await write.wait()
+
     # Wait for a write on this characteristic. Returns the connection that did
     # the write, or a tuple of (connection, value) if capture is enabled for
     # this characteristics.
@@ -105,17 +147,27 @@ async def written(self, timeout_ms=None):
             # Not a writable characteristic.
             return
 
-        # If the queue is empty, then we need to wait. However, if the queue
-        # has a single item, we also need to do a no-op wait in order to
-        # clear the event flag (because the queue will become empty and
-        # therefore the event should be cleared).
-        if len(self._write_queue) <= 1:
-            with DeviceTimeout(None, timeout_ms):
-                await self._write_event.wait()
+        # If no write has been seen then we need to wait. If the event has
+        # already been set this will clear the event and continue
+        # immediately. In regular mode, this is set by the write IRQ
+        # directly (in _remote_write). In capture mode, this is set when it's
+        # our turn by _capture_task.
+        with DeviceTimeout(None, timeout_ms):
+            await self._write_event.wait()
+
+        # Return the write data and clear the stored copy.
+        # In default usage this will be just the connection handle.
+        # In capture mode this will be a tuple of (connection_handle, received_data)
+        data = self._write_data
+        self._write_data = None
 
-        # Either we started > 1 item, or the wait completed successfully, return
-        # the front of the queue.
-        return self._write_queue.popleft()
+        if self.flags & _FLAG_WRITE_CAPTURE:
+            # Notify the shared queue monitor that the event has been consumed
+            # by the caller to `written()` and another characteristic can now
+            # proceed.
+            BaseCharacteristic._capture_consumed_event.set()
+
+        return data
 
     def on_read(self, connection):
         return 0
@@ -124,27 +176,20 @@ def _remote_write(conn_handle, value_handle):
         if characteristic := _registered_characteristics.get(value_handle, None):
             # If we've gone from empty to one item, then wake something
             # blocking on `await char.written()`.
-            wake = len(characteristic._write_queue) == 0
 
             conn = DeviceConnection._connected.get(conn_handle, None)
-            q = characteristic._write_queue
 
             if characteristic.flags & _FLAG_WRITE_CAPTURE:
-                # For capture, we append both the connection and the written
-                # value to the queue. The deque will enforce the max queue len.
+                # For capture, we append the connection and the written value
+                # value to the shared queue along with the matching characteristic object.
+                # The deque will enforce the max queue len.
                 data = characteristic.read()
-                q.append((conn, data))
+                BaseCharacteristic._capture_queue.append((conn, data, characteristic))
+                BaseCharacteristic._capture_write_event.set()
             else:
-                # Use the queue as a single slot -- it has max length of 1,
-                # so if there's an existing item it will be replaced.
-                q.append(conn)
-
-            if wake:
-                # Queue is now non-empty. If something is waiting, it will be
-                # worken. If something isn't waiting right now, then a future
-                # caller to `await char.written()` will see the queue is
-                # non-empty, and wait on the event if it's going to empty the
-                # queue.
+                # Store the write connection handle to be later used to retrieve the data
+                # then set event to handle in written() task.
+                characteristic._write_data = conn
                 characteristic._write_event.set()
 
     def _remote_read(conn_handle, value_handle):
@@ -178,10 +223,15 @@ def __init__(
             if capture:
                 # Capture means that we keep track of all writes, and capture
                 # their values (and connection) in a queue. Otherwise we just
-                # track the most recent connection.
+                # track the connection of the most recent write.
                 flags |= _FLAG_WRITE_CAPTURE
+                BaseCharacteristic._init_capture()
+
+            # Set when this characteristic has a value waiting in self._write_data.
             self._write_event = asyncio.ThreadSafeFlag()
-            self._write_queue = deque((), _WRITE_CAPTURE_QUEUE_LIMIT if capture else 1)
+            # The connection of the most recent write, or a tuple of
+            # (connection, data) if capture is enabled.
+            self._write_data = None
         if notify:
             flags |= _FLAG_NOTIFY
         if indicate:
@@ -263,7 +313,7 @@ def __init__(self, characteristic, uuid, read=False, write=False, initial=None):
             flags |= _FLAG_DESC_READ
         if write:
             self._write_event = asyncio.ThreadSafeFlag()
-            self._write_queue = deque((), 1)
+            self._write_data = None
             flags |= _FLAG_DESC_WRITE
 
         self.uuid = uuid
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_order.py b/micropython/bluetooth/aioble/multitests/ble_write_order.py
new file mode 100644
index 000000000..4b64031e5
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_write_order.py
@@ -0,0 +1,118 @@
+# Test characteristic write capture preserves order across characteristics.
+
+import sys
+
+sys.path.append("")
+
+from micropython import const
+import time, machine
+
+import uasyncio as asyncio
+import aioble
+import bluetooth
+
+TIMEOUT_MS = 5000
+
+# Without the write ordering (via the shared queue) in server.py, this test
+# passes with delay of 1, fails some at 5, fails more at 50
+DUMMY_DELAY = 50
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_FIRST_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR_SECOND_UUID = bluetooth.UUID("00000000-1111-2222-3333-555555555555")
+
+# Acting in peripheral role.
+async def instance0_task():
+    service = aioble.Service(SERVICE_UUID)
+    characteristic_first = aioble.Characteristic(
+        service,
+        CHAR_FIRST_UUID,
+        write=True,
+        capture=True,
+    )
+    # Second characteristic enabled write capture.
+    characteristic_second = aioble.Characteristic(
+        service,
+        CHAR_SECOND_UUID,
+        write=True,
+        capture=True,
+    )
+    aioble.register_services(service)
+
+    # Register characteristic.written() handlers as asyncio background tasks.
+    # The order of these is important!
+    asyncio.create_task(task_written(characteristic_second, "second"))
+    asyncio.create_task(task_written(characteristic_first, "first"))
+
+    # This dummy task simulates background processing on a real system that
+    # can block the asyncio loop for brief periods of time
+    asyncio.create_task(task_dummy())
+
+    multitest.globals(BDADDR=aioble.config("mac"))
+    multitest.next()
+
+    # Wait for central to connect to us.
+    print("advertise")
+    async with await aioble.advertise(
+        20_000, adv_data=b"\x02\x01\x06\x04\xffMPY", timeout_ms=TIMEOUT_MS
+    ) as connection:
+        print("connected")
+
+        await connection.disconnected()
+
+
+async def task_written(chr, label):
+    while True:
+        await chr.written()
+        data = chr.read().decode()
+        print(f"written: {label} {data}")
+
+
+async def task_dummy():
+    while True:
+        time.sleep_ms(DUMMY_DELAY)
+        await asyncio.sleep_ms(5)
+
+
+def instance0():
+    try:
+        asyncio.run(instance0_task())
+    finally:
+        aioble.stop()
+
+
+# Acting in central role.
+async def instance1_task():
+    multitest.next()
+
+    # Connect to peripheral and then disconnect.
+    print("connect")
+    device = aioble.Device(*BDADDR)
+    async with await device.connect(timeout_ms=TIMEOUT_MS) as connection:
+        # Discover characteristics.
+        service = await connection.service(SERVICE_UUID)
+        print("service", service.uuid)
+        characteristic_first = await service.characteristic(CHAR_FIRST_UUID)
+        characteristic_second = await service.characteristic(CHAR_SECOND_UUID)
+        print("characteristic", characteristic_first.uuid, characteristic_second.uuid)
+
+        for i in range(5):
+            print(f"write c{i}")
+            await characteristic_first.write("c" + str(i), timeout_ms=TIMEOUT_MS)
+            await characteristic_second.write("c" + str(i), timeout_ms=TIMEOUT_MS)
+
+            await asyncio.sleep_ms(300)
+
+        for i in range(5):
+            print(f"write r{i}")
+            await characteristic_second.write("r" + str(i), timeout_ms=TIMEOUT_MS)
+            await characteristic_first.write("r" + str(i), timeout_ms=TIMEOUT_MS)
+
+            await asyncio.sleep_ms(300)
+
+
+def instance1():
+    try:
+        asyncio.run(instance1_task())
+    finally:
+        aioble.stop()
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_order.py.exp b/micropython/bluetooth/aioble/multitests/ble_write_order.py.exp
new file mode 100644
index 000000000..516de685c
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_write_order.py.exp
@@ -0,0 +1,37 @@
+--- instance0 ---
+advertise
+connected
+written: first c0
+written: second c0
+written: first c1
+written: second c1
+written: first c2
+written: second c2
+written: first c3
+written: second c3
+written: first c4
+written: second c4
+written: second r0
+written: first r0
+written: second r1
+written: first r1
+written: second r2
+written: first r2
+written: second r3
+written: first r3
+written: second r4
+written: first r4
+--- instance1 ---
+connect
+service UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+characteristic UUID('00000000-1111-2222-3333-444444444444') UUID('00000000-1111-2222-3333-555555555555')
+write c0
+write c1
+write c2
+write c3
+write c4
+write r0
+write r1
+write r2
+write r3
+write r4

From 122b68968cdbc89f54eb7283132b14530892fd0c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Sep 2022 00:57:47 +1000
Subject: [PATCH 094/343] uu: Fix dependency on os-path.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/uu/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/uu/manifest.py b/python-stdlib/uu/manifest.py
index ae90f8882..a1f951a8e 100644
--- a/python-stdlib/uu/manifest.py
+++ b/python-stdlib/uu/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.5.1")
 
 require("binascii")
-require("os.path")
+require("os-path")
 
 module("uu.py")

From 58a93f3d7fdb8bb6531e7b23c7732c66814e9fda Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Aug 2022 14:53:24 +1000
Subject: [PATCH 095/343] tools/build.py: Add script for deploying to a static
 web server.

This populates https://micropython.org/pi/v2 with compiled packages,
suitable for use by `mip` and `mpremote`.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 README.md      |   1 -
 tools/build.py | 454 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 454 insertions(+), 1 deletion(-)
 create mode 100755 tools/build.py

diff --git a/README.md b/README.md
index b5d1b8a46..13142fc34 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ Other libraries are packages, in which case you'll need to copy the directory in
 Future plans (and new contributor ideas)
 ----------------------------------------
 
-* Provide compiled .mpy distributions.
 * Develop a set of example programs using these libraries.
 * Develop more MicroPython libraries for common tasks.
 * Provide a replacement for the previous `upip` tool.
diff --git a/tools/build.py b/tools/build.py
new file mode 100755
index 000000000..088a201a8
--- /dev/null
+++ b/tools/build.py
@@ -0,0 +1,454 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Jim Mussared
+#
+# 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.
+
+# This script compiles all packages in this repository (excluding unix-ffi)
+# into a directory suitable for serving to "mip" via a static web server.
+
+# Usage:
+# ./tools/build.py --output /tmp/micropython-lib/v2
+
+# The output directory (--output) will have the following layout
+# /
+#   index.json
+#   file/
+#     1d/
+#       1dddc25d
+#     c3/
+#       c31d7eb7
+#       c3a3934b
+#     e3/
+#       e39dbf64
+#     ...
+#   package/
+#     6/                 <-- mpy version
+#       aioble/
+#         latest.json
+#         0.1.json
+#         ...
+#       hmac/
+#         latest.json
+#         3.4.2-3.json
+#         ...
+#       pyjwt/
+#         latest.json
+#         0.1.json
+#         ...
+#     7/                 <-- other mpy versions
+#       ...
+#     py/                <-- "source" distribution
+#       ...
+#     ...
+
+# index.json is:
+# {
+#   "v": 1,                      <-- file format version
+#   "updated": <utc-seconds-since-1970>,
+#   "packages": {
+#     {
+#       "name": "aioble",
+#       "version": "0.1",        <-- Latest version of this package (always present, may be empty).
+#       "author": "",            <-- Optional author (always present, may be empty).
+#       "description": "...",    <-- Optional description (always present, may be empty).
+#       "license": "MIT",        <-- SPDX short identifier (required).
+#       "versions": {
+#         "6": ["0.1", "0.2"],
+#         "7": ["0.2", "0.3", "0.4"],
+#         ...                    <-- Other bytecode versions
+#         "py": ["0.1", "0.2", "0.3", "0.4"]
+#       }
+#     },
+#     ...
+#   }
+# }
+
+# Each file in the "file" directory is the file contents (usually .mpy), named
+# by the prefix of the sha256 hash of the contents. Files are never removed, and
+# collisions are detected and will fail the compile, and the prefix length should
+# be increased.
+# As of September 2022, there are no collisions with a hash prefix length of 4,
+# so the default of 8 should be sufficient for a while. Increasing the length
+# doesn't invalidate old packages.
+
+# Each package json (either latest.json or {version}.json) is:
+# {
+#   "v": 1,     <-- file format version
+#   "hashes": [
+#     ["aioble/server.mpy", "e39dbf64"],
+#     ...
+#   ],
+#   "urls": [   <-- not used by micropython-lib packages
+#     ["target/path.py", "http://url/foo/bar/path.py"],
+#     ...
+#   ],
+#   "deps": [   <-- not used by micropython-lib packages
+#     ["name", "version"],
+#     ...
+#   ]
+#   "version": "0.1"
+# }
+
+# mip (or other tools) should request /package/{mpy_version}/{package_name}/{version}.json.
+
+import argparse
+import glob
+import hashlib
+import json
+import os
+import shutil
+import sys
+import tempfile
+import time
+
+
+_JSON_VERSION_INDEX = 1
+_JSON_VERSION_PACKAGE = 1
+
+
+_COLOR_ERROR_ON = "\033[1;31m"
+_COLOR_ERROR_OFF = "\033[0m"
+
+
+# Create all directories in the path (such that the file can be created).
+def _ensure_path_exists(file_path):
+    path = os.path.dirname(file_path)
+    if not os.path.isdir(path):
+        os.makedirs(path)
+
+
+# Returns the sha256 of the specified file object.
+def _get_file_hash(f):
+    hs256 = hashlib.sha256()
+    hs256.update(f.read())
+    return hs256.hexdigest()
+
+
+# Returns true if the two files contain identical contents.
+def _identical_files(path_a, path_b):
+    with open(path_a, "rb") as fa:
+        with open(path_b, "rb") as fb:
+            return fa.read() == fb.read()
+
+
+# Helper to write the object as json to the specified path, creating any
+# directories as required.
+def _write_json(obj, path, minify=False):
+    _ensure_path_exists(path)
+    with open(path, "w") as f:
+        json.dump(
+            obj, f, indent=(None if minify else 2), separators=((",", ":") if minify else None)
+        )
+        f.write("\n")
+
+
+# Write the package json to package/{"py" or mpy_version}/{package}/{version}.json.
+def _write_package_json(
+    package_json, out_package_dir, mpy_version, package_name, version, replace
+):
+    path = os.path.join(out_package_dir, mpy_version, package_name, version + ".json")
+    if replace or not os.path.exists(path):
+        _write_json(package_json, path, minify=True)
+
+
+# Format s with bold red.
+def _error_color(s):
+    return _COLOR_ERROR_ON + s + _COLOR_ERROR_OFF
+
+
+# Copy src to "file"/{short_hash[0:2]}/{short_hash}.
+def _write_hashed_file(package_name, src, target_path, out_file_dir, hash_prefix_len):
+    # Generate the full sha256 and the hash prefix to use as the output path.
+    file_hash = _get_file_hash(src)
+    short_file_hash = file_hash[:hash_prefix_len]
+    # Group files into subdirectories using the first two bytes of the hash prefix.
+    output_file = os.path.join(short_file_hash[:2], short_file_hash)
+    output_file_path = os.path.join(out_file_dir, output_file)
+
+    if os.path.exists(output_file_path):
+        # If the file exists (e.g. from a previous run of this script), then ensure
+        # that it's actually the same file.
+        if not _identical_files(src.name, output_file_path):
+            print(
+                error_color("Hash collision processing:"),
+                package_name,
+                file=sys.stderr,
+            )
+            print(f"  File:        {target_path}", file=sys.stderr)
+            print(f"  Short hash:  {short_file_hash}", file=sys.stderr)
+            print(f"  Full hash:   {file_hash}", file=sys.stderr)
+            with open(output_file_path, "rb") as f:
+                print(f"  Target hash: {file_hash(f)}", file=sys.stderr)
+            print(f"Try increasing --hash-prefix (currently {hash_prefix_len})")
+            sys.exit(1)
+    else:
+        # Create new file.
+        _ensure_path_exists(output_file_path)
+        shutil.copyfile(src.name, output_file_path)
+
+    return short_file_hash
+
+
+# Convert the tagged .py file into a .mpy file and copy to the "file" output
+# directory with it's hashed name. Updates the package_json with the file
+# hash.
+def _compile_as_mpy(
+    package_name,
+    package_json,
+    tagged_path,
+    target_path,
+    opt,
+    mpy_cross,
+    mpy_cross_path,
+    out_file_dir,
+    hash_prefix_len,
+):
+    with tempfile.NamedTemporaryFile(mode="rb", suffix=".mpy", delete=True) as mpy_tempfile:
+        try:
+            mpy_cross.compile(
+                tagged_path,
+                dest=mpy_tempfile.name,
+                src_path=target_path,
+                opt=opt,
+                mpy_cross=mpy_cross_path,
+            )
+        except mpy_cross.CrossCompileError as e:
+            print(
+                _error_color("Error:"),
+                "Unable to compile",
+                target_path,
+                "in package",
+                package_name,
+                file=sys.stderr,
+            )
+            print(e)
+            sys.exit(1)
+
+        short_mpy_hash = _write_hashed_file(
+            package_name, mpy_tempfile, target_path, out_file_dir, hash_prefix_len
+        )
+
+        # Add the file to the package json.
+        target_path_mpy = target_path[:-2] + "mpy"
+        package_json["hashes"].append((target_path_mpy, short_mpy_hash))
+
+
+# Copy the tagged .py file to the "file" output directory with it's hashed
+# name. Updates the package_json with the file hash.
+def _copy_as_py(
+    package_name, package_json, tagged_path, target_path, out_file_dir, hash_prefix_len
+):
+    with open(tagged_path, "rb") as tagged_file:
+        short_py_hash = _write_hashed_file(
+            package_name, tagged_file, target_path, out_file_dir, hash_prefix_len
+        )
+    # Add the file to the package json.
+    package_json["hashes"].append((target_path, short_py_hash))
+
+
+# Update to the latest metadata, and add any new versions to the package in
+# the index json.
+def _update_index_package_metadata(index_package_json, metadata, mpy_version):
+    index_package_json["version"] = metadata.version or ""
+    index_package_json["author"] = ""  # TODO: Make manifestfile.py capture this.
+    index_package_json["description"] = metadata.description or ""
+    index_package_json["license"] = metadata.license or "MIT"
+    if "versions" not in index_package_json:
+        index_package_json["versions"] = {}
+    if metadata.version:
+        for v in ("py", mpy_version):
+            if v not in index_package_json["versions"]:
+                index_package_json["versions"][v] = []
+            if metadata.version not in index_package_json["versions"][v]:
+                print("  New version {}={}".format(v, metadata.version))
+                index_package_json["versions"][v].append(metadata.version)
+
+
+def build(output_path, hash_prefix_len, mpy_cross_path):
+    import manifestfile
+    import mpy_cross
+
+    out_file_dir = os.path.join(output_path, "file")
+    out_package_dir = os.path.join(output_path, "package")
+
+    path_vars = {
+        "MPY_LIB_DIR": os.path.abspath(os.path.join(os.path.dirname(__file__), "..")),
+    }
+
+    index_json_path = os.path.join(output_path, "index.json")
+
+    try:
+        with open(index_json_path) as f:
+            print("Updating existing index.json")
+            index_json = json.load(f)
+    except FileNotFoundError:
+        print("Creating new index.json")
+        index_json = {"packages": []}
+
+    index_json["v"] = _JSON_VERSION_INDEX
+    index_json["updated"] = int(time.time())
+
+    # For now, don't process unix-ffi. In the future this can be extended to
+    # allow a way to request unix-ffi packages via mip.
+    lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
+
+    mpy_version, _mpy_sub_version = mpy_cross.mpy_version(mpy_cross=mpy_cross_path)
+    mpy_version = str(mpy_version)
+    print(f"Generating bytecode version {mpy_version}")
+
+    for lib_dir in lib_dirs:
+        for manifest_path in glob.glob(os.path.join(lib_dir, "**", "manifest.py"), recursive=True):
+            print("{}".format(os.path.dirname(manifest_path)))
+            # .../foo/manifest.py -> foo
+            package_name = os.path.basename(os.path.dirname(manifest_path))
+
+            # Compile the manifest.
+            manifest = manifestfile.ManifestFile(manifestfile.MODE_COMPILE, path_vars)
+            manifest.execute(manifest_path)
+
+            # Append this package to the index.
+            if not manifest.metadata().version:
+                print(_error_color("Warning:"), package_name, "doesn't have a version.")
+
+            # Try to find this package in the previous index.json.
+            for p in index_json["packages"]:
+                if p["name"] == package_name:
+                    index_package_json = p
+                    break
+            else:
+                print("  First-time package")
+                index_package_json = {
+                    "name": package_name,
+                }
+                index_json["packages"].append(index_package_json)
+
+            _update_index_package_metadata(index_package_json, manifest.metadata(), mpy_version)
+
+            # This is the package json that mip/mpremote downloads.
+            mpy_package_json = {
+                "v": _JSON_VERSION_PACKAGE,
+                "hashes": [],
+                "version": manifest.metadata().version or "",
+            }
+            py_package_json = {
+                "v": _JSON_VERSION_PACKAGE,
+                "hashes": [],
+                "version": manifest.metadata().version or "",
+            }
+
+            for result in manifest.files():
+                # This isn't allowed in micropython-lib anyway.
+                if result.file_type != manifestfile.FILE_TYPE_LOCAL:
+                    print("Non-local file not supported.", file=sys.stderr)
+                    sys.exit(1)
+
+                if not result.target_path.endswith(".py"):
+                    print(
+                        "Target path isn't a .py file:",
+                        result.target_path,
+                        file=sys.stderr,
+                    )
+                    sys.exit(1)
+
+                # Tag each file with the package metadata and compile to .mpy
+                # (and copy the .py directly).
+                with manifestfile.tagged_py_file(result.full_path, result.metadata) as tagged_path:
+                    _compile_as_mpy(
+                        package_name,
+                        mpy_package_json,
+                        tagged_path,
+                        result.target_path,
+                        result.opt,
+                        mpy_cross,
+                        mpy_cross_path,
+                        out_file_dir,
+                        hash_prefix_len,
+                    )
+                    _copy_as_py(
+                        package_name,
+                        py_package_json,
+                        tagged_path,
+                        result.target_path,
+                        out_file_dir,
+                        hash_prefix_len,
+                    )
+
+            # Create/replace {package}/latest.json.
+            _write_package_json(
+                mpy_package_json,
+                out_package_dir,
+                mpy_version,
+                package_name,
+                "latest",
+                replace=True,
+            )
+            _write_package_json(
+                py_package_json, out_package_dir, "py", package_name, "latest", replace=True
+            )
+
+            # Write {package}/{version}.json, but only if it doesn't already
+            # exist. A package version is "locked" the first time it's seen
+            # by this script.
+            if manifest.metadata().version:
+                _write_package_json(
+                    mpy_package_json,
+                    out_package_dir,
+                    mpy_version,
+                    package_name,
+                    manifest.metadata().version,
+                    replace=False,
+                )
+                _write_package_json(
+                    py_package_json,
+                    out_package_dir,
+                    "py",
+                    package_name,
+                    manifest.metadata().version,
+                    replace=False,
+                )
+
+    # Write updated package index json, sorted by package name.
+    index_json["packages"].sort(key=lambda p: p["name"])
+    _write_json(index_json, index_json_path, minify=False)
+
+
+def main():
+    import argparse
+
+    cmd_parser = argparse.ArgumentParser(description="Compile micropython-lib for serving to mip.")
+    cmd_parser.add_argument("--output", required=True, help="output directory")
+    cmd_parser.add_argument("--hash-prefix", default=8, type=int, help="hash prefix length")
+    cmd_parser.add_argument("--mpy-cross", default=None, help="optional path to mpy-cross binary")
+    cmd_parser.add_argument("--micropython", default=None, help="path to micropython repo")
+    args = cmd_parser.parse_args()
+
+    if args.micropython:
+        sys.path.append(os.path.join(args.micropython, "tools"))  # for manifestfile
+        sys.path.append(os.path.join(args.micropython, "mpy-cross"))  # for mpy_cross
+
+    build(args.output, hash_prefix_len=max(4, args.hash_prefix), mpy_cross_path=args.mpy_cross)
+
+
+if __name__ == "__main__":
+    main()

From 5e7bac1161886dc4afbec62bb4cf18a79e738625 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Aug 2022 14:53:05 +1000
Subject: [PATCH 096/343] micropython/mip: Add a new `mip` library for
 on-device installation.

Riffing on "pip", "mip installs packages".

This is a replacement for the previous `upip` tool for on-device
installation of packages.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 README.md                   |   1 -
 micropython/mip/manifest.py |   5 ++
 micropython/mip/mip.py      | 169 ++++++++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 micropython/mip/manifest.py
 create mode 100644 micropython/mip/mip.py

diff --git a/README.md b/README.md
index 13142fc34..2c78d125c 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,3 @@ Future plans (and new contributor ideas)
 
 * Develop a set of example programs using these libraries.
 * Develop more MicroPython libraries for common tasks.
-* Provide a replacement for the previous `upip` tool.
diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
new file mode 100644
index 000000000..e13ad7aef
--- /dev/null
+++ b/micropython/mip/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.1.0", description="On-device package installer for network-capable boards")
+
+require("urequests")
+
+module("mip.py")
diff --git a/micropython/mip/mip.py b/micropython/mip/mip.py
new file mode 100644
index 000000000..a019e4e98
--- /dev/null
+++ b/micropython/mip/mip.py
@@ -0,0 +1,169 @@
+# MicroPython package installer
+# MIT license; Copyright (c) 2022 Jim Mussared
+
+import urequests as requests
+import sys
+
+
+_PACKAGE_INDEX = const("https://micropython.org/pi/v2")
+_CHUNK_SIZE = 128
+
+
+# This implements os.makedirs(os.dirname(path))
+def _ensure_path_exists(path):
+    import os
+
+    split = path.split("/")
+
+    # Handle paths starting with "/".
+    if not split[0]:
+        split.pop(0)
+        split[0] = "/" + split[0]
+
+    prefix = ""
+    for i in range(len(split) - 1):
+        prefix += split[i]
+        try:
+            os.stat(prefix)
+        except:
+            os.mkdir(prefix)
+        prefix += "/"
+
+
+# Copy from src (stream) to dest (function-taking-bytes)
+def _chunk(src, dest):
+    buf = memoryview(bytearray(_CHUNK_SIZE))
+    while True:
+        n = src.readinto(buf)
+        if n == 0:
+            break
+        dest(buf if n == _CHUNK_SIZE else buf[:n])
+
+
+# Check if the specified path exists and matches the hash.
+def _check_exists(path, short_hash):
+    import os
+
+    try:
+        import binascii
+        import hashlib
+
+        with open(path, "rb") as f:
+            hs256 = hashlib.sha256()
+            _chunk(f, hs256.update)
+            existing_hash = str(binascii.hexlify(hs256.digest())[: len(short_hash)], "utf-8")
+            return existing_hash == short_hash
+    except:
+        return False
+
+
+def _rewrite_url(url, branch=None):
+    if not branch:
+        branch = "HEAD"
+    if url.startswith("github:"):
+        url = url[7:].split("/")
+        url = (
+            "https://raw.githubusercontent.com/"
+            + url[0]
+            + "/"
+            + url[1]
+            + "/"
+            + branch
+            + "/"
+            + "/".join(url[2:])
+        )
+    return url
+
+
+def _download_file(url, dest):
+    response = requests.get(url)
+    try:
+        if response.status_code != 200:
+            print("Error", response.status_code, "requesting", url)
+            return False
+
+        print("Copying:", dest)
+        _ensure_path_exists(dest)
+        with open(dest, "wb") as f:
+            _chunk(response.raw, f.write)
+
+        return True
+    finally:
+        response.close()
+
+
+def _install_json(package_json_url, index, target, version, mpy):
+    response = requests.get(_rewrite_url(package_json_url, version))
+    try:
+        if response.status_code != 200:
+            print("Package not found:", package_json_url)
+            return False
+
+        package_json = response.json()
+    finally:
+        response.close()
+    for target_path, short_hash in package_json.get("hashes", ()):
+        fs_target_path = target + "/" + target_path
+        if _check_exists(fs_target_path, short_hash):
+            print("Exists:", fs_target_path)
+        else:
+            file_url = "{}/file/{}/{}".format(index, short_hash[:2], short_hash)
+            if not _download_file(file_url, fs_target_path):
+                print("File not found: {} {}".format(target_path, short_hash))
+                return False
+    for target_path, url in package_json.get("urls", ()):
+        fs_target_path = target + "/" + target_path
+        if not _download_file(_rewrite_url(url, version), fs_target_path):
+            print("File not found: {} {}".format(target_path, url))
+            return False
+    for dep, dep_version in package_json.get("deps", ()):
+        if not _install_package(dep, index, target, dep_version, mpy):
+            return False
+    return True
+
+
+def _install_package(package, index, target, version, mpy):
+    if (
+        package.startswith("http://")
+        or package.startswith("https://")
+        or package.startswith("github:")
+    ):
+        if package.endswith(".py") or package.endswith(".mpy"):
+            print("Downloading {} to {}".format(package, target))
+            return _download_file(
+                _rewrite_url(package, version), target + "/" + package.rsplit("/")[-1]
+            )
+        else:
+            if not package.endswith(".json"):
+                if not package.endswith("/"):
+                    package += "/"
+                package += "package.json"
+            print("Installing {} to {}".format(package, target))
+    else:
+        if not version:
+            version = "latest"
+        print("Installing {} ({}) from {} to {}".format(package, version, index, target))
+
+        mpy_version = (
+            sys.implementation._mpy & 0xFF if mpy and hasattr(sys.implementation, "_mpy") else "py"
+        )
+
+        package = "{}/package/{}/{}/{}.json".format(index, mpy_version, package, version)
+
+    return _install_json(package, index, target, version, mpy)
+
+
+def install(package, index=_PACKAGE_INDEX, target=None, version=None, mpy=True):
+    if not target:
+        for p in sys.path:
+            if p.endswith("/lib"):
+                target = p
+                break
+        else:
+            print("Unable to find lib dir in sys.path")
+            return
+
+    if _install_package(package, index.rstrip("/"), target, version, mpy):
+        print("Done")
+    else:
+        print("Package may be partially installed")

From d0f97fc218f07c381c835d9f632904c1ae1c9d6b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Aug 2022 14:53:24 +1000
Subject: [PATCH 097/343] tools/build.py: Make build.py work without f-strings.

Allows running on older CPython versions.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/build.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index 088a201a8..305870be7 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -191,16 +191,16 @@ def _write_hashed_file(package_name, src, target_path, out_file_dir, hash_prefix
         # that it's actually the same file.
         if not _identical_files(src.name, output_file_path):
             print(
-                error_color("Hash collision processing:"),
+                _error_color("Hash collision processing:"),
                 package_name,
                 file=sys.stderr,
             )
-            print(f"  File:        {target_path}", file=sys.stderr)
-            print(f"  Short hash:  {short_file_hash}", file=sys.stderr)
-            print(f"  Full hash:   {file_hash}", file=sys.stderr)
+            print("  File:        ", target_path, file=sys.stderr)
+            print("  Short hash:  ", short_file_hash, file=sys.stderr)
+            print("  Full hash:   ", file_hash, file=sys.stderr)
             with open(output_file_path, "rb") as f:
-                print(f"  Target hash: {file_hash(f)}", file=sys.stderr)
-            print(f"Try increasing --hash-prefix (currently {hash_prefix_len})")
+                print("  Target hash: ", _get_file_hash(f), file=sys.stderr)
+            print("Try increasing --hash-prefix (currently {})".format(hash_prefix_len))
             sys.exit(1)
     else:
         # Create new file.
@@ -315,7 +315,7 @@ def build(output_path, hash_prefix_len, mpy_cross_path):
 
     mpy_version, _mpy_sub_version = mpy_cross.mpy_version(mpy_cross=mpy_cross_path)
     mpy_version = str(mpy_version)
-    print(f"Generating bytecode version {mpy_version}")
+    print("Generating bytecode version", mpy_version)
 
     for lib_dir in lib_dirs:
         for manifest_path in glob.glob(os.path.join(lib_dir, "**", "manifest.py"), recursive=True):

From 459e13921af980cc52861576e5915dcaf8f9197b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 30 Sep 2022 17:50:21 +1000
Subject: [PATCH 098/343] os.path: Remove external / ffi dependencies in
 os.path.

This work was funded by Planet Innovation.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 python-stdlib/os-path/manifest.py |  2 +-
 python-stdlib/os-path/os/path.py  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/python-stdlib/os-path/manifest.py b/python-stdlib/os-path/manifest.py
index dce6d505d..fd1885223 100644
--- a/python-stdlib/os-path/manifest.py
+++ b/python-stdlib/os-path/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1.3")
+metadata(version="0.1.4")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/python-stdlib/os-path/os/path.py b/python-stdlib/os-path/os/path.py
index 0ab8f0958..7b4f937e5 100644
--- a/python-stdlib/os-path/os/path.py
+++ b/python-stdlib/os-path/os/path.py
@@ -47,7 +47,11 @@ def basename(path):
 
 
 def exists(path):
-    return os.access(path, os.F_OK)
+    try:
+        os.stat(path)
+        return True
+    except OSError:
+        return False
 
 
 # TODO
@@ -55,11 +59,9 @@ def exists(path):
 
 
 def isdir(path):
-    import stat
-
     try:
         mode = os.stat(path)[0]
-        return stat.S_ISDIR(mode)
+        return mode & 0o040000
     except OSError:
         return False
 

From 9bc0b15f11cb5089ac4b8666fc9a8d181b11f853 Mon Sep 17 00:00:00 2001
From: Oliver Joos <oliver.joos@hispeed.ch>
Date: Thu, 10 Feb 2022 00:45:53 +0100
Subject: [PATCH 099/343] unittest: Make AssertRaisesContext store exception
 for later retrieval.

The statement "with assertRaises(errtype) as ctxt" checks the type of a
raised exception, but did not store the exception into ctxt like unittest
of CPython.  The exception instance is usually used to check its message or
other args.
---
 python-stdlib/unittest/unittest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest.py
index 35ed14acd..8ecab0a2f 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest.py
@@ -24,6 +24,8 @@ def __exit__(self, exc_type, exc_value, tb):
         if exc_type is None:
             assert False, "%r not raised" % self.expected
         if issubclass(exc_type, self.expected):
+            # store exception for later retrieval
+            self.exception = exc_value
             return True
         return False
 

From b50d3462d783e4aab2f10d6b8117641244918f64 Mon Sep 17 00:00:00 2001
From: Meir Armon <meirarmon@gmail.com>
Date: Tue, 6 Sep 2022 21:37:13 +0300
Subject: [PATCH 100/343] umqtt.simple: Return op from wait_msg() as indication
 of reception.

Fixes issue #328.
---
 micropython/umqtt.simple/umqtt/simple.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index 7910024f8..2b269473b 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -206,6 +206,7 @@ def wait_msg(self):
             self.sock.write(pkt)
         elif op & 6 == 4:
             assert 0
+        return op
 
     # Checks whether a pending message from server is available.
     # If not, returns immediately with None. Otherwise, does

From 4dc2d5e17f1dfa0ca8af731cb1b6eec437731b25 Mon Sep 17 00:00:00 2001
From: Ian Cotter-Llewellyn <ian_llewellyn@hotmail.com>
Date: Mon, 18 Jul 2022 16:36:13 +0100
Subject: [PATCH 101/343] umqtt.robust: Fix check_msg blocking after reconnect.

After `reconnect()`, MQTTClient.socket is blocking by default, and
check_msg() can block.  This commit aims to fix that behaviour by
reimplementing `check_msg()` for umqtt.robust and setting the socket to
non-blocking.

Fixes issue #192.
---
 .../umqtt.robust/example_check_msg_robust.py       | 14 ++++++++++++++
 micropython/umqtt.robust/manifest.py               |  2 +-
 micropython/umqtt.robust/umqtt/robust.py           | 10 ++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 micropython/umqtt.robust/example_check_msg_robust.py

diff --git a/micropython/umqtt.robust/example_check_msg_robust.py b/micropython/umqtt.robust/example_check_msg_robust.py
new file mode 100644
index 000000000..2374489c6
--- /dev/null
+++ b/micropython/umqtt.robust/example_check_msg_robust.py
@@ -0,0 +1,14 @@
+import umqtt.robust
+import time
+
+# Instantiate an MQTTClient with a keepalive time of 5 seconds (to help us test
+# what happens to check_msg() with a broken connection)
+m = umqtt.robust.MQTTClient(host="localhost", debug=True, keepalive=5)
+
+m.connect()
+
+# Wait for the broker to consider us dead
+time.sleep(6)
+
+# This should initiate a reconnect() and return immediately
+m.check_msg()
diff --git a/micropython/umqtt.robust/manifest.py b/micropython/umqtt.robust/manifest.py
index 28f83d9e3..fe388b415 100644
--- a/micropython/umqtt.robust/manifest.py
+++ b/micropython/umqtt.robust/manifest.py
@@ -1,5 +1,5 @@
 metadata(
-    description='Lightweight MQTT client for MicroPython ("robust" version).', version="1.0.1"
+    description='Lightweight MQTT client for MicroPython ("robust" version).', version="1.0.2"
 )
 
 # Originally written by Paul Sokolovsky.
diff --git a/micropython/umqtt.robust/umqtt/robust.py b/micropython/umqtt.robust/umqtt/robust.py
index 55dd4da13..d9e4e9e97 100644
--- a/micropython/umqtt.robust/umqtt/robust.py
+++ b/micropython/umqtt.robust/umqtt/robust.py
@@ -42,3 +42,13 @@ def wait_msg(self):
             except OSError as e:
                 self.log(False, e)
             self.reconnect()
+
+    def check_msg(self, attempts=2):
+        while attempts:
+            self.sock.setblocking(False)
+            try:
+                return super().wait_msg()
+            except OSError as e:
+                self.log(False, e)
+            self.reconnect()
+            attempts -= 1

From 8503017e3b4e552ddd8ce96c21e52e0f4e61d877 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 12 Sep 2022 14:23:07 +1000
Subject: [PATCH 102/343] aioble: Split into optional components.

This replaces the options that could be specified previously to include
and require.

The `aioble` package now provides everything. For a minimal install, the
individual components can now be installed or require()'ed explicitly.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../bluetooth/aioble-central/manifest.py      |  5 +++
 .../bluetooth/aioble-client/manifest.py       |  5 +++
 micropython/bluetooth/aioble-core/manifest.py | 11 +++++
 .../bluetooth/aioble-l2cap/manifest.py        |  5 +++
 .../bluetooth/aioble-peripheral/manifest.py   |  5 +++
 .../bluetooth/aioble-security/manifest.py     |  5 +++
 .../bluetooth/aioble-server/manifest.py       |  5 +++
 micropython/bluetooth/aioble/README.md        | 20 ++++++++-
 micropython/bluetooth/aioble/manifest.py      | 42 +++++++------------
 9 files changed, 75 insertions(+), 28 deletions(-)
 create mode 100644 micropython/bluetooth/aioble-central/manifest.py
 create mode 100644 micropython/bluetooth/aioble-client/manifest.py
 create mode 100644 micropython/bluetooth/aioble-core/manifest.py
 create mode 100644 micropython/bluetooth/aioble-l2cap/manifest.py
 create mode 100644 micropython/bluetooth/aioble-peripheral/manifest.py
 create mode 100644 micropython/bluetooth/aioble-security/manifest.py
 create mode 100644 micropython/bluetooth/aioble-server/manifest.py

diff --git a/micropython/bluetooth/aioble-central/manifest.py b/micropython/bluetooth/aioble-central/manifest.py
new file mode 100644
index 000000000..beec50460
--- /dev/null
+++ b/micropython/bluetooth/aioble-central/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.2.0")
+
+require("aioble-core")
+
+package("aioble", files=("central.py",), base_path="../aioble")
diff --git a/micropython/bluetooth/aioble-client/manifest.py b/micropython/bluetooth/aioble-client/manifest.py
new file mode 100644
index 000000000..eb79c6d33
--- /dev/null
+++ b/micropython/bluetooth/aioble-client/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.2.0")
+
+require("aioble-core")
+
+package("aioble", files=("client.py",), base_path="../aioble")
diff --git a/micropython/bluetooth/aioble-core/manifest.py b/micropython/bluetooth/aioble-core/manifest.py
new file mode 100644
index 000000000..2448769e6
--- /dev/null
+++ b/micropython/bluetooth/aioble-core/manifest.py
@@ -0,0 +1,11 @@
+metadata(version="0.2.0")
+
+package(
+    "aioble",
+    files=(
+        "__init__.py",
+        "core.py",
+        "device.py",
+    ),
+    base_path="../aioble",
+)
diff --git a/micropython/bluetooth/aioble-l2cap/manifest.py b/micropython/bluetooth/aioble-l2cap/manifest.py
new file mode 100644
index 000000000..9150ad547
--- /dev/null
+++ b/micropython/bluetooth/aioble-l2cap/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.2.0")
+
+require("aioble-core")
+
+package("aioble", files=("l2cap.py",), base_path="../aioble")
diff --git a/micropython/bluetooth/aioble-peripheral/manifest.py b/micropython/bluetooth/aioble-peripheral/manifest.py
new file mode 100644
index 000000000..dd4dd122d
--- /dev/null
+++ b/micropython/bluetooth/aioble-peripheral/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.2.0")
+
+require("aioble-core")
+
+package("aioble", files=("peripheral.py",), base_path="../aioble")
diff --git a/micropython/bluetooth/aioble-security/manifest.py b/micropython/bluetooth/aioble-security/manifest.py
new file mode 100644
index 000000000..5737d2a06
--- /dev/null
+++ b/micropython/bluetooth/aioble-security/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.2.0")
+
+require("aioble-core")
+
+package("aioble", files=("security.py",), base_path="../aioble")
diff --git a/micropython/bluetooth/aioble-server/manifest.py b/micropython/bluetooth/aioble-server/manifest.py
new file mode 100644
index 000000000..a9676204d
--- /dev/null
+++ b/micropython/bluetooth/aioble-server/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.2.0")
+
+require("aioble-core")
+
+package("aioble", files=("server.py",), base_path="../aioble")
diff --git a/micropython/bluetooth/aioble/README.md b/micropython/bluetooth/aioble/README.md
index 66bb32d64..a60eea760 100644
--- a/micropython/bluetooth/aioble/README.md
+++ b/micropython/bluetooth/aioble/README.md
@@ -1,7 +1,8 @@
 aioble
 ======
 
-This library provides an object-oriented, asyncio-based wrapper for MicroPython's [ubluetooth](https://docs.micropython.org/en/latest/library/ubluetooth.html) API.
+This library provides an object-oriented, asyncio-based wrapper for MicroPython's
+[bluetooth](https://docs.micropython.org/en/latest/library/bluetooth.html) API.
 
 **Note**: aioble requires MicroPython v1.17 or higher.
 
@@ -49,6 +50,23 @@ Security:
 
 All remote operations (connect, disconnect, client read/write, server indicate, l2cap recv/send, pair) are awaitable and support timeouts.
 
+Installation
+------------
+
+You can install any combination of the following packages.
+- `aioble-central` -- Central (and Observer) role functionality including
+  scanning and connecting.
+- `aioble-client` -- GATT client, typically used by central role devices but
+  can also be used on peripherals.
+- `aioble-l2cap` -- L2CAP Connection-oriented-channels support.
+- `aioble-peripheral` -- Peripheral (and Broadcaster) role functionality
+  including advertising.
+- `aioble-security` -- Pairing and bonding support.
+- `aioble-server` -- GATT server, typically used by peripheral role devices
+  but can also be used on centrals.
+
+Alternatively, install the `aioble` package, which will install everything.
+
 Usage
 -----
 
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 337014757..a1463ca08 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -1,27 +1,15 @@
-_files = (
-    "__init__.py",
-    "core.py",
-    "device.py",
-)
-
-options.defaults(peripheral=True, server=True)
-
-if options.central:
-    _files += ("central.py",)
-
-if options.client:
-    _files += ("client.py",)
-
-if options.peripheral:
-    _files += ("peripheral.py",)
-
-if options.server:
-    _files += ("server.py",)
-
-if options.l2cap:
-    _files += ("l2cap.py",)
-
-if options.security:
-    _files += ("security.py",)
-
-package("aioble", files=_files)
+# This directory contains all aioble code, but the manifest itself just
+# forwards to the component manifests, which themselves reference the actual
+# code. This allows (for development purposes) all the files to live in the
+# one directory.
+
+metadata(version="0.2.0")
+
+# Default installation gives you everything. Install the individual
+# components (or a combination of them) if you want a more minimal install.
+require("aioble-peripheral")
+require("aioble-server")
+require("aioble-central")
+require("aioble-client")
+require("aioble-l2cap")
+require("aioble-security")

From 900dd1c61b42c709417e303b706b5e5055214740 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 17 Oct 2022 14:32:52 +0200
Subject: [PATCH 103/343] ntptime: Allow overriding default NTP timeout.

The default 1 second timeout is sometimes not enough depending on the host
and network latencies.  This patch makes timeout configurable.
---
 micropython/net/ntptime/ntptime.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/micropython/net/ntptime/ntptime.py b/micropython/net/ntptime/ntptime.py
index 05d7e9717..ff0d9d202 100644
--- a/micropython/net/ntptime/ntptime.py
+++ b/micropython/net/ntptime/ntptime.py
@@ -11,6 +11,8 @@
 
 # The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
 host = "pool.ntp.org"
+# The NTP socket timeout can be configured at runtime by doing: ntptime.timeout = 2
+timeout = 1
 
 
 def time():
@@ -19,7 +21,7 @@ def time():
     addr = socket.getaddrinfo(host, 123)[0][-1]
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     try:
-        s.settimeout(1)
+        s.settimeout(timeout)
         res = s.sendto(NTP_QUERY, addr)
         msg = s.recv(48)
     finally:

From 0e25b109c23fe30a3a0f075c0edf2c2564bc5046 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 25 Oct 2022 11:41:57 +0200
Subject: [PATCH 104/343] dht: Change the sequence for importing dht_readinto.

Check the machine module first, then search in previous places.  This
supports having machine.dht_readinto as the new standard, while still being
backwards compatible.
---
 micropython/drivers/sensor/dht/dht.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/micropython/drivers/sensor/dht/dht.py b/micropython/drivers/sensor/dht/dht.py
index 411e9a8d2..1ba2c59af 100644
--- a/micropython/drivers/sensor/dht/dht.py
+++ b/micropython/drivers/sensor/dht/dht.py
@@ -2,17 +2,16 @@
 # MIT license; Copyright (c) 2016 Damien P. George
 
 import sys
+import machine
 
-if sys.platform.startswith("esp"):
+if hasattr(machine, "dht_readinto"):
+    from machine import dht_readinto
+elif sys.platform.startswith("esp"):
     from esp import dht_readinto
-elif sys.platform == "mimxrt":
-    from mimxrt import dht_readinto
-elif sys.platform == "rp2":
-    from rp2 import dht_readinto
-elif sys.platform == "pyboard":
-    from pyb import dht_readinto
 else:
-    from machine import dht_readinto
+    dht_readinto = __import__(sys.platform).dht_readinto
+
+del machine
 
 
 class DHTBase:

From 82f6b18b8876bf6702dcd7bc55f10f1cd94a1571 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 20 Oct 2022 07:56:57 +0200
Subject: [PATCH 105/343] espflash: Add a minimal ESP32 bootloader protocol
 implementation.

This tool implements a subset of the ESP32 ROM bootloader protocol, and
it's mainly intended for updating Nina WiFi firmware from MicroPython, but
can be used to flash any ESP32 chip.
---
 micropython/espflash/espflash.py | 308 +++++++++++++++++++++++++++++++
 micropython/espflash/example.py  |  29 +++
 micropython/espflash/manifest.py |   6 +
 3 files changed, 343 insertions(+)
 create mode 100644 micropython/espflash/espflash.py
 create mode 100644 micropython/espflash/example.py
 create mode 100644 micropython/espflash/manifest.py

diff --git a/micropython/espflash/espflash.py b/micropython/espflash/espflash.py
new file mode 100644
index 000000000..700309bd9
--- /dev/null
+++ b/micropython/espflash/espflash.py
@@ -0,0 +1,308 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+#
+# 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.
+#
+# A minimal esptool implementation to communicate with ESP32 ROM bootloader.
+# Note this tool does Not support advanced features, other ESP chips or stub loading.
+# This is only meant to be used for updating the U-blox Nina module firmware.
+
+import os
+import struct
+from micropython import const
+from time import sleep
+import binascii
+
+_CMD_SYNC = const(0x08)
+_CMD_CHANGE_BAUDRATE = const(0x0F)
+
+_CMD_ESP_READ_REG = const(0x0A)
+_CMD_ESP_WRITE_REG = const(0x09)
+
+_CMD_SPI_ATTACH = const(0x0D)
+_CMD_SPI_FLASH_MD5 = const(0x13)
+_CMD_SPI_FLASH_PARAMS = const(0x0B)
+_CMD_SPI_FLASH_BEGIN = const(0x02)
+_CMD_SPI_FLASH_DATA = const(0x03)
+_CMD_SPI_FLASH_END = const(0x04)
+
+_FLASH_ID = const(0)
+_FLASH_REG_BASE = const(0x60002000)
+_FLASH_BLOCK_SIZE = const(64 * 1024)
+_FLASH_SECTOR_SIZE = const(4 * 1024)
+_FLASH_PAGE_SIZE = const(256)
+
+_ESP_ERRORS = {
+    0x05: "Received message is invalid",
+    0x06: "Failed to act on received message",
+    0x07: "Invalid CRC in message",
+    0x08: "Flash write error",
+    0x09: "Flash read error",
+    0x0A: "Flash read length error",
+    0x0B: "Deflate error",
+}
+
+
+class ESPFlash:
+    def __init__(self, reset, gpio0, uart, log_enabled=False):
+        self.uart = uart
+        self.reset_pin = reset
+        self.gpio0_pin = gpio0
+        self.log = log_enabled
+        self.baudrate = 115200
+        self.md5sum = None
+        try:
+            import hashlib
+
+            if hasattr(hashlib, "md5"):
+                self.md5sum = hashlib.md5()
+        except ImportError:
+            pass
+
+    def _log(self, data, out=True):
+        if self.log:
+            size = len(data)
+            print(
+                f"out({size}) => " if out else f"in({size})  <= ",
+                "".join("%.2x" % (i) for i in data[0:10]),
+            )
+
+    def _uart_drain(self):
+        while self.uart.read(1) is not None:
+            pass
+
+    def _read_reg(self, addr):
+        v, d = self._command(_CMD_ESP_READ_REG, struct.pack("<I", _FLASH_REG_BASE + addr))
+        if d[0] != 0:
+            raise Exception("Command ESP_READ_REG failed.")
+        return v
+
+    def _write_reg(self, addr, data, mask=0xFFFFFFFF, delay=0):
+        v, d = self._command(
+            _CMD_ESP_WRITE_REG, struct.pack("<IIII", _FLASH_REG_BASE + addr, data, mask, delay)
+        )
+        if d[0] != 0:
+            raise Exception("Command ESP_WRITE_REG failed.")
+
+    def _poll_reg(self, addr, flag, retry=10, delay=0.050):
+        for i in range(0, retry):
+            reg = self._read_reg(addr)
+            if (reg & flag) == 0:
+                break
+            sleep(delay)
+        else:
+            raise Exception(f"Register poll timeout. Addr: 0x{addr:02X} Flag: 0x{flag:02X}.")
+
+    def _write_slip(self, pkt):
+        pkt = pkt.replace(b"\xDB", b"\xdb\xdd").replace(b"\xc0", b"\xdb\xdc")
+        self.uart.write(b"\xC0" + pkt + b"\xC0")
+        self._log(pkt)
+
+    def _read_slip(self):
+        pkt = None
+        # Find the packet start.
+        if self.uart.read(1) == b"\xC0":
+            pkt = bytearray()
+            while True:
+                b = self.uart.read(1)
+                if b is None or b == b"\xC0":
+                    break
+                pkt += b
+            pkt = pkt.replace(b"\xDB\xDD", b"\xDB").replace(b"\xDB\xDC", b"\xC0")
+            self._log(b"\xC0" + pkt + b"\xC0", False)
+        return pkt
+
+    def _strerror(self, err):
+        if err in _ESP_ERRORS:
+            return _ESP_ERRORS[err]
+        return "Unknown error"
+
+    def _checksum(self, data):
+        checksum = 0xEF
+        for i in data:
+            checksum ^= i
+        return checksum
+
+    def _command(self, cmd, payload=b"", checksum=0):
+        self._write_slip(struct.pack(b"<BBHI", 0, cmd, len(payload), checksum) + payload)
+        for i in range(10):
+            pkt = self._read_slip()
+            if pkt is not None and len(pkt) >= 8:
+                (flag, _cmd, size, val) = struct.unpack("<BBHI", pkt[:8])
+                if flag == 1 and cmd == _cmd:
+                    status = list(pkt[-4:])
+                    if status[0] == 1:
+                        raise Exception(f"Command {cmd} failed {self._strerror(status[1])}")
+                    return val, pkt[8:]
+        raise Exception(f"Failed to read response to command {cmd}.")
+
+    def set_baudrate(self, baudrate, timeout=350):
+        if not hasattr(self.uart, "init"):
+            return
+        if baudrate != self.baudrate:
+            print(f"Changing baudrate => {baudrate}")
+            self._uart_drain()
+            self._command(_CMD_CHANGE_BAUDRATE, struct.pack("<II", baudrate, 0))
+            self.baudrate = baudrate
+        self.uart.init(baudrate)
+        self._uart_drain()
+
+    def bootloader(self, retry=6):
+        for i in range(retry):
+            self.gpio0_pin(1)
+            self.reset_pin(0)
+            sleep(0.1)
+            self.gpio0_pin(0)
+            self.reset_pin(1)
+            sleep(0.1)
+            self.gpio0_pin(1)
+
+            if "POWERON_RESET" not in self.uart.read():
+                continue
+
+            for i in range(10):
+                self._uart_drain()
+                try:
+                    # 36 bytes: 0x07 0x07 0x12 0x20, followed by 32 x 0x55
+                    self._command(_CMD_SYNC, b"\x07\x07\x12\x20" + 32 * b"\x55")
+                    self._uart_drain()
+                    return True
+                except Exception as e:
+                    print(e)
+
+        raise Exception("Failed to enter download mode!")
+
+    def flash_read_size(self):
+        SPI_REG_CMD = 0x00
+        SPI_USR_FLAG = 1 << 18
+        SPI_REG_USR = 0x1C
+        SPI_REG_USR2 = 0x24
+        SPI_REG_W0 = 0x80
+        SPI_REG_DLEN = 0x2C
+
+        # Command bit len | command
+        SPI_RDID_CMD = ((8 - 1) << 28) | 0x9F
+        SPI_RDID_LEN = 24 - 1
+
+        # Save USR and USR2 registers
+        reg_usr = self._read_reg(SPI_REG_USR)
+        reg_usr2 = self._read_reg(SPI_REG_USR2)
+
+        # Enable command phase and read phase.
+        self._write_reg(SPI_REG_USR, (1 << 31) | (1 << 28))
+
+        # Configure command.
+        self._write_reg(SPI_REG_DLEN, SPI_RDID_LEN)
+        self._write_reg(SPI_REG_USR2, SPI_RDID_CMD)
+
+        self._write_reg(SPI_REG_W0, 0)
+        # Trigger SPI operation.
+        self._write_reg(SPI_REG_CMD, SPI_USR_FLAG)
+
+        # Poll CMD_USER flag.
+        self._poll_reg(SPI_REG_CMD, SPI_USR_FLAG)
+
+        # Restore USR and USR2 registers
+        self._write_reg(SPI_REG_USR, reg_usr)
+        self._write_reg(SPI_REG_USR2, reg_usr2)
+
+        flash_bits = int(self._read_reg(SPI_REG_W0)) >> 16
+        if flash_bits < 0x12 or flash_bits > 0x19:
+            raise Exception(f"Unexpected flash size bits: 0x{flash_bits:02X}.")
+
+        flash_size = 2**flash_bits
+        print(f"Flash size {flash_size/1024/1024} MBytes")
+        return flash_size
+
+    def flash_attach(self):
+        self._command(_CMD_SPI_ATTACH, struct.pack("<II", 0, 0))
+        print(f"Flash attached")
+
+    def flash_config(self, flash_size=2 * 1024 * 1024):
+        self._command(
+            _CMD_SPI_FLASH_PARAMS,
+            struct.pack(
+                "<IIIIII",
+                _FLASH_ID,
+                flash_size,
+                _FLASH_BLOCK_SIZE,
+                _FLASH_SECTOR_SIZE,
+                _FLASH_PAGE_SIZE,
+                0xFFFF,
+            ),
+        )
+
+    def flash_write_file(self, path, blksize=0x1000):
+        size = os.stat(path)[6]
+        total_blocks = (size + blksize - 1) // blksize
+        erase_blocks = 1
+        print(f"Flash write size: {size} total_blocks: {total_blocks} block size: {blksize}")
+        with open(path, "rb") as f:
+            seq = 0
+            subseq = 0
+            for i in range(total_blocks):
+                buf = f.read(blksize)
+                # Update digest
+                if self.md5sum is not None:
+                    self.md5sum.update(buf)
+                # The last data block should be padded to the block size with 0xFF bytes.
+                if len(buf) < blksize:
+                    buf += b"\xFF" * (blksize - len(buf))
+                checksum = self._checksum(buf)
+                if seq % erase_blocks == 0:
+                    # print(f"Erasing {seq} -> {seq+erase_blocks}...")
+                    self._command(
+                        _CMD_SPI_FLASH_BEGIN,
+                        struct.pack(
+                            "<IIII", erase_blocks * blksize, erase_blocks, blksize, seq * blksize
+                        ),
+                    )
+                print(f"Writing sequence number {seq}/{total_blocks}...")
+                self._command(
+                    _CMD_SPI_FLASH_DATA,
+                    struct.pack("<IIII", len(buf), seq % erase_blocks, 0, 0) + buf,
+                    checksum,
+                )
+                seq += 1
+
+        print("Flash write finished")
+
+    def flash_verify_file(self, path, digest=None, offset=0):
+        if digest is None:
+            if self.md5sum is None:
+                raise Exception(f"MD5 checksum missing.")
+            digest = binascii.hexlify(self.md5sum.digest())
+
+        size = os.stat(path)[6]
+        val, data = self._command(_CMD_SPI_FLASH_MD5, struct.pack("<IIII", offset, size, 0, 0))
+
+        print(f"Flash verify: File  MD5 {digest}")
+        print(f"Flash verify: Flash MD5 {bytes(data[0:32])}")
+
+        if digest == data[0:32]:
+            print("Firmware verified.")
+        else:
+            raise Exception(f"Firmware verification failed.")
+
+    def reboot(self):
+        payload = struct.pack("<I", 0)
+        self._write_slip(struct.pack(b"<BBHI", 0, _CMD_SPI_FLASH_END, len(payload), 0) + payload)
diff --git a/micropython/espflash/example.py b/micropython/espflash/example.py
new file mode 100644
index 000000000..76e8eb84e
--- /dev/null
+++ b/micropython/espflash/example.py
@@ -0,0 +1,29 @@
+import espflash
+from machine import Pin
+from machine import UART
+
+if __name__ == "__main__":
+    reset = Pin(3, Pin.OUT)
+    gpio0 = Pin(2, Pin.OUT)
+    uart = UART(1, 115200, tx=Pin(8), rx=Pin(9), timeout=350)
+
+    md5sum = b"9a6cf1257769c9f1af08452558e4d60e"
+    path = "NINA_W102-v1.5.0-Nano-RP2040-Connect.bin"
+
+    esp = espflash.ESPFlash(reset, gpio0, uart)
+    # Enter bootloader download mode, at 115200
+    esp.bootloader()
+    # Can now chage to higher/lower baudrate
+    esp.set_baudrate(921600)
+    # Must call this first before any flash functions.
+    esp.flash_attach()
+    # Read flash size
+    size = esp.flash_read_size()
+    # Configure flash parameters.
+    esp.flash_config(size)
+    # Write firmware image from internal storage.
+    esp.flash_write_file(path)
+    # Compares file and flash MD5 checksum.
+    esp.flash_verify_file(path, md5sum)
+    # Resets the ESP32 chip.
+    esp.reboot()
diff --git a/micropython/espflash/manifest.py b/micropython/espflash/manifest.py
new file mode 100644
index 000000000..19ad98c96
--- /dev/null
+++ b/micropython/espflash/manifest.py
@@ -0,0 +1,6 @@
+metadata(
+    version="0.1",
+    description="Provides a minimal ESP32 bootloader protocol implementation.",
+)
+
+module("espflash.py")

From 50b7aca1717291e2b7bb5f423661105545ab9054 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 5 Nov 2022 22:36:35 +1100
Subject: [PATCH 106/343] aioble/client.py: Fix default for the `response` arg
 to char.write().

- `_FLAG_WRITE` was incorrectly `_FLAGS_WRITE`
- `response` should be defaulted to `None` rather than `False` in order
  to detect that when it is unspecified.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/client.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/client.py b/micropython/bluetooth/aioble/aioble/client.py
index 0ccc70866..8f3bf2c67 100644
--- a/micropython/bluetooth/aioble/aioble/client.py
+++ b/micropython/bluetooth/aioble/aioble/client.py
@@ -269,16 +269,13 @@ def _read_done(conn_handle, value_handle, status):
             characteristic._read_status = status
             characteristic._read_event.set()
 
-    async def write(self, data, response=False, timeout_ms=1000):
+    async def write(self, data, response=None, timeout_ms=1000):
         self._check(_FLAG_WRITE | _FLAG_WRITE_NO_RESPONSE)
 
-        # If we only support write-with-response, then force sensible default.
-        if (
-            response is None
-            and (self.properties & _FLAGS_WRITE)
-            and not (self.properties & _FLAG_WRITE_NO_RESPONSE)
-        ):
-            response = True
+        # If the response arg is unset, then default it to true if we only support write-with-response.
+        if response is None:
+            p = self.properties
+            response = (p & _FLAG_WRITE) and not (p & _FLAG_WRITE_NO_RESPONSE)
 
         if response:
             # Same as read.

From d6eb5b6f7e26ed44c828372c4c987970e939716f Mon Sep 17 00:00:00 2001
From: sandyscott <git@sandyscott.net>
Date: Fri, 28 Oct 2022 11:46:52 +0100
Subject: [PATCH 107/343] aiorepl: Ignore duplicate LFLF after converting CRLF
 from Windows.

The regular REPL uses the uncooked input, but aiorepl reads from sys.stdin
which is cooked. The result is that if the client sends a CRLF, aiorepl
will see LFLF.

This ignores a second LF in quick succession from the first.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aiorepl/aiorepl.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 326e00ba9..36f601c32 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -110,7 +110,12 @@ async def task(g=None, prompt="--> "):
                 t = time.ticks_ms()
                 if c < 0x20 or c > 0x7E:
                     if c == 0x0A:
-                        # CR
+                        # LF
+                        # If the previous character was also LF, and was less
+                        # than 20 ms ago, this was likely due to CRLF->LFLF
+                        # conversion, so ignore this linefeed.
+                        if pc == 0x0A and time.ticks_diff(t, pt) < 20:
+                            continue
                         sys.stdout.write("\n")
                         if cmd:
                             # Push current command.

From 81c1408a0763940f9038e104aa38baa16c120acb Mon Sep 17 00:00:00 2001
From: sandyscott <git@sandyscott.net>
Date: Mon, 31 Oct 2022 17:06:20 +0000
Subject: [PATCH 108/343] aiorepl: Fix ordering of saving previous character.

Duplicate Ctrl-C and LF detection requires this, but it was incorrectly
saving the current value, not the previous.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aiorepl/aiorepl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 36f601c32..62f54c5c9 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -104,8 +104,8 @@ async def task(g=None, prompt="--> "):
             cmd = ""
             while True:
                 b = await s.read(1)
-                c = ord(b)
                 pc = c  # save previous character
+                c = ord(b)
                 pt = t  # save previous time
                 t = time.ticks_ms()
                 if c < 0x20 or c > 0x7E:

From a363ac6b216acaf046690ff85191113c95946d0d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 30 Sep 2022 17:42:31 +1000
Subject: [PATCH 109/343] micropython/mip: Add command-line functionality for
 the Unix port.

Moves mip.py to mip/__init__.py, so that the optional (added in this
commit) mip/__main__.py can exist to support:

`micropython -m mip install [--target,--index,--no-mpy] package@version`

"install" works by forwarding the arguments directly to mip.install.

Updates mip to v0.2.0 because of the change in directory structure.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/mip-cmdline/manifest.py         |  6 +++
 micropython/mip-cmdline/mip/__main__.py     | 46 +++++++++++++++++++++
 micropython/mip/manifest.py                 |  4 +-
 micropython/mip/{mip.py => mip/__init__.py} |  5 ++-
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 micropython/mip-cmdline/manifest.py
 create mode 100644 micropython/mip-cmdline/mip/__main__.py
 rename micropython/mip/{mip.py => mip/__init__.py} (97%)

diff --git a/micropython/mip-cmdline/manifest.py b/micropython/mip-cmdline/manifest.py
new file mode 100644
index 000000000..cf8e4b4f2
--- /dev/null
+++ b/micropython/mip-cmdline/manifest.py
@@ -0,0 +1,6 @@
+metadata(version="0.1.0", description="Optional support for running `micropython -m mip`")
+
+require("argparse")
+require("mip")
+
+package("mip")
diff --git a/micropython/mip-cmdline/mip/__main__.py b/micropython/mip-cmdline/mip/__main__.py
new file mode 100644
index 000000000..7732638b2
--- /dev/null
+++ b/micropython/mip-cmdline/mip/__main__.py
@@ -0,0 +1,46 @@
+# MicroPython package installer command line
+# MIT license; Copyright (c) 2022 Jim Mussared
+
+import argparse
+import sys
+
+
+def do_install():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-t",
+        "--target",
+        help="Directory to start discovery",
+    )
+    parser.add_argument(
+        "-i",
+        "--index",
+        help="Pattern to match test files",
+    )
+    parser.add_argument(
+        "--mpy",
+        action="store_true",
+        help="download as compiled .mpy files (default)",
+    )
+    parser.add_argument(
+        "--no-mpy",
+        action="store_true",
+        help="download as .py source files",
+    )
+    parser.add_argument("package", nargs="+")
+    args = parser.parse_args(args=sys.argv[2:])
+
+    from . import install
+
+    for package in args.package:
+        version = None
+        if "@" in package:
+            package, version = package.split("@")
+        install(package, args.index, args.target, version, not args.no_mpy)
+
+
+if len(sys.argv) >= 2:
+    if sys.argv[1] == "install":
+        do_install()
+    else:
+        print('mip: Unknown command "{}"'.format(sys.argv[1]))
diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
index e13ad7aef..4e85fe1ee 100644
--- a/micropython/mip/manifest.py
+++ b/micropython/mip/manifest.py
@@ -1,5 +1,5 @@
-metadata(version="0.1.0", description="On-device package installer for network-capable boards")
+metadata(version="0.2.0", description="On-device package installer for network-capable boards")
 
 require("urequests")
 
-module("mip.py")
+package("mip")
diff --git a/micropython/mip/mip.py b/micropython/mip/mip/__init__.py
similarity index 97%
rename from micropython/mip/mip.py
rename to micropython/mip/mip/__init__.py
index a019e4e98..0593e2e0f 100644
--- a/micropython/mip/mip.py
+++ b/micropython/mip/mip/__init__.py
@@ -153,7 +153,7 @@ def _install_package(package, index, target, version, mpy):
     return _install_json(package, index, target, version, mpy)
 
 
-def install(package, index=_PACKAGE_INDEX, target=None, version=None, mpy=True):
+def install(package, index=None, target=None, version=None, mpy=True):
     if not target:
         for p in sys.path:
             if p.endswith("/lib"):
@@ -163,6 +163,9 @@ def install(package, index=_PACKAGE_INDEX, target=None, version=None, mpy=True):
             print("Unable to find lib dir in sys.path")
             return
 
+    if not index:
+        index = _PACKAGE_INDEX
+
     if _install_package(package, index.rstrip("/"), target, version, mpy):
         print("Done")
     else:

From 143c2937defc29ff24ed6f34c27ea10bab9135e9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Oct 2022 16:04:57 +1100
Subject: [PATCH 110/343] mip: Set opt=3 by default.

mip will be installed by default on many boards. Make it small.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/mip/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
index 4e85fe1ee..f6d47e228 100644
--- a/micropython/mip/manifest.py
+++ b/micropython/mip/manifest.py
@@ -2,4 +2,4 @@
 
 require("urequests")
 
-package("mip")
+package("mip", opt=3)

From c26d77b52e3bfb82729787a5c30cca27a8cf9f99 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Oct 2022 16:12:22 +1100
Subject: [PATCH 111/343] venv: Add a command-line package for creating virtual
 environments.

Works like "python -m venv path" and creates a rudimentary virtual
environment for the Unix port:
 - sets MICROPYPATH
 - copies the micropython binary to venv/bin/micropython which is in $PATH
 - installs mip & mip-cmdline in the venv

Using the venv is the same as for CPython -- source the activate script to
enter, and call the deactivate function to leave.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/venv/manifest.py      |  9 +++
 python-stdlib/venv/venv/__main__.py | 99 +++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 python-stdlib/venv/manifest.py
 create mode 100644 python-stdlib/venv/venv/__main__.py

diff --git a/python-stdlib/venv/manifest.py b/python-stdlib/venv/manifest.py
new file mode 100644
index 000000000..9c36b312f
--- /dev/null
+++ b/python-stdlib/venv/manifest.py
@@ -0,0 +1,9 @@
+metadata(
+    version="0.1.0",
+    description="Support for creating MicroPython virtual environments using `micropython -m venv`",
+)
+
+require("argparse")
+require("mip-cmdline")
+
+package("venv")
diff --git a/python-stdlib/venv/venv/__main__.py b/python-stdlib/venv/venv/__main__.py
new file mode 100644
index 000000000..36ed41dff
--- /dev/null
+++ b/python-stdlib/venv/venv/__main__.py
@@ -0,0 +1,99 @@
+# Support for creating MicroPython virtual environments using `micropython -m venv`
+# MIT license; Copyright (c) 2022 Jim Mussared
+
+import argparse
+import os
+import sys
+
+
+# If mip is not frozen into this binary, then also install it in the venv.
+def install_mip(venv_lib_path):
+    need_mip = False
+    if "mip" in sys.modules:
+        del sys.modules["mip"]
+    saved_sys_path = sys.path[:]
+    try:
+        sys.path[:] = [".frozen"]
+        try:
+            import mip
+
+            print("mip is frozen")
+        except ImportError:
+            need_mip = True
+    finally:
+        sys.path[:] = saved_sys_path
+
+    if need_mip:
+        import mip
+
+        mip.install("mip-cmdline", target=venv_lib_path)
+
+
+def do_venv():
+    parser = argparse.ArgumentParser(description="Create a micropython virtual environment")
+    parser.add_argument("path", nargs=1, help="Path to create the virtual environment in")
+    args = parser.parse_args(args=sys.argv[1:])
+    venv_path = args.path[0]
+    print("Creating virtual environment in:", venv_path)
+
+    # Equivalent to path = os.abspath(path).
+    if not venv_path.startswith("/"):
+        venv_path = os.getcwd() + os.sep + venv_path
+
+    venv_bin_path = venv_path + os.sep + "bin"
+    venv_lib_path = venv_path + os.sep + "lib"
+
+    for d in (
+        venv_path,
+        venv_bin_path,
+        venv_lib_path,
+    ):
+        try:
+            os.mkdir(d)
+        except:
+            pass
+
+    # Note the venv/lib dir goes before .frozen so that installed packages replace frozen ones.
+    with open(venv_bin_path + os.sep + "activate", "w") as f:
+        print(
+            """# Usage: source bin/activate
+
+deactivate() {{
+    PATH="$_OLD_VIRTUAL_PATH"
+    export PATH
+
+    MICROPYPATH="$_OLD_VIRTUAL_MICROPYPATH"
+    if [ -z "$MICROPYPATH" ]; then
+        export -n MICROPYPATH
+    else
+        export MICROPYPATH
+    fi
+
+    unset VIRTUAL_ENV
+
+    unset deactivate
+}}
+
+VIRTUAL_ENV={}
+
+_OLD_VIRTUAL_PATH="$PATH"
+PATH="$VIRTUAL_ENV/bin:$PATH"
+export PATH
+
+_OLD_VIRTUAL_MICROPYPATH="$MICROPYPATH"
+MICROPYPATH="$VIRTUAL_ENV/lib:.frozen"
+export MICROPYPATH
+""".format(
+                venv_path
+            ),
+            file=f,
+        )
+
+    # Add a `micropython` binary in $PATH pointing to this binary.
+    if hasattr(sys, "executable"):
+        os.system("cp {} {}".format(sys.executable, venv_bin_path + os.sep + "micropython"))
+
+    install_mip(venv_lib_path)
+
+
+do_venv()

From a14226f7c52113f8bd310bed97aab8d824ed54bf Mon Sep 17 00:00:00 2001
From: Patrick Joy <patrick@joytech.com.au>
Date: Wed, 9 Nov 2022 13:51:03 +1100
Subject: [PATCH 112/343] shutil: Add disk_usage function.

Signed-off-by: Patrick Joy <patrick@joytech.com.au>
---
 python-stdlib/shutil/manifest.py |  2 +-
 python-stdlib/shutil/shutil.py   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/shutil/manifest.py b/python-stdlib/shutil/manifest.py
index 385d50ad5..d5d597f36 100644
--- a/python-stdlib/shutil/manifest.py
+++ b/python-stdlib/shutil/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.0.3")
+metadata(version="0.0.4")
 
 module("shutil.py")
diff --git a/python-stdlib/shutil/shutil.py b/python-stdlib/shutil/shutil.py
index 2a02a7cd8..e48411251 100644
--- a/python-stdlib/shutil/shutil.py
+++ b/python-stdlib/shutil/shutil.py
@@ -1,5 +1,8 @@
 # Reimplement, because CPython3.3 impl is rather bloated
 import os
+from collections import namedtuple
+
+_ntuple_diskusage = namedtuple("usage", ("total", "used", "free"))
 
 
 def rmtree(top):
@@ -27,3 +30,13 @@ def copyfileobj(src, dest, length=512):
             if not buf:
                 break
             dest.write(buf)
+
+
+def disk_usage(path):
+    bit_tuple = os.statvfs(path)
+    blksize = bit_tuple[0]  # system block size
+    total = bit_tuple[2] * blksize
+    free = bit_tuple[3] * blksize
+    used = total - free
+
+    return _ntuple_diskusage(total, used, free)

From 038b4ac6572d0d5b4c18148dc7d7fdc026369fa4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Oct 2022 17:10:19 +1100
Subject: [PATCH 113/343] unittest: Convert to a package.

This allows a much more natural way of implementing unitttest-discover:
 - unittest provides unittest/__init__.py
 - unittest-discover provides unittest/__main__.py

It also fixes an bug where unittest.py previously detected the presence of
unittest-discover.py by importing an checking for the ImportError. But that
could also be raised by a missing dependency. Now when you run
`micropython -m unittest` without unittest-discover, you get
`ImportError: no module named 'unittest.__main__'`, and without the
required deps, `ImportError: no module named 'argparse'`.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/unittest-discover/manifest.py          |  4 ++--
 .../{unittest_discover.py => unittest/__main__.py}   |  4 +++-
 python-stdlib/unittest/manifest.py                   |  4 ++--
 .../unittest/{unittest.py => unittest/__init__.py}   | 12 ------------
 4 files changed, 7 insertions(+), 17 deletions(-)
 rename python-stdlib/unittest-discover/{unittest_discover.py => unittest/__main__.py} (98%)
 rename python-stdlib/unittest/{unittest.py => unittest/__init__.py} (97%)

diff --git a/python-stdlib/unittest-discover/manifest.py b/python-stdlib/unittest-discover/manifest.py
index 28874c7ee..87bd94ae0 100644
--- a/python-stdlib/unittest-discover/manifest.py
+++ b/python-stdlib/unittest-discover/manifest.py
@@ -1,7 +1,7 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 
 require("argparse")
 require("fnmatch")
 require("unittest")
 
-module("unittest_discover.py")
+package("unittest")
diff --git a/python-stdlib/unittest-discover/unittest_discover.py b/python-stdlib/unittest-discover/unittest/__main__.py
similarity index 98%
rename from python-stdlib/unittest-discover/unittest_discover.py
rename to python-stdlib/unittest-discover/unittest/__main__.py
index b57ccf39b..e64c18c1b 100644
--- a/python-stdlib/unittest-discover/unittest_discover.py
+++ b/python-stdlib/unittest-discover/unittest/__main__.py
@@ -110,7 +110,6 @@ def _dirname_filename_no_ext(path):
     return dirname, filename.rsplit(".", 1)[0]
 
 
-# This is called from unittest when __name__ == "__main__".
 def discover_main():
     failures = 0
     runner = TestRunner()
@@ -138,3 +137,6 @@ def discover_main():
 
     # Terminate with non zero return code in case of failures.
     sys.exit(failures)
+
+
+discover_main()
diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
index 34c800754..4e32360da 100644
--- a/python-stdlib/unittest/manifest.py
+++ b/python-stdlib/unittest/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.10.0")
+metadata(version="0.10.1")
 
-module("unittest.py")
+package("unittest")
diff --git a/python-stdlib/unittest/unittest.py b/python-stdlib/unittest/unittest/__init__.py
similarity index 97%
rename from python-stdlib/unittest/unittest.py
rename to python-stdlib/unittest/unittest/__init__.py
index 8ecab0a2f..81b244ddc 100644
--- a/python-stdlib/unittest/unittest.py
+++ b/python-stdlib/unittest/unittest/__init__.py
@@ -460,15 +460,3 @@ def main(module="__main__", testRunner=None):
     suite = TestSuite(module.__name__)
     suite._load_module(module)
     return testRunner.run(suite)
-
-
-# Support `micropython -m unittest` (only useful if unitest-discover is
-# installed).
-if __name__ == "__main__":
-    try:
-        # If unitest-discover is installed, use the main() provided there.
-        from unittest_discover import discover_main
-
-        discover_main()
-    except ImportError:
-        pass

From 2b07820df3c9280865b9368f989bbfe7b2bc7aeb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 9 Nov 2022 07:20:36 +0100
Subject: [PATCH 114/343] dht: Fix regression importing dht_readinto from pyb.

sys.platform of Pyboard is "pyboard", not "pyb".
---
 micropython/drivers/sensor/dht/dht.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/micropython/drivers/sensor/dht/dht.py b/micropython/drivers/sensor/dht/dht.py
index 1ba2c59af..4624ae2ad 100644
--- a/micropython/drivers/sensor/dht/dht.py
+++ b/micropython/drivers/sensor/dht/dht.py
@@ -8,6 +8,8 @@
     from machine import dht_readinto
 elif sys.platform.startswith("esp"):
     from esp import dht_readinto
+elif sys.platform == "pyboard":
+    from pyb import dht_readinto
 else:
     dht_readinto = __import__(sys.platform).dht_readinto
 

From ee286ed28c24ad163783128a6238f5762cf9cd9b Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Tue, 8 Nov 2022 08:09:10 -0800
Subject: [PATCH 115/343] tempfile: Add initial tempfile implementation.

With TemporaryDirectory class and mkdtemp function.
---
 python-stdlib/tempfile/tempfile.py | 59 ++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 python-stdlib/tempfile/tempfile.py

diff --git a/python-stdlib/tempfile/tempfile.py b/python-stdlib/tempfile/tempfile.py
new file mode 100644
index 000000000..3d0a485c0
--- /dev/null
+++ b/python-stdlib/tempfile/tempfile.py
@@ -0,0 +1,59 @@
+import errno
+import os
+import random
+import shutil
+
+_ascii_letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+
+def _get_candidate_name(size=8):
+    return "".join(random.choice(_ascii_letters) for _ in range(size))
+
+
+def _sanitize_inputs(suffix, prefix, dir):
+    if dir is None:
+        dir = "/tmp"
+    if suffix is None:
+        suffix = ""
+    if prefix is None:
+        prefix = ""
+    return suffix, prefix, dir
+
+
+def _try(action, *args, **kwargs):
+    try:
+        action(*args, **kwargs)
+        return True
+    except OSError as e:
+        if e.errno != errno.EEXIST:
+            raise e
+    return False
+
+
+def mkdtemp(suffix=None, prefix=None, dir=None):
+    suffix, prefix, dir = _sanitize_inputs(suffix, prefix, dir)
+
+    _try(os.mkdir, dir)
+
+    while True:
+        name = _get_candidate_name()
+        file = os.path.join(dir, prefix + name + suffix)
+        if _try(os.mkdir, file):
+            return file
+
+
+class TemporaryDirectory:
+    def __init__(self, suffix=None, prefix=None, dir=None):
+        self.name = mkdtemp(suffix, prefix, dir)
+
+    def __repr__(self):
+        return "<{} {!r}>".format(self.__class__.__name__, self.name)
+
+    def __enter__(self):
+        return self.name
+
+    def __exit__(self, exc, value, tb):
+        self.cleanup()
+
+    def cleanup(self):
+        _try(shutil.rmtree, self.name)

From 4ae896afdcf94431bda031094becf805c6df6783 Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Thu, 10 Nov 2022 08:04:49 -0800
Subject: [PATCH 116/343] shutil: Fix shutil.rmtree to use os.ilistdir instead
 of os.walk.

---
 python-stdlib/shutil/shutil.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/python-stdlib/shutil/shutil.py b/python-stdlib/shutil/shutil.py
index e48411251..f8b580664 100644
--- a/python-stdlib/shutil/shutil.py
+++ b/python-stdlib/shutil/shutil.py
@@ -5,11 +5,14 @@
 _ntuple_diskusage = namedtuple("usage", ("total", "used", "free"))
 
 
-def rmtree(top):
-    for path, dirs, files in os.walk(top, False):
-        for f in files:
-            os.unlink(path + "/" + f)
-        os.rmdir(path)
+def rmtree(d):
+    for name, type, *_ in os.ilistdir(d):
+        path = d + "/" + name
+        if type & 0x4000:  # dir
+            rmtree(path)
+        else:  # file
+            os.unlink(path)
+    os.rmdir(d)
 
 
 def copyfileobj(src, dest, length=512):

From 69e8a502dd72a17c3c70542d07474f6e730ae26f Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Thu, 10 Nov 2022 08:17:26 -0800
Subject: [PATCH 117/343] shutil: Don't allow an empty string in rmtree.

---
 python-stdlib/shutil/manifest.py | 2 +-
 python-stdlib/shutil/shutil.py   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/shutil/manifest.py b/python-stdlib/shutil/manifest.py
index d5d597f36..966689e90 100644
--- a/python-stdlib/shutil/manifest.py
+++ b/python-stdlib/shutil/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.0.4")
+metadata(version="0.0.5")
 
 module("shutil.py")
diff --git a/python-stdlib/shutil/shutil.py b/python-stdlib/shutil/shutil.py
index f8b580664..9e72c8ea6 100644
--- a/python-stdlib/shutil/shutil.py
+++ b/python-stdlib/shutil/shutil.py
@@ -6,6 +6,9 @@
 
 
 def rmtree(d):
+    if not d:
+        raise ValueError
+
     for name, type, *_ in os.ilistdir(d):
         path = d + "/" + name
         if type & 0x4000:  # dir

From 8ce4adf8bf855c5603be5d45497eafb1fc8e4bf1 Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Thu, 10 Nov 2022 08:54:42 -0800
Subject: [PATCH 118/343] shutil: Add unit tests for shutil.

---
 python-stdlib/shutil/test_shutil.py | 56 +++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 python-stdlib/shutil/test_shutil.py

diff --git a/python-stdlib/shutil/test_shutil.py b/python-stdlib/shutil/test_shutil.py
new file mode 100644
index 000000000..d8b8632c5
--- /dev/null
+++ b/python-stdlib/shutil/test_shutil.py
@@ -0,0 +1,56 @@
+"""
+Don't use ``tempfile`` in these tests, as ``tempfile`` relies on ``shutil``.
+"""
+
+import os
+import shutil
+import unittest
+
+
+class TestRmtree(unittest.TestCase):
+    def test_dir_dne(self):
+        with self.assertRaises(OSError):
+            os.stat("foo")
+
+        with self.assertRaises(OSError):
+            shutil.rmtree("foo")
+
+    def test_file(self):
+        fn = "foo"
+        with open(fn, "w"):
+            pass
+
+        with self.assertRaises(OSError):
+            shutil.rmtree(fn)
+
+        os.remove(fn)
+
+    def test_empty_dir(self):
+        with self.assertRaises(OSError):
+            # If this triggers, a previous test didn't clean up.
+            # bit of a chicken/egg situation with ``tempfile``
+            os.stat("foo")
+
+        os.mkdir("foo")
+        shutil.rmtree("foo")
+
+        with self.assertRaises(OSError):
+            os.stat("foo")
+
+    def test_dir(self):
+        with self.assertRaises(OSError):
+            # If this triggers, a previous test didn't clean up.
+            # bit of a chicken/egg situation with ``tempfile``
+            os.stat("foo")
+
+        os.mkdir("foo")
+        os.mkdir("foo/bar")
+        with open("foo/bar/baz1.txt", "w"):
+            pass
+        with open("foo/bar/baz2.txt", "w"):
+            pass
+
+        shutil.rmtree("foo")
+
+        with self.assertRaises(OSError):
+            os.stat("foo")

From a99b80186d4ac55b78a380bd66708ba67df63712 Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Thu, 10 Nov 2022 09:15:24 -0800
Subject: [PATCH 119/343] tempfile: Add unit tests for tempfile, and don't use
 os.path.join.

---
 python-stdlib/tempfile/tempfile.py      |  2 +-
 python-stdlib/tempfile/test_tempfile.py | 50 +++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 python-stdlib/tempfile/test_tempfile.py

diff --git a/python-stdlib/tempfile/tempfile.py b/python-stdlib/tempfile/tempfile.py
index 3d0a485c0..87d889ef6 100644
--- a/python-stdlib/tempfile/tempfile.py
+++ b/python-stdlib/tempfile/tempfile.py
@@ -37,7 +37,7 @@ def mkdtemp(suffix=None, prefix=None, dir=None):
 
     while True:
         name = _get_candidate_name()
-        file = os.path.join(dir, prefix + name + suffix)
+        file = dir + "/" + prefix + name + suffix
         if _try(os.mkdir, file):
             return file
 
diff --git a/python-stdlib/tempfile/test_tempfile.py b/python-stdlib/tempfile/test_tempfile.py
new file mode 100644
index 000000000..f9499d187
--- /dev/null
+++ b/python-stdlib/tempfile/test_tempfile.py
@@ -0,0 +1,50 @@
+import os
+import tempfile
+import unittest
+
+
+class Base(unittest.TestCase):
+    def assertExists(self, fn):
+        os.stat(fn)
+
+    def assertNotExists(self, fn):
+        with self.assertRaises(OSError):
+            os.stat(fn)
+
+
+class TestMkdtemp(Base):
+    def test_no_args(self):
+        fn = tempfile.mkdtemp()
+        self.assertTrue(fn.startswith("/tmp"))
+        self.assertExists(fn)
+        os.rmdir(fn)
+
+    def test_prefix(self):
+        fn = tempfile.mkdtemp(prefix="foo")
+        self.assertTrue(fn.startswith("/tmp"))
+        self.assertTrue("foo" in fn)
+        self.assertFalse(fn.endswith("foo"))
+        self.assertExists(fn)
+        os.rmdir(fn)
+
+    def test_suffix(self):
+        fn = tempfile.mkdtemp(suffix="foo")
+        self.assertTrue(fn.startswith("/tmp"))
+        self.assertTrue(fn.endswith("foo"))
+        self.assertExists(fn)
+        os.rmdir(fn)
+
+    def test_dir(self):
+        fn = tempfile.mkdtemp(dir="tmp_micropython")
+        self.assertTrue(fn.startswith("tmp_micropython"))
+        self.assertExists(fn)
+        os.rmdir(fn)
+
+
+class TestTemporaryDirectory(Base):
+    def test_context_manager_no_args(self):
+        with tempfile.TemporaryDirectory() as fn:
+            self.assertTrue(isinstance(fn, str))
+            self.assertTrue(fn.startswith("/tmp"))
+            self.assertExists(fn)
+        self.assertNotExists(fn)

From 56dc65b6a7535858bf8067cdf0baa16f6cb72834 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Nov 2022 13:05:04 +1100
Subject: [PATCH 120/343] tempfile: Add manifest.py file at version 0.0.1.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/tempfile/manifest.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 python-stdlib/tempfile/manifest.py

diff --git a/python-stdlib/tempfile/manifest.py b/python-stdlib/tempfile/manifest.py
new file mode 100644
index 000000000..237789248
--- /dev/null
+++ b/python-stdlib/tempfile/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.1")
+
+module("tempfile.py")

From 6fca45f4f5e2e6b3f8ebf79943178431c83faae1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 14 Nov 2022 22:46:35 +1100
Subject: [PATCH 121/343] sdcard: Set MISO high before readblocks/writeblocks.

Originally by @peterhinch.
See https://github.com/micropython/micropython/pull/6007 for discussion.

The summary is that on some cards (especially older Kingston ones) if the
bus is shared with other SPI devices, then it seems to require that MISO
is high for a few cycles before the transaction is initiated.

Because CS is high, this change should otherwise be a no-op.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/storage/sdcard/sdcard.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/micropython/drivers/storage/sdcard/sdcard.py b/micropython/drivers/storage/sdcard/sdcard.py
index df28bd953..0c9f2d5fa 100644
--- a/micropython/drivers/storage/sdcard/sdcard.py
+++ b/micropython/drivers/storage/sdcard/sdcard.py
@@ -243,6 +243,10 @@ def write_token(self, token):
         self.spi.write(b"\xff")
 
     def readblocks(self, block_num, buf):
+        # workaround for shared bus, required for (at least) some Kingston
+        # devices, ensure MOSI is high before starting transaction
+        self.spi.write(b"\xff")
+
         nblocks = len(buf) // 512
         assert nblocks and not len(buf) % 512, "Buffer length is invalid"
         if nblocks == 1:
@@ -270,6 +274,10 @@ def readblocks(self, block_num, buf):
                 raise OSError(5)  # EIO
 
     def writeblocks(self, block_num, buf):
+        # workaround for shared bus, required for (at least) some Kingston
+        # devices, ensure MOSI is high before starting transaction
+        self.spi.write(b"\xff")
+
         nblocks, err = divmod(len(buf), 512)
         assert nblocks and not err, "Buffer length is invalid"
         if nblocks == 1:

From 4556023a0c351e90e2d070f068f848c6865a929f Mon Sep 17 00:00:00 2001
From: Fredrik Strupe <fredrik@strupe.net>
Date: Tue, 15 Nov 2022 12:14:07 +1100
Subject: [PATCH 122/343] sensor/mhz19: Add driver for MH-Z19 (CO2 sensor).

Originally by Fredrik Strupe, updated for micropython-lib.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/sensor/mhz19/manifest.py |  3 ++
 micropython/drivers/sensor/mhz19/mhz19.py    | 48 ++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 micropython/drivers/sensor/mhz19/manifest.py
 create mode 100644 micropython/drivers/sensor/mhz19/mhz19.py

diff --git a/micropython/drivers/sensor/mhz19/manifest.py b/micropython/drivers/sensor/mhz19/manifest.py
new file mode 100644
index 000000000..0647201bd
--- /dev/null
+++ b/micropython/drivers/sensor/mhz19/manifest.py
@@ -0,0 +1,3 @@
+metadata(description="Driver for MH-Z19 CO2 sensor.", version="0.1.0")
+
+module("mhz19.py", opt=3)
diff --git a/micropython/drivers/sensor/mhz19/mhz19.py b/micropython/drivers/sensor/mhz19/mhz19.py
new file mode 100644
index 000000000..40eff7ed2
--- /dev/null
+++ b/micropython/drivers/sensor/mhz19/mhz19.py
@@ -0,0 +1,48 @@
+# MH-Z19 CO2 sensor driver for MicroPython.
+# MIT license; Copyright (c) 2018 Fredrik Strupe
+
+import machine
+import utime
+
+
+class TimeoutError(Exception):
+    pass
+
+
+class MHZ19:
+    """MH-Z19 CO2 sensor driver"""
+
+    def __init__(self, pin, max_value=5000):
+        """
+        Args:
+            pin: the pin that the PWM pin on the MH-Z19 is connected to.
+            max_value: upper bound of measuring range. usually 2000 or 5000.
+        """
+        self.pin = pin
+        self.max_value = max_value
+
+    def _wait_on_condition(self, cond, timeout=5000):
+        start = utime.ticks_ms()
+        while not cond():
+            if utime.ticks_diff(utime.ticks_ms(), start) > timeout:
+                raise TimeoutError
+
+    def pwm_read(self):
+        """Read CO2 value via PWM pin.
+
+        Reading usually takes 1-2 seconds.
+
+        Returns:
+            CO2 value in ppm (parts per million), with an accuracy of
+            ±(50 + result * 0.05) ppm.
+        Raises:
+            TimeoutError: if the reading takes more than 5 seconds.
+        """
+        # Wait until a new cycle starts
+        self._wait_on_condition(lambda: self.pin.value() == 0)
+
+        # Measure high and low duration during cycle
+        t_h = machine.time_pulse_us(self.pin, 1, 1500000)
+        t_l = machine.time_pulse_us(self.pin, 0, 1500000)
+
+        return self.max_value * (t_h - 2000) / (t_h + t_l - 4000)

From d1aaec71743b0d617d51e0fbc563e40e46264e96 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peterhinch@users.noreply.github.com>
Date: Tue, 15 Nov 2022 12:50:04 +0000
Subject: [PATCH 123/343] nrf24l01: Improve test to add RP2 support, fix ESP32.

Use explicit pin numbers to instantiate the SPI interface on RP2.
On ESP32 use SoftSPI(...) rather than SPI(-1, ...).

Update terminology to initiator/responder.

Tested with two Pico boards.
---
 .../drivers/radio/nrf24l01/nrf24l01test.py    | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01test.py b/micropython/drivers/radio/nrf24l01/nrf24l01test.py
index 56bdb6e26..ad3e1f67a 100644
--- a/micropython/drivers/radio/nrf24l01/nrf24l01test.py
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01test.py
@@ -3,23 +3,29 @@
 import usys
 import ustruct as struct
 import utime
-from machine import Pin, SPI
+from machine import Pin, SPI, SoftSPI
 from nrf24l01 import NRF24L01
 from micropython import const
 
-# Slave pause between receiving data and checking for further packets.
+# Responder pause between receiving data and checking for further packets.
 _RX_POLL_DELAY = const(15)
-# Slave pauses an additional _SLAVE_SEND_DELAY ms after receiving data and before
-# transmitting to allow the (remote) master time to get into receive mode. The
-# master may be a slow device. Value tested with Pyboard, ESP32 and ESP8266.
-_SLAVE_SEND_DELAY = const(10)
+# Responder pauses an additional _RESPONER_SEND_DELAY ms after receiving data and before
+# transmitting to allow the (remote) initiator time to get into receive mode. The
+# initiator may be a slow device. Value tested with Pyboard, ESP32 and ESP8266.
+_RESPONDER_SEND_DELAY = const(10)
 
 if usys.platform == "pyboard":
-    cfg = {"spi": 2, "miso": "Y7", "mosi": "Y8", "sck": "Y6", "csn": "Y5", "ce": "Y4"}
+    spi = SPI(2)  # miso : Y7, mosi : Y8, sck : Y6
+    cfg = {"spi": spi, "csn": "Y5", "ce": "Y4"}
 elif usys.platform == "esp8266":  # Hardware SPI
-    cfg = {"spi": 1, "miso": 12, "mosi": 13, "sck": 14, "csn": 4, "ce": 5}
+    spi = SPI(1)  # miso : 12, mosi : 13, sck : 14
+    cfg = {"spi": spi, "csn": 4, "ce": 5}
 elif usys.platform == "esp32":  # Software SPI
-    cfg = {"spi": -1, "miso": 32, "mosi": 33, "sck": 25, "csn": 26, "ce": 27}
+    spi = SoftSPI(sck=Pin(25), mosi=Pin(33), miso=Pin(32))
+    cfg = {"spi": spi, "csn": 26, "ce": 27}
+elif usys.platform == "rp2":  # Hardware SPI with explicit pin definitions
+    spi = SPI(0, sck=Pin(2), mosi=Pin(3), miso=Pin(4))
+    cfg = {"spi": spi, "csn": 5, "ce": 6}
 else:
     raise ValueError("Unsupported platform {}".format(usys.platform))
 
@@ -28,14 +34,11 @@
 pipes = (b"\xe1\xf0\xf0\xf0\xf0", b"\xd2\xf0\xf0\xf0\xf0")
 
 
-def master():
+def initiator():
     csn = Pin(cfg["csn"], mode=Pin.OUT, value=1)
     ce = Pin(cfg["ce"], mode=Pin.OUT, value=0)
-    if cfg["spi"] == -1:
-        spi = SPI(-1, sck=Pin(cfg["sck"]), mosi=Pin(cfg["mosi"]), miso=Pin(cfg["miso"]))
-        nrf = NRF24L01(spi, csn, ce, payload_size=8)
-    else:
-        nrf = NRF24L01(SPI(cfg["spi"]), csn, ce, payload_size=8)
+    spi = cfg["spi"]
+    nrf = NRF24L01(spi, csn, ce, payload_size=8)
 
     nrf.open_tx_pipe(pipes[0])
     nrf.open_rx_pipe(1, pipes[1])
@@ -46,7 +49,7 @@ def master():
     num_failures = 0
     led_state = 0
 
-    print("NRF24L01 master mode, sending %d packets..." % num_needed)
+    print("NRF24L01 initiator mode, sending %d packets..." % num_needed)
 
     while num_successes < num_needed and num_failures < num_needed:
         # stop listening and send packet
@@ -90,23 +93,20 @@ def master():
         # delay then loop
         utime.sleep_ms(250)
 
-    print("master finished sending; successes=%d, failures=%d" % (num_successes, num_failures))
+    print("initiator finished sending; successes=%d, failures=%d" % (num_successes, num_failures))
 
 
-def slave():
+def responder():
     csn = Pin(cfg["csn"], mode=Pin.OUT, value=1)
     ce = Pin(cfg["ce"], mode=Pin.OUT, value=0)
-    if cfg["spi"] == -1:
-        spi = SPI(-1, sck=Pin(cfg["sck"]), mosi=Pin(cfg["mosi"]), miso=Pin(cfg["miso"]))
-        nrf = NRF24L01(spi, csn, ce, payload_size=8)
-    else:
-        nrf = NRF24L01(SPI(cfg["spi"]), csn, ce, payload_size=8)
+    spi = cfg["spi"]
+    nrf = NRF24L01(spi, csn, ce, payload_size=8)
 
     nrf.open_tx_pipe(pipes[1])
     nrf.open_rx_pipe(1, pipes[0])
     nrf.start_listening()
 
-    print("NRF24L01 slave mode, waiting for packets... (ctrl-C to stop)")
+    print("NRF24L01 responder mode, waiting for packets... (ctrl-C to stop)")
 
     while True:
         if nrf.any():
@@ -122,8 +122,8 @@ def slave():
                     led_state >>= 1
                 utime.sleep_ms(_RX_POLL_DELAY)
 
-            # Give master time to get into receive mode.
-            utime.sleep_ms(_SLAVE_SEND_DELAY)
+            # Give initiator time to get into receive mode.
+            utime.sleep_ms(_RESPONDER_SEND_DELAY)
             nrf.stop_listening()
             try:
                 nrf.send(struct.pack("i", millis))
@@ -144,7 +144,5 @@ def slave():
 print("NRF24L01 pinout for test:")
 print("    CE on", cfg["ce"])
 print("    CSN on", cfg["csn"])
-print("    SCK on", cfg["sck"])
-print("    MISO on", cfg["miso"])
-print("    MOSI on", cfg["mosi"])
-print("run nrf24l01test.slave() on slave, then nrf24l01test.master() on master")
+print("    SPI on", cfg["spi"])
+print("run nrf24l01test.responder() on responder, then nrf24l01test.initiator() on initiator")

From 0051a5ef50cdaf88975c2496ca32fd9b5f06050b Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Fri, 4 Nov 2022 19:49:20 -0700
Subject: [PATCH 124/343] pathlib: Add initial pathlib implementation.

This adds most of the common functionality of pathlib.Path.

The glob functionality could use some work; currently it only supports a
single "*" wildcard; however, this is the vast majority of common use-cases
and it won't fail silently if non-supported glob patterns are provided.
---
 python-stdlib/pathlib/manifest.py           |   3 +
 python-stdlib/pathlib/pathlib.py            | 207 +++++++++++++
 python-stdlib/pathlib/tests/test_pathlib.py | 324 ++++++++++++++++++++
 3 files changed, 534 insertions(+)
 create mode 100644 python-stdlib/pathlib/manifest.py
 create mode 100644 python-stdlib/pathlib/pathlib.py
 create mode 100644 python-stdlib/pathlib/tests/test_pathlib.py

diff --git a/python-stdlib/pathlib/manifest.py b/python-stdlib/pathlib/manifest.py
new file mode 100644
index 000000000..37dcaf634
--- /dev/null
+++ b/python-stdlib/pathlib/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.1")
+
+module("pathlib.py")
diff --git a/python-stdlib/pathlib/pathlib.py b/python-stdlib/pathlib/pathlib.py
new file mode 100644
index 000000000..d01d81d32
--- /dev/null
+++ b/python-stdlib/pathlib/pathlib.py
@@ -0,0 +1,207 @@
+import errno
+import os
+
+from micropython import const
+
+_SEP = const("/")
+
+
+def _mode_if_exists(path):
+    try:
+        return os.stat(path)[0]
+    except OSError as e:
+        if e.errno == errno.ENOENT:
+            return 0
+        raise e
+
+
+def _clean_segment(segment):
+    segment = str(segment)
+    if not segment:
+        return "."
+    segment = segment.rstrip(_SEP)
+    if not segment:
+        return _SEP
+    while True:
+        no_double = segment.replace(_SEP + _SEP, _SEP)
+        if no_double == segment:
+            break
+        segment = no_double
+    return segment
+
+
+class Path:
+    def __init__(self, *segments):
+        segments_cleaned = []
+        for segment in segments:
+            segment = _clean_segment(segment)
+            if segment[0] == _SEP:
+                segments_cleaned = [segment]
+            elif segment == ".":
+                continue
+            else:
+                segments_cleaned.append(segment)
+
+        self._path = _clean_segment(_SEP.join(segments_cleaned))
+
+    def __truediv__(self, other):
+        return Path(self._path, str(other))
+
+    def __repr__(self):
+        return f'{type(self).__name__}("{self._path}")'
+
+    def __str__(self):
+        return self._path
+
+    def __eq__(self, other):
+        return self.absolute() == Path(other).absolute()
+
+    def absolute(self):
+        path = self._path
+        cwd = os.getcwd()
+        if not path or path == ".":
+            return cwd
+        if path[0] == _SEP:
+            return path
+        return _SEP + path if cwd == _SEP else cwd + _SEP + path
+
+    def resolve(self):
+        return self.absolute()
+
+    def open(self, mode="r", encoding=None):
+        return open(self._path, mode, encoding=encoding)
+
+    def exists(self):
+        return bool(_mode_if_exists(self._path))
+
+    def mkdir(self, parents=False, exist_ok=False):
+        try:
+            os.mkdir(self._path)
+            return
+        except OSError as e:
+            if e.errno == errno.EEXIST and exist_ok:
+                return
+            elif e.errno == errno.ENOENT and parents:
+                pass  # handled below
+            else:
+                raise e
+
+        segments = self._path.split(_SEP)
+        progressive_path = ""
+        if segments[0] == "":
+            segments = segments[1:]
+            progressive_path = _SEP
+        for segment in segments:
+            progressive_path += _SEP + segment
+            try:
+                os.mkdir(progressive_path)
+            except OSError as e:
+                if e.errno != errno.EEXIST:
+                    raise e
+
+    def is_dir(self):
+        return bool(_mode_if_exists(self._path) & 0x4000)
+
+    def is_file(self):
+        return bool(_mode_if_exists(self._path) & 0x8000)
+
+    def _glob(self, path, pattern, recursive):
+        # Currently only supports a single "*" pattern.
+        n_wildcards = pattern.count("*")
+        n_single_wildcards = pattern.count("?")
+
+        if n_single_wildcards:
+            raise NotImplementedError("? single wildcards not implemented.")
+
+        if n_wildcards == 0:
+            raise ValueError
+        elif n_wildcards > 1:
+            raise NotImplementedError("Multiple * wildcards not implemented.")
+
+        prefix, suffix = pattern.split("*")
+
+        for name, mode, *_ in os.ilistdir(path):
+            full_path = path + _SEP + name
+            if name.startswith(prefix) and name.endswith(suffix):
+                yield full_path
+            if recursive and mode & 0x4000:  # is_dir
+                yield from self._glob(full_path, pattern, recursive=recursive)
+
+    def glob(self, pattern):
+        """Iterate over this subtree and yield all existing files (of any
+        kind, including directories) matching the given relative pattern.
+
+        Currently only supports a single "*" pattern.
+        """
+        return self._glob(self._path, pattern, recursive=False)
+
+    def rglob(self, pattern):
+        return self._glob(self._path, pattern, recursive=True)
+
+    def stat(self):
+        return os.stat(self._path)
+
+    def read_bytes(self):
+        with open(self._path, "rb") as f:
+            return f.read()
+
+    def read_text(self, encoding=None):
+        with open(self._path, "r", encoding=encoding) as f:
+            return f.read()
+
+    def rename(self, target):
+        os.rename(self._path, target)
+
+    def rmdir(self):
+        os.rmdir(self._path)
+
+    def touch(self, exist_ok=True):
+        if self.exists():
+            if exist_ok:
+                return  # TODO: should update timestamp
+            else:
+                # In lieue of FileExistsError
+                raise OSError(errno.EEXIST)
+        with open(self._path, "w"):
+            pass
+
+    def unlink(self, missing_ok=False):
+        try:
+            os.unlink(self._path)
+        except OSError as e:
+            if not (missing_ok and e.errno == errno.ENOENT):
+                raise e
+
+    def write_bytes(self, data):
+        with open(self._path, "wb") as f:
+            f.write(data)
+
+    def write_text(self, data, encoding=None):
+        with open(self._path, "w", encoding=encoding) as f:
+            f.write(data)
+
+    def with_suffix(self, suffix):
+        index = -len(self.suffix) or None
+        return Path(self._path[:index] + suffix)
+
+    @property
+    def stem(self):
+        return self.name.rsplit(".", 1)[0]
+
+    @property
+    def parent(self):
+        tokens = self._path.rsplit(_SEP, 1)
+        if len(tokens) == 2:
+            if not tokens[0]:
+                tokens[0] = _SEP
+            return Path(tokens[0])
+        return Path(".")
+
+    @property
+    def name(self):
+        return self._path.rsplit(_SEP, 1)[-1]
+
+    @property
+    def suffix(self):
+        elems = self._path.rsplit(".", 1)
+        return "" if len(elems) == 1 else "." + elems[1]
diff --git a/python-stdlib/pathlib/tests/test_pathlib.py b/python-stdlib/pathlib/tests/test_pathlib.py
new file mode 100644
index 000000000..c52cd9705
--- /dev/null
+++ b/python-stdlib/pathlib/tests/test_pathlib.py
@@ -0,0 +1,324 @@
+import os
+import unittest
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+
+def _isgenerator(x):
+    return isinstance(x, type((lambda: (yield))()))
+
+
+class TestPathlib(unittest.TestCase):
+    def assertExists(self, fn):
+        os.stat(fn)
+
+    def assertNotExists(self, fn):
+        with self.assertRaises(OSError):
+            os.stat(fn)
+
+    def setUp(self):
+        self._tmp_path_obj = TemporaryDirectory()
+        self.tmp_path = self._tmp_path_obj.name
+
+    def tearDown(self):
+        self._tmp_path_obj.cleanup()
+
+    def test_init_single_segment(self):
+        path = Path("foo")
+        self.assertTrue(path._path == "foo")
+
+        path = Path("foo/")
+        self.assertTrue(path._path == "foo")
+
+        path = Path("/foo")
+        self.assertTrue(path._path == "/foo")
+
+        path = Path("/////foo")
+        self.assertTrue(path._path == "/foo")
+
+        path = Path("")
+        self.assertTrue(path._path == ".")
+
+    def test_init_multiple_segment(self):
+        path = Path("foo", "bar")
+        self.assertTrue(path._path == "foo/bar")
+
+        path = Path("foo/", "bar")
+        self.assertTrue(path._path == "foo/bar")
+
+        path = Path("/foo", "bar")
+        self.assertTrue(path._path == "/foo/bar")
+
+        path = Path("/foo", "", "bar")
+        self.assertTrue(path._path == "/foo/bar")
+
+        path = Path("/foo/", "", "/bar/")
+        self.assertTrue(path._path == "/bar")
+
+        path = Path("", "")
+        self.assertTrue(path._path == ".")
+
+    def test_truediv_join_str(self):
+        actual = Path("foo") / "bar"
+        self.assertTrue(actual == Path("foo/bar"))
+
+    def test_truediv_join_path(self):
+        actual = Path("foo") / Path("bar")
+        self.assertTrue(actual == Path("foo/bar"))
+
+        actual = Path("foo") / Path("/bar")
+        self.assertTrue(actual == "/bar")
+
+    def test_eq_and_absolute(self):
+        self.assertTrue(Path("") == Path("."))
+        self.assertTrue(Path("foo") == Path(os.getcwd(), "foo"))
+        self.assertTrue(Path("foo") == "foo")
+        self.assertTrue(Path("foo") == os.getcwd() + "/foo")
+
+        self.assertTrue(Path("foo") != Path("bar"))
+        self.assertTrue(Path(".") != Path("/"))
+
+    def test_open(self):
+        fn = self.tmp_path + "/foo.txt"
+        path = Path(fn)
+
+        with open(fn, "w") as f:
+            f.write("file contents")
+
+        with path.open("r") as f:
+            actual = f.read()
+
+        self.assertTrue(actual == "file contents")
+
+    def test_exists(self):
+        fn = self.tmp_path + "/foo.txt"
+
+        path = Path(str(fn))
+        self.assertTrue(not path.exists())
+
+        with open(fn, "w"):
+            pass
+
+        self.assertTrue(path.exists())
+
+    def test_mkdir(self):
+        target = self.tmp_path + "/foo/bar/baz"
+        path = Path(target)
+
+        with self.assertRaises(OSError):
+            path.mkdir()
+
+        with self.assertRaises(OSError):
+            path.mkdir(exist_ok=True)
+
+        path.mkdir(parents=True)
+        self.assertExists(target)
+
+        with self.assertRaises(OSError):
+            path.mkdir(exist_ok=False)
+
+        path.mkdir(exist_ok=True)
+
+    def test_is_dir(self):
+        target = self.tmp_path
+        path = Path(target)
+        self.assertTrue(path.is_dir())
+
+        target = self.tmp_path + "/foo"
+        path = Path(target)
+        self.assertTrue(not path.is_dir())
+        os.mkdir(target)
+        self.assertTrue(path.is_dir())
+
+        target = self.tmp_path + "/bar.txt"
+        path = Path(target)
+        self.assertTrue(not path.is_dir())
+        with open(target, "w"):
+            pass
+        self.assertTrue(not path.is_dir())
+
+    def test_is_file(self):
+        target = self.tmp_path
+        path = Path(target)
+        self.assertTrue(not path.is_file())
+
+        target = self.tmp_path + "/bar.txt"
+        path = Path(target)
+        self.assertTrue(not path.is_file())
+        with open(target, "w"):
+            pass
+        self.assertTrue(path.is_file())
+
+    def test_glob(self):
+        foo_txt = self.tmp_path + "/foo.txt"
+        with open(foo_txt, "w"):
+            pass
+        bar_txt = self.tmp_path + "/bar.txt"
+        with open(bar_txt, "w"):
+            pass
+        baz_bin = self.tmp_path + "/baz.bin"
+        with open(baz_bin, "w"):
+            pass
+
+        path = Path(self.tmp_path)
+        glob_gen = path.glob("*.txt")
+        self.assertTrue(_isgenerator(glob_gen))
+
+        res = [str(x) for x in glob_gen]
+        self.assertTrue(len(res) == 2)
+        self.assertTrue(foo_txt in res)
+        self.assertTrue(bar_txt in res)
+
+    def test_rglob(self):
+        foo_txt = self.tmp_path + "/foo.txt"
+        with open(foo_txt, "w"):
+            pass
+        bar_txt = self.tmp_path + "/bar.txt"
+        with open(bar_txt, "w"):
+            pass
+        baz_bin = self.tmp_path + "/baz.bin"
+        with open(baz_bin, "w"):
+            pass
+
+        boop_folder = self.tmp_path + "/boop"
+        os.mkdir(boop_folder)
+        bap_txt = self.tmp_path + "/boop/bap.txt"
+        with open(bap_txt, "w"):
+            pass
+
+        path = Path(self.tmp_path)
+        glob_gen = path.rglob("*.txt")
+        self.assertTrue(_isgenerator(glob_gen))
+
+        res = [str(x) for x in glob_gen]
+        self.assertTrue(len(res) == 3)
+        self.assertTrue(foo_txt in res)
+        self.assertTrue(bar_txt in res)
+        self.assertTrue(bap_txt in res)
+
+    def test_stat(self):
+        expected = os.stat(self.tmp_path)
+        path = Path(self.tmp_path)
+        actual = path.stat()
+        self.assertTrue(expected == actual)
+
+    def test_rmdir(self):
+        target = self.tmp_path + "/foo"
+        path = Path(target)
+
+        with self.assertRaises(OSError):
+            # Doesn't exist
+            path.rmdir()
+
+        os.mkdir(target)
+        self.assertExists(target)
+        path.rmdir()
+        self.assertNotExists(target)
+
+        os.mkdir(target)
+        with open(target + "/bar.txt", "w"):
+            pass
+
+        with self.assertRaises(OSError):
+            # Cannot rmdir; contains file.
+            path.rmdir()
+
+    def test_touch(self):
+        target = self.tmp_path + "/foo.txt"
+
+        path = Path(target)
+        path.touch()
+        self.assertExists(target)
+
+        path.touch()  # touching existing file is fine
+        self.assertExists(target)
+
+        # Technically should be FileExistsError,
+        # but thats not builtin to micropython
+        with self.assertRaises(OSError):
+            path.touch(exist_ok=False)
+
+        path = Path(self.tmp_path + "/bar/baz.txt")
+        with self.assertRaises(OSError):
+            # Parent directory does not exist
+            path.touch()
+
+    def test_unlink(self):
+        target = self.tmp_path + "/foo.txt"
+
+        path = Path(target)
+        with self.assertRaises(OSError):
+            # File does not exist
+            path.unlink()
+
+        with open(target, "w"):
+            pass
+
+        self.assertExists(target)
+        path.unlink()
+        self.assertNotExists(target)
+
+        path = Path(self.tmp_path)
+        with self.assertRaises(OSError):
+            # File does not exist
+            path.unlink()
+
+    def test_write_bytes(self):
+        target = self.tmp_path + "/foo.bin"
+        path = Path(target)
+        path.write_bytes(b"test byte data")
+        with open(target, "rb") as f:
+            actual = f.read()
+        self.assertTrue(actual == b"test byte data")
+
+    def test_write_text(self):
+        target = self.tmp_path + "/foo.txt"
+        path = Path(target)
+        path.write_text("test string")
+        with open(target, "r") as f:
+            actual = f.read()
+        self.assertTrue(actual == "test string")
+
+    def test_read_bytes(self):
+        target = self.tmp_path + "/foo.bin"
+        with open(target, "wb") as f:
+            f.write(b"test byte data")
+
+        path = Path(target)
+        actual = path.read_bytes()
+        self.assertTrue(actual == b"test byte data")
+
+    def test_read_text(self):
+        target = self.tmp_path + "/foo.bin"
+        with open(target, "w") as f:
+            f.write("test string")
+
+        path = Path(target)
+        actual = path.read_text()
+        self.assertTrue(actual == "test string")
+
+    def test_stem(self):
+        self.assertTrue(Path("foo/test").stem == "test")
+        self.assertTrue(Path("foo/bar.bin").stem == "bar")
+        self.assertTrue(Path("").stem == "")
+
+    def test_name(self):
+        self.assertTrue(Path("foo/test").name == "test")
+        self.assertTrue(Path("foo/bar.bin").name == "bar.bin")
+
+    def test_parent(self):
+        self.assertTrue(Path("foo/test").parent == Path("foo"))
+        self.assertTrue(Path("foo/bar.bin").parent == Path("foo"))
+        self.assertTrue(Path("bar.bin").parent == Path("."))
+        self.assertTrue(Path(".").parent == Path("."))
+        self.assertTrue(Path("/").parent == Path("/"))
+
+    def test_suffix(self):
+        self.assertTrue(Path("foo/test").suffix == "")
+        self.assertTrue(Path("foo/bar.bin").suffix == ".bin")
+        self.assertTrue(Path("bar.txt").suffix == ".txt")
+
+    def test_with_suffix(self):
+        self.assertTrue(Path("foo/test").with_suffix(".tar") == Path("foo/test.tar"))
+        self.assertTrue(Path("foo/bar.bin").with_suffix(".txt") == Path("foo/bar.txt"))
+        self.assertTrue(Path("bar.txt").with_suffix("") == Path("bar"))

From d717b04cb32f6badb7de10667b0b9525c59ae087 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 16 Jul 2022 17:33:39 +0200
Subject: [PATCH 125/343] logging: Improve the logging module.

Add support for all format specifiers, support for `datefmt` using
(optional) strftime, and support for Stream and File handlers.

Ports/boards that need to use `FileHandlers` should enable
`MICROPY_PY_SYS_ATEXIT`, and enabled `MICROPY_PY_SYS_EXC_INFO` if using
`logging.exception()`.
---
 .../logging/examples/basic_example.py         |   3 +
 .../example_logging_1.py}                     |   0
 .../logging/examples/example_logging_2.py     |  47 ++++
 python-stdlib/logging/examples/root_logger.py |   7 +
 python-stdlib/logging/logging.py              | 228 +++++++++++++-----
 python-stdlib/logging/manifest.py             |   2 +-
 6 files changed, 229 insertions(+), 58 deletions(-)
 create mode 100644 python-stdlib/logging/examples/basic_example.py
 rename python-stdlib/logging/{example_logging.py => examples/example_logging_1.py} (100%)
 create mode 100644 python-stdlib/logging/examples/example_logging_2.py
 create mode 100644 python-stdlib/logging/examples/root_logger.py

diff --git a/python-stdlib/logging/examples/basic_example.py b/python-stdlib/logging/examples/basic_example.py
new file mode 100644
index 000000000..92dd9bb90
--- /dev/null
+++ b/python-stdlib/logging/examples/basic_example.py
@@ -0,0 +1,3 @@
+import logging
+
+logging.warning("test")
diff --git a/python-stdlib/logging/example_logging.py b/python-stdlib/logging/examples/example_logging_1.py
similarity index 100%
rename from python-stdlib/logging/example_logging.py
rename to python-stdlib/logging/examples/example_logging_1.py
diff --git a/python-stdlib/logging/examples/example_logging_2.py b/python-stdlib/logging/examples/example_logging_2.py
new file mode 100644
index 000000000..a349d13bf
--- /dev/null
+++ b/python-stdlib/logging/examples/example_logging_2.py
@@ -0,0 +1,47 @@
+import logging
+
+# Create logger
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
+
+# Create console handler and set level to debug
+stream_handler = logging.StreamHandler()
+stream_handler.setLevel(logging.DEBUG)
+
+# Create file handler and set level to error
+file_handler = logging.FileHandler("error.log", mode="w")
+file_handler.setLevel(logging.ERROR)
+
+# Create a formatter
+formatter = logging.Formatter("%(asctime)s.%(msecs)03d - %(name)s - %(levelname)s - %(message)s")
+
+# Add formatter to the handlers
+stream_handler.setFormatter(formatter)
+file_handler.setFormatter(formatter)
+
+# Add handlers to logger
+logger.addHandler(stream_handler)
+logger.addHandler(file_handler)
+
+# Log some messages
+logger.debug("debug message")
+logger.info("info message")
+logger.warning("warn message")
+logger.error("error message")
+logger.critical("critical message")
+logger.info("message %s %d", "arg", 5)
+logger.info("message %(foo)s %(bar)s", {"foo": 1, "bar": 20})
+
+try:
+    1 / 0
+except:
+    logger.error("Some trouble (%s)", "expected")
+
+# Custom handler example
+class MyHandler(logging.Handler):
+    def emit(self, record):
+        print("levelname=%(levelname)s name=%(name)s message=%(message)s" % record.__dict__)
+
+
+logging.getLogger().addHandler(MyHandler())
+logging.info("Test message7")
diff --git a/python-stdlib/logging/examples/root_logger.py b/python-stdlib/logging/examples/root_logger.py
new file mode 100644
index 000000000..47e7216d3
--- /dev/null
+++ b/python-stdlib/logging/examples/root_logger.py
@@ -0,0 +1,7 @@
+import logging, sys
+
+logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
+for handler in logging.getLogger().handlers:
+    handler.setFormatter(logging.Formatter("[%(levelname)s]:%(name)s:%(message)s"))
+logging.info("hello upy")
+logging.getLogger("child").info("hello 2")
diff --git a/python-stdlib/logging/logging.py b/python-stdlib/logging/logging.py
index 79bd61c71..ed2dadec7 100644
--- a/python-stdlib/logging/logging.py
+++ b/python-stdlib/logging/logging.py
@@ -1,4 +1,8 @@
 import sys
+import time
+
+if hasattr(time, "strftime"):
+    from time import strftime
 
 CRITICAL = 50
 ERROR = 40
@@ -8,46 +12,104 @@
 NOTSET = 0
 
 _level_dict = {
-    CRITICAL: "CRIT",
+    CRITICAL: "CRITICAL",
     ERROR: "ERROR",
-    WARNING: "WARN",
+    WARNING: "WARNING",
     INFO: "INFO",
     DEBUG: "DEBUG",
+    NOTSET: "NOTSET",
 }
 
+_loggers = {}
 _stream = sys.stderr
+_level = INFO
+_default_fmt = "%(levelname)s:%(name)s:%(message)s"
+_default_datefmt = "%Y-%m-%d %H:%M:%S"
 
 
 class LogRecord:
-    def __init__(self):
-        self.__dict__ = {}
-
-    def __getattr__(self, key):
-        return self.__dict__[key]
+    def set(self, name, level, message):
+        self.name = name
+        self.levelno = level
+        self.levelname = _level_dict[level]
+        self.message = message
+        self.ct = time.time()
+        self.msecs = int((self.ct - int(self.ct)) * 1000)
+        self.asctime = None
 
 
 class Handler:
-    def __init__(self):
-        pass
+    def __init__(self, level=NOTSET):
+        self.level = level
+        self.formatter = None
 
-    def setFormatter(self, fmtr):
+    def close(self):
         pass
 
+    def setLevel(self, level):
+        self.level = level
 
-class Logger:
+    def setFormatter(self, formatter):
+        self.formatter = formatter
 
-    level = NOTSET
-    handlers = []
-    record = LogRecord()
+    def format(self, record):
+        return self.formatter.format(record)
 
-    def __init__(self, name):
-        self.name = name
 
-    def _level_str(self, level):
-        l = _level_dict.get(level)
-        if l is not None:
-            return l
-        return "LVL%s" % level
+class StreamHandler(Handler):
+    def __init__(self, stream=None):
+        self.stream = _stream if stream is None else stream
+        self.terminator = "\n"
+
+    def close(self):
+        if hasattr(self.stream, "flush"):
+            self.stream.flush()
+
+    def emit(self, record):
+        if record.levelno >= self.level:
+            self.stream.write(self.format(record) + self.terminator)
+
+
+class FileHandler(StreamHandler):
+    def __init__(self, filename, mode="a", encoding="UTF-8"):
+        super().__init__(stream=open(filename, mode=mode, encoding=encoding))
+
+    def close(self):
+        super().close()
+        self.stream.close()
+
+
+class Formatter:
+    def __init__(self, fmt=None, datefmt=None):
+        self.fmt = _default_fmt if fmt is None else fmt
+        self.datefmt = _default_datefmt if datefmt is None else datefmt
+
+    def usesTime(self):
+        return "asctime" in self.fmt
+
+    def formatTime(self, datefmt, record):
+        if hasattr(time, "strftime"):
+            return strftime(datefmt, time.localtime(record.ct))
+        return None
+
+    def format(self, record):
+        if self.usesTime():
+            record.asctime = self.formatTime(self.datefmt, record)
+        return self.fmt % {
+            "name": record.name,
+            "message": record.message,
+            "msecs": record.msecs,
+            "asctime": record.asctime,
+            "levelname": record.levelname,
+        }
+
+
+class Logger:
+    def __init__(self, name, level=NOTSET):
+        self.name = name
+        self.level = level
+        self.handlers = []
+        self.record = LogRecord()
 
     def setLevel(self, level):
         self.level = level
@@ -57,19 +119,16 @@ def isEnabledFor(self, level):
 
     def log(self, level, msg, *args):
         if self.isEnabledFor(level):
-            levelname = self._level_str(level)
             if args:
+                if isinstance(args[0], dict):
+                    args = args[0]
                 msg = msg % args
-            if self.handlers:
-                d = self.record.__dict__
-                d["levelname"] = levelname
-                d["levelno"] = level
-                d["message"] = msg
-                d["name"] = self.name
-                for h in self.handlers:
-                    h.emit(self.record)
-            else:
-                print(levelname, ":", self.name, ":", msg, sep="", file=_stream)
+            self.record.set(self.name, level, msg)
+            handlers = self.handlers
+            if not handlers:
+                handlers = getLogger().handlers
+            for h in handlers:
+                h.emit(self.record)
 
     def debug(self, msg, *args):
         self.log(DEBUG, msg, *args)
@@ -86,43 +145,98 @@ def error(self, msg, *args):
     def critical(self, msg, *args):
         self.log(CRITICAL, msg, *args)
 
-    def exc(self, e, msg, *args):
+    def exception(self, msg, *args):
         self.log(ERROR, msg, *args)
-        sys.print_exception(e, _stream)
+        if hasattr(sys, "exc_info"):
+            sys.print_exception(sys.exc_info()[1], _stream)
 
-    def exception(self, msg, *args):
-        self.exc(sys.exc_info()[1], msg, *args)
+    def addHandler(self, handler):
+        self.handlers.append(handler)
 
-    def addHandler(self, hndlr):
-        self.handlers.append(hndlr)
+    def hasHandlers(self):
+        return len(self.handlers) > 0
 
 
-_level = INFO
-_loggers = {}
+def getLogger(name=None):
+    if name is None:
+        name = "root"
+    if name not in _loggers:
+        _loggers[name] = Logger(name)
+        if name == "root":
+            basicConfig()
+    return _loggers[name]
+
 
+def log(level, msg, *args):
+    getLogger().log(level, msg, *args)
 
-def getLogger(name="root"):
-    if name in _loggers:
-        return _loggers[name]
-    l = Logger(name)
-    _loggers[name] = l
-    return l
+
+def debug(msg, *args):
+    getLogger().debug(msg, *args)
 
 
 def info(msg, *args):
     getLogger().info(msg, *args)
 
 
-def debug(msg, *args):
-    getLogger().debug(msg, *args)
+def warning(msg, *args):
+    getLogger().warning(msg, *args)
+
+
+def error(msg, *args):
+    getLogger().error(msg, *args)
+
+
+def critical(msg, *args):
+    getLogger().critical(msg, *args)
+
+
+def exception(msg, *args):
+    getLogger().exception(msg, *args)
+
+
+def shutdown():
+    for k, logger in _loggers.items():
+        for h in logger.handlers:
+            h.close()
+        _loggers.pop(logger, None)
+
+
+def addLevelName(level, name):
+    _level_dict[level] = name
+
+
+def basicConfig(
+    filename=None,
+    filemode="a",
+    format=None,
+    datefmt=None,
+    level=WARNING,
+    stream=None,
+    encoding="UTF-8",
+    force=False,
+):
+    if "root" not in _loggers:
+        _loggers["root"] = Logger("root")
+
+    logger = _loggers["root"]
+
+    if force or not logger.handlers:
+        for h in logger.handlers:
+            h.close()
+        logger.handlers = []
+
+        if filename is None:
+            handler = StreamHandler(stream)
+        else:
+            handler = FileHandler(filename, filemode, encoding)
+
+        handler.setLevel(level)
+        handler.setFormatter(Formatter(format, datefmt))
+
+        logger.setLevel(level)
+        logger.addHandler(handler)
 
 
-def basicConfig(level=INFO, filename=None, stream=None, format=None):
-    global _level, _stream
-    _level = level
-    if stream:
-        _stream = stream
-    if filename is not None:
-        print("logging.basicConfig: filename arg is not supported")
-    if format is not None:
-        print("logging.basicConfig: format arg is not supported")
+if hasattr(sys, "atexit"):
+    sys.atexit(shutdown)
diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
index 176015096..735434a8e 100644
--- a/python-stdlib/logging/manifest.py
+++ b/python-stdlib/logging/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.3")
+metadata(version="0.4")
 
 module("logging.py")

From 8456a2aa68dbcf311f5557347e2387edfd6ec8da Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 14 Jul 2022 21:52:36 +0200
Subject: [PATCH 126/343] time: Add time module to provide strftime.

---
 python-stdlib/time/manifest.py |  3 ++
 python-stdlib/time/time.py     | 79 ++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 python-stdlib/time/manifest.py
 create mode 100644 python-stdlib/time/time.py

diff --git a/python-stdlib/time/manifest.py b/python-stdlib/time/manifest.py
new file mode 100644
index 000000000..052ed4a17
--- /dev/null
+++ b/python-stdlib/time/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("time.py")
diff --git a/python-stdlib/time/time.py b/python-stdlib/time/time.py
new file mode 100644
index 000000000..68f7d921d
--- /dev/null
+++ b/python-stdlib/time/time.py
@@ -0,0 +1,79 @@
+from utime import *
+from micropython import const
+
+_TS_YEAR = const(0)
+_TS_MON = const(1)
+_TS_MDAY = const(2)
+_TS_HOUR = const(3)
+_TS_MIN = const(4)
+_TS_SEC = const(5)
+_TS_WDAY = const(6)
+_TS_YDAY = const(7)
+_TS_ISDST = const(8)
+
+_WDAY = const(("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
+_MDAY = const(
+    (
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December",
+    )
+)
+
+
+def strftime(datefmt, ts):
+    from io import StringIO
+
+    fmtsp = False
+    ftime = StringIO()
+    for k in datefmt:
+        if fmtsp:
+            if k == "a":
+                ftime.write(_WDAY[ts[_TS_WDAY]][0:3])
+            elif k == "A":
+                ftime.write(_WDAY[ts[_TS_WDAY]])
+            elif k == "b":
+                ftime.write(_MDAY[ts[_TS_MON] - 1][0:3])
+            elif k == "B":
+                ftime.write(_MDAY[ts[_TS_MON] - 1])
+            elif k == "d":
+                ftime.write("%02d" % ts[_TS_MDAY])
+            elif k == "H":
+                ftime.write("%02d" % ts[_TS_HOUR])
+            elif k == "I":
+                ftime.write("%02d" % (ts[_TS_HOUR] % 12))
+            elif k == "j":
+                ftime.write("%03d" % ts[_TS_YDAY])
+            elif k == "m":
+                ftime.write("%02d" % ts[_TS_MON])
+            elif k == "M":
+                ftime.write("%02d" % ts[_TS_MIN])
+            elif k == "P":
+                ftime.write("AM" if ts[_TS_HOUR] < 12 else "PM")
+            elif k == "S":
+                ftime.write("%02d" % ts[_TS_SEC])
+            elif k == "w":
+                ftime.write(str(ts[_TS_WDAY]))
+            elif k == "y":
+                ftime.write("%02d" % (ts[_TS_YEAR] % 100))
+            elif k == "Y":
+                ftime.write(str(ts[_TS_YEAR]))
+            else:
+                ftime.write(k)
+            fmtsp = False
+        elif k == "%":
+            fmtsp = True
+        else:
+            ftime.write(k)
+    val = ftime.getvalue()
+    ftime.close()
+    return val

From 8d653e96db15344e59c9f057355c1eeffb957097 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Dec 2022 11:57:16 +1100
Subject: [PATCH 127/343] time: Add unit test for time.strftime.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/time/test_time.py | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 python-stdlib/time/test_time.py

diff --git a/python-stdlib/time/test_time.py b/python-stdlib/time/test_time.py
new file mode 100644
index 000000000..98dfcafdb
--- /dev/null
+++ b/python-stdlib/time/test_time.py
@@ -0,0 +1,42 @@
+import time
+import unittest
+
+DAYS = ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday")
+
+MONTHS = (
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December",
+)
+
+TIME_TUPLE = (2022, 12, 14, 0, 45, 17, 2, 348, 0)
+
+
+class TestStrftime(unittest.TestCase):
+    def test_not_formatting(self):
+        fmt = "a string with no formatting {}[]() 0123456789 !@#$^&*"
+        self.assertEqual(time.strftime(fmt, TIME_TUPLE), fmt)
+
+    def test_days(self):
+        for i, day in enumerate(DAYS):
+            t = (0, 0, 0, 0, 0, 0, i, 0, 0)
+            self.assertEqual(time.strftime("%a%A", t), day[:3] + day)
+
+    def test_months(self):
+        for i, month in enumerate(MONTHS):
+            t = (0, i + 1, 0, 0, 0, 0, 0, 0, 0)
+            self.assertEqual(time.strftime("%b%B", t), month[:3] + month)
+
+    def test_full(self):
+        fmt = "%Y-%m-%d %a %b %I:%M:%S %%%P%%"
+        expected = "2022-12-14 Wed Dec 00:45:17 %AM%"
+        self.assertEqual(time.strftime(fmt, TIME_TUPLE), expected)

From a9e52d085c37c7ad6a275e001dd7f2113a1e50e7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Nov 2022 22:59:16 +1100
Subject: [PATCH 128/343] top: Update top-level docs.

* Add instructions for how to use micropython-lib.
* Add a terminology guide and use consistent terminology
  (package/module/library).
* Improve code conventions and contributor guidelines.
* Misc readme updates.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 CODEOFCONDUCT.md        |   1 +
 CONTRIBUTING.md         |  72 ++++++++++++++++++-
 README.md               | 150 ++++++++++++++++++++++++++++++++++------
 micropython/README.md   |  14 ++--
 python-ecosys/README.md |  10 +++
 python-stdlib/README.md |  20 +++---
 unix-ffi/README.md      |  13 ++--
 7 files changed, 229 insertions(+), 51 deletions(-)
 create mode 100644 CODEOFCONDUCT.md
 create mode 100644 python-ecosys/README.md

diff --git a/CODEOFCONDUCT.md b/CODEOFCONDUCT.md
new file mode 100644
index 000000000..1401e5f5e
--- /dev/null
+++ b/CODEOFCONDUCT.md
@@ -0,0 +1 @@
+Please see the [MicroPython Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 919a69967..715477171 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,71 @@
-If you submit a pull request, please adhere to Contributor Guidelines:
+## Contributor's Guidelines & Code Conventions
 
-https://github.com/micropython/micropython-lib/wiki/ContributorGuidelines
+micropython-lib follows the same general conventions as the [main MicroPython
+repository](https://github.com/micropython/micropython). Please see
+[micropython/CONTRIBUTING.md](https://github.com/micropython/micropython/blob/master/CONTRIBUTING.md)
+and [micropython/CODECONVENTIONS.md](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
+
+### Raising issues
+
+Please include enough information for someone to reproduce the issue you are
+describing. This will typically include:
+
+* The version of MicroPython you are using (e.g. the firmware filename, git
+  hash, or version info printed by the startup message).
+* What board/device you are running MicroPython on.
+* Which package you have installed, how you installed it, and what version.
+  When installed via `mip`, all packages will have a `__version__`
+  attribute.
+* A simple code snippet that demonstrates the issue.
+
+If you have a how-to question or are looking for help with using MicroPython
+or packages from micropython-lib, please post at the
+[discussion forum](https://github.com/orgs/micropython/discussions) instead.
+
+### Pull requests
+
+The same rules for commit messages, signing-off commits, and commit structure
+apply as for the main MicroPython repository. All Python code is formatted
+using `black`. See [`tools/codeformat.py`](tools/codeformat.py) to apply
+`black` automatically before submitting a PR.
+
+There are some specific conventions and guidelines for micropython-lib:
+
+* The first line of the commit message should start with the name of the
+  package, followed by a short description of the commit. Package names are
+  globally unique in the micropython-lib directory structure.
+
+  For example: `shutil: Add disk_usage function.`
+
+* Although we encourage keeping the code short and minimal, please still use
+  comments in your code. Typically, packages will be installed via
+  `mip` and so they will be compiled to bytecode where comments will
+  _not_ contribute to the installed size.
+
+* All packages must include a `manifest.py`, including a `metadata()` line
+  with at least a description and a version.
+
+* Prefer to break larger packages up into smaller chunks, so that just the
+  required functionality can be installed. The way to do this is to have a
+  base package, e.g. `mypackage` containing `mypackage/__init__.py`, and then
+  an "extension" package, e.g. `mypackage-ext` containing additional files
+  e.g. `mypackage/ext.py`. See
+  [`collections-defaultdict`](python-stdlib/collections-defaultdict) as an
+  example.
+
+* If you think a package might be extended in this way in the future, prefer
+  to create a package directory with `package/__init__.py`, rather than a
+  single `module.py`.
+
+* Packages in the python-stdlib directory should be CPython compatible and
+  implement a subset of the CPython equivalent. Avoid adding
+  MicroPython-specific extensions. Please include a link to the corresponding
+  CPython docs in the PR.
+
+* Include tests (ideally using the `unittest` package) as `test_*.py`.
+  Otherwise, provide examples as `example_*.py`. When porting CPython
+  packages, prefer to use the existing tests rather than writing new ones
+  from scratch.
+
+* When porting an existing third-party package, please ensure that the source
+  license is compatible.
diff --git a/README.md b/README.md
index 2c78d125c..c47c0acf9 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,141 @@
-micropython-lib
-===============
+# micropython-lib
 
-This is a repository of libraries designed to be useful for writing
-MicroPython applications.
+This is a repository of packages designed to be useful for writing MicroPython
+applications.
 
-The libraries here fall into four categories corresponding to the four top-level directories:
+The packages here fall into categories corresponding to the four top-level
+directories:
 
- * **python-stdlib**: Compatible versions of modules from the [Python Standard Library](https://docs.python.org/3/library/). These should be drop-in replacements for the Python libraries, although many have reduced functionality or missing methods or classes (which may not be an issue for many most cases).
+* **python-stdlib**: Compatible versions of modules from [The Python Standard
+    Library](https://docs.python.org/3/library/). These should be drop-in
+    replacements for the corresponding Python modules, although many have
+    reduced functionality or missing methods or classes (which may not be an
+    issue for most cases).
 
- * **python-ecosys**: Compatible, but reduced-functionality versions of modules from the larger Python ecosystem, for example that might be found in the [Python Package Index](https://pypi.org/).
+ * **python-ecosys**: Compatible, but reduced-functionality versions of
+     packages from the wider Python ecosystem. For example, a package that
+     might be found in the [Python Package Index](https://pypi.org/).
 
-* **micropython**: MicroPython-specific modules that do not have equivalents in other Python environments. These are typically hardware drivers or highly-optimised alternative implementations of functionality available in other Python modules.
+ * **micropython**: MicroPython-specific packages that do not have equivalents
+     in other Python environments. This includes drivers for hardware
+     (e.g. sensors, peripherals, or displays), libraries to work with
+     embedded functionality (e.g. bluetooth), or MicroPython-specific
+     packages that do not have equivalents in CPython.
 
- * **unix-ffi**: These modules are specifically for the MicroPython Unix port and provide access to operating-system and third-party libraries via FFI.
+* **unix-ffi**: These packages are specifically for the MicroPython Unix port
+    and provide access to operating-system and third-party libraries via FFI,
+    or functionality that is not useful for non-Unix ports.
 
-Usage
------
+## Usage
 
-Many libraries are self contained modules, and you can quickly get started by
-copying the relevant Python file to your device. For example, to add the
-`base64` library, you can directly copy `python-stdlib/base64/base64.py` to the `lib`
-directory on your device.
+To install a micropython-lib package, there are four main options. For more
+information see the [Package management documentation](https://docs.micropython.org/en/latest/reference/packages.html)
+documentation.
 
-Other libraries are packages, in which case you'll need to copy the directory instead. For example, to add `collections.defaultdict`, copy `collections/collections/__init__.py` and `collections.defaultdict/collections/defaultdict.py` to a directory named `lib/collections` on your device.
+### On a network-enabled device
 
-Future plans (and new contributor ideas)
-----------------------------------------
+As of MicroPython v1.20 (and nightly builds since October 2022), boards
+with WiFi and Ethernet support include the `mip` package manager.
+
+```py
+>>> import mip
+>>> mip.install("package-name")
+```
+
+### Using `mpremote` from your PC
+
+`mpremote` is the officially-supported tool for interacting with a MicroPython
+device and, since v0.4.0, support for installing micropython-lib packages is
+provided by using the `mip` command.
+
+```bash
+$ mpremote connect /dev/ttyUSB0 mip install package-name
+```
+
+See the [mpremote documentation](https://docs.micropython.org/en/latest/reference/mpremote.html).
+
+### Freeze into your firmware
+
+If you are building your own firmware, all packages in this repository include
+a `manifest.py` that can be included into your board manifest via the
+`require()` command. See [Manifest files](https://docs.micropython.org/en/latest/reference/manifest.html#require) for
+more information.
+
+### Copy the files manually
+
+Many micropython-lib packages are just single-file modules, and you can
+quickly get started by copying the relevant Python file to your device. For
+example, to add the `base64` library, you can directly copy
+`python-stdlib/base64/base64.py` to the `lib` directory on your device.
+
+This can be done using `mpremote`, for example:
+
+```bash
+$ mpremote connect /dev/ttyUSB0 cp python-stdlib/base64/base64.py :/lib
+```
+
+For packages that are implemented as a package directory, you'll need to copy
+the directory instead. For example, to add `collections.defaultdict`, copy
+`collections/collections/__init__.py` and
+`collections-defaultdict/collections/defaultdict.py` to a directory named
+`lib/collections` on your device.
+
+Note that unlike the other three approaches based on `mip` or `manifest.py`,
+you will need to manually resolve dependencies. You can inspect the relevant
+`manifest.py` file to view the list of dependencies for a given package.
+
+## Contributing
+
+We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)
+as our forum, and [Discord](https://micropython.org/discord) for chat. These
+are great places to ask questions and advice from the community or to discuss your
+MicroPython-based projects.
+
+The [MicroPython Wiki](https://github.com/micropython/micropython/wiki) is
+also used for micropython-lib.
+
+For bugs and feature requests, please [raise an issue](https://github.com/micropython/micropython-lib/issues/new).
+
+We welcome pull requests to add new packages, fix bugs, or add features.
+Please be sure to follow the
+[Contributor's Guidelines & Code Conventions](CONTRIBUTING.md). Note that
+MicroPython is licensed under the [MIT license](LICENSE) and all contributions
+should follow this license.
+
+### Future plans (and new contributor ideas)
+
+* Develop a set of example programs using these packages.
+* Develop more MicroPython packages for common tasks.
+* Expand unit testing coverage.
+* Add support for referencing remote/third-party repositories.
+
+## Notes on terminology
+
+The terms *library*, *package*, and *module* are overloaded and lead to some
+confusion. The interpretation used in by the MicroPython project is that:
+
+A *library* is a collection of installable packages, e.g. [The Python Standard
+  Library](https://docs.python.org/3/library/), or micropython-lib.
+
+A *package* can refer to two things. The first meaning, "library package", is
+something that can be installed from a library, e.g. via `mip` (or `pip` in
+CPython/PyPI). Packages provide *modules* that can be imported. The ambiguity
+here is that the module provided by the package does not necessarily have to
+have the same name, e.g. the `pyjwt` package provides the `jwt` module. In
+CPython, the `pyserial` package providing the `serial` module is another
+common example.
+
+A *module* is something that can be imported. For example, "the *os* module".
+
+A module can be implemented either as a single file, typically also called
+a *module* or "single-file module", or as a *package* (the second meaning),
+which in this context means a directory containing multiple `.py` files
+(usually at least an `__init__.py`).
+
+In micropython-lib, we also have the concept of an *extension package* which
+is a library package that extends the functionality of another package, by
+adding additional files to the same package directory. These packages have
+hyphenated names. For example, the `collections-defaultdict` package extends
+the `collections` package to add the `defaultdict` class to the `collections`
+module.
 
-* Develop a set of example programs using these libraries.
-* Develop more MicroPython libraries for common tasks.
diff --git a/micropython/README.md b/micropython/README.md
index 2df5de466..488bd50a0 100644
--- a/micropython/README.md
+++ b/micropython/README.md
@@ -1,13 +1,9 @@
-MicroPython-specific libraries
-==============================
+## MicroPython-specific packages
 
-These are libraries that have been written specifically for use on MicroPython.
+These are packages that have been written specifically for use on MicroPython.
 
-In some cases, the libraries are inspired by or based on equivalent CPython standard libraries, but compatibility varies. The libraries are often named with a "u" prefix.
+Packages in this directory should not have the same name as modules from the Python Standard Library.
 
-Other libraries have been written specifically for MicroPython use cases.
+### Future plans
 
-Future plans
-------------
-
-* More organised directory structure based on library purpose (e.g. drivers, network, etc).
+* More organised directory structure based on purpose (e.g. drivers, network, etc).
diff --git a/python-ecosys/README.md b/python-ecosys/README.md
new file mode 100644
index 000000000..9ba6d720d
--- /dev/null
+++ b/python-ecosys/README.md
@@ -0,0 +1,10 @@
+## Python-ecosystem packages
+
+These MicroPython versions of common Python packages, typically found on PyPI.
+
+If a package has the same name as a PyPI package, then it should match at
+least some subset of the functionality.
+
+### Future plans
+
+* More organised directory structure based on library purpose (e.g. drivers, network, etc).
diff --git a/python-stdlib/README.md b/python-stdlib/README.md
index 604e66fea..564776313 100644
--- a/python-stdlib/README.md
+++ b/python-stdlib/README.md
@@ -1,22 +1,18 @@
-CPython standard libraries
-==========================
+## CPython Standard Library
 
-The libraries in this directory aim to provide compatible implementations of
-standard libraries to allow existing Python code to run un-modified on
-MicroPython.
+The packages in this directory aim to provide compatible implementations of
+modules from the Python Standard Library, with the goal of allowing existing
+Python code to run un-modified on MicroPython.
 
-Implementation
---------------
+### Implementation
 
-Many libraries are implemented in pure Python, often based on the original
+Many packages are implemented in pure Python, often based on the original
 CPython implementation. (e.g. `collections.defaultdict`)
 
-Some libraries are based on or extend from the built-in "micro" modules in the
+Some packages are based on or extend from the built-in "micro" modules in the
 MicroPython firmware, providing additional functionality that didn't need to
 be written in C (e.g. `collections`, `socket`, `struct`).
 
-
-Future plans (ideas for contributors):
---------------------------------------
+### Future plans (ideas for contributors):
 
 * Add README.md to each library explaining compatibility and limitations.
diff --git a/unix-ffi/README.md b/unix-ffi/README.md
index d821dda4f..d6b9417d8 100644
--- a/unix-ffi/README.md
+++ b/unix-ffi/README.md
@@ -1,16 +1,14 @@
-Unix-specific libraries
-=======================
+## Unix-specific packages
 
-These are libraries that will only run on the Unix port of MicroPython, or are
+These are packages that will only run on the Unix port of MicroPython, or are
 too big to be used on microcontrollers. There is some limited support for the
 Windows port too.
 
 **Note:** This directory is unmaintained.
 
-Background
-----------
+### Background
 
-The libraries in this directory provide additional CPython compatibility using
+The packages in this directory provide additional CPython compatibility using
 the host operating system's native libraries.
 
 This is implemented either by accessing the libraries directly via libffi, or
@@ -19,8 +17,7 @@ by using built-in modules that are only available on the Unix port.
 In theory, this allows you to use MicroPython as a more complete drop-in
 replacement for CPython.
 
-Usage
------
+### Usage
 
 To use a unix-specific library, pass `unix_ffi=True` to `require()` in your
 manifest file.

From 58bab0add3c730842d39cdfcd6ff5a73ebba15d3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 19 Dec 2022 21:55:54 +1100
Subject: [PATCH 129/343] logging: Fall back to root logger level for unset
 child.

Previously a child logger just uses the global default when unset.
Modified to matches the CPython behavior of using the parent's level.

Also implemented CPython's getEffectiveLevel() which provides a convenient
way to implement this. In our version, we only ever have one parent
(the root), so it only has to recurse one level.

Also set the default level to WARNING to match CPython.

Updated the examples to highlight the differences (but they now match).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../logging/examples/basic_example.py         |  6 ++++-
 python-stdlib/logging/examples/root_logger.py |  1 +
 python-stdlib/logging/logging.py              | 22 ++++++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/python-stdlib/logging/examples/basic_example.py b/python-stdlib/logging/examples/basic_example.py
index 92dd9bb90..002bc3726 100644
--- a/python-stdlib/logging/examples/basic_example.py
+++ b/python-stdlib/logging/examples/basic_example.py
@@ -1,3 +1,7 @@
 import logging
 
-logging.warning("test")
+logging.debug("test - debug")  # ignored by default
+logging.info("test - info")  # ignored by default
+logging.warning("test - warning")
+logging.error("test - error")
+logging.critical("test - critical")
diff --git a/python-stdlib/logging/examples/root_logger.py b/python-stdlib/logging/examples/root_logger.py
index 47e7216d3..6e118ce39 100644
--- a/python-stdlib/logging/examples/root_logger.py
+++ b/python-stdlib/logging/examples/root_logger.py
@@ -5,3 +5,4 @@
     handler.setFormatter(logging.Formatter("[%(levelname)s]:%(name)s:%(message)s"))
 logging.info("hello upy")
 logging.getLogger("child").info("hello 2")
+logging.getLogger("child").debug("hello 2")
diff --git a/python-stdlib/logging/logging.py b/python-stdlib/logging/logging.py
index ed2dadec7..7ea1c4ce0 100644
--- a/python-stdlib/logging/logging.py
+++ b/python-stdlib/logging/logging.py
@@ -1,15 +1,19 @@
+from micropython import const
+
 import sys
 import time
 
 if hasattr(time, "strftime"):
     from time import strftime
 
-CRITICAL = 50
-ERROR = 40
-WARNING = 30
-INFO = 20
-DEBUG = 10
-NOTSET = 0
+CRITICAL = const(50)
+ERROR = const(40)
+WARNING = const(30)
+INFO = const(20)
+DEBUG = const(10)
+NOTSET = const(0)
+
+_DEFAULT_LEVEL = const(WARNING)
 
 _level_dict = {
     CRITICAL: "CRITICAL",
@@ -22,7 +26,6 @@
 
 _loggers = {}
 _stream = sys.stderr
-_level = INFO
 _default_fmt = "%(levelname)s:%(name)s:%(message)s"
 _default_datefmt = "%Y-%m-%d %H:%M:%S"
 
@@ -115,7 +118,10 @@ def setLevel(self, level):
         self.level = level
 
     def isEnabledFor(self, level):
-        return level >= (self.level or _level)
+        return level >= self.getEffectiveLevel()
+
+    def getEffectiveLevel(self):
+        return self.level or getLogger().level or _DEFAULT_LEVEL
 
     def log(self, level, msg, *args):
         if self.isEnabledFor(level):

From 8a7eb400097304fd3f6335e4d8b82324e15cf8f5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Dec 2022 12:08:43 +1100
Subject: [PATCH 130/343] logging: Simplify check for strftime.

Only needs to be checked at the call site.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/logging/logging.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/python-stdlib/logging/logging.py b/python-stdlib/logging/logging.py
index 7ea1c4ce0..1a5668476 100644
--- a/python-stdlib/logging/logging.py
+++ b/python-stdlib/logging/logging.py
@@ -3,9 +3,6 @@
 import sys
 import time
 
-if hasattr(time, "strftime"):
-    from time import strftime
-
 CRITICAL = const(50)
 ERROR = const(40)
 WARNING = const(30)
@@ -92,7 +89,7 @@ def usesTime(self):
 
     def formatTime(self, datefmt, record):
         if hasattr(time, "strftime"):
-            return strftime(datefmt, time.localtime(record.ct))
+            return time.strftime(datefmt, time.localtime(record.ct))
         return None
 
     def format(self, record):

From 423f5fa2c29618ded616912b2de0157f2ade6e54 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Dec 2022 14:55:56 +1100
Subject: [PATCH 131/343] logging: Bump version to 0.5.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/logging/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
index 735434a8e..68fc2db09 100644
--- a/python-stdlib/logging/manifest.py
+++ b/python-stdlib/logging/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.4")
+metadata(version="0.5")
 
 module("logging.py")

From a5ef231e7d854bab0e6db95f1676173e2281ee3b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Jan 2023 14:35:38 +1100
Subject: [PATCH 132/343] aioble/README.md: Demostrate optional args to
 aioble.scan().

Adds missing "duration_ms" argument to the example, and a second example
that shows the "interval_us" / "window_us" and also active scan.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/README.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/micropython/bluetooth/aioble/README.md b/micropython/bluetooth/aioble/README.md
index a60eea760..6b6b204f6 100644
--- a/micropython/bluetooth/aioble/README.md
+++ b/micropython/bluetooth/aioble/README.md
@@ -70,13 +70,21 @@ Alternatively, install the `aioble` package, which will install everything.
 Usage
 -----
 
-Scan for nearby devices: (Observer)
+Passive scan for nearby devices for 5 seconds: (Observer)
 
 ```py
-async with aioble.scan() as scanner:
+async with aioble.scan(duration_ms=5000) as scanner:
     async for result in scanner:
-        if result.name():
-            print(result, result.name(), result.rssi, result.services())
+        print(result, result.name(), result.rssi, result.services())
+```
+
+Active scan (includes "scan response" data) for nearby devices for 5 seconds
+with the highest duty cycle: (Observer)
+
+```py
+async with aioble.scan(duration_ms=5000, interval_us=30000, window_us=30000, active=True) as scanner:
+    async for result in scanner:
+        print(result, result.name(), result.rssi, result.services())
 ```
 
 Connect to a peripheral device: (Central)

From 863a018b892f0bf901fa09844aa3428d5a5a00c1 Mon Sep 17 00:00:00 2001
From: Andrzej Kowalczyk <x0@06f65b198d.me>
Date: Sat, 28 Jan 2023 17:28:56 +0100
Subject: [PATCH 133/343] unittest: Remove dependence on sys.exc_info.

This is not included by default in most builds, and isn't necessary for
this module anyway.

Also fix the local variable shadowing the traceback module in _capture_exc.

Added test for both (works on CPython and MicroPython).

Version bump to 0.10.2.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/unittest/manifest.py             |  2 +-
 python-stdlib/unittest/tests/test_exception.py | 13 +++++++++++++
 python-stdlib/unittest/unittest/__init__.py    |  6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 python-stdlib/unittest/tests/test_exception.py

diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
index 4e32360da..8e419b63c 100644
--- a/python-stdlib/unittest/manifest.py
+++ b/python-stdlib/unittest/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.10.1")
+metadata(version="0.10.2")
 
 package("unittest")
diff --git a/python-stdlib/unittest/tests/test_exception.py b/python-stdlib/unittest/tests/test_exception.py
new file mode 100644
index 000000000..470ffdcc2
--- /dev/null
+++ b/python-stdlib/unittest/tests/test_exception.py
@@ -0,0 +1,13 @@
+import unittest
+
+
+def broken_func():
+    raise ValueError("uh oh!")
+
+
+def test_func():
+    broken_func()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/python-stdlib/unittest/unittest/__init__.py b/python-stdlib/unittest/unittest/__init__.py
index 81b244ddc..ac24e7535 100644
--- a/python-stdlib/unittest/unittest/__init__.py
+++ b/python-stdlib/unittest/unittest/__init__.py
@@ -332,12 +332,12 @@ def __add__(self, other):
         return self
 
 
-def _capture_exc(exc, traceback):
+def _capture_exc(exc, exc_traceback):
     buf = io.StringIO()
     if hasattr(sys, "print_exception"):
         sys.print_exception(exc, buf)
     elif traceback is not None:
-        traceback.print_exception(None, exc, traceback, file=buf)
+        traceback.print_exception(None, exc, exc_traceback, file=buf)
     return buf.getvalue()
 
 
@@ -402,7 +402,7 @@ def run_one(test_function):
             test_result.skipped.append((name, c, reason))
         except Exception as ex:
             _handle_test_exception(
-                current_test=(name, c), test_result=test_result, exc_info=sys.exc_info()
+                current_test=(name, c), test_result=test_result, exc_info=(type(ex), ex, None)
             )
             # Uncomment to investigate failure in detail
             # raise

From c1f553eab9fd740dcea4adfe404dc24584ef2ab0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 27 Jan 2023 13:53:57 +1100
Subject: [PATCH 134/343] micropython/bundles: Add a bundle-networking
 meta-package.

This is designed to be a common set of packages that all deployments with
networking support should include.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bundles/README.md                     | 7 +++++++
 micropython/bundles/bundle-networking/manifest.py | 9 +++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 micropython/bundles/README.md
 create mode 100644 micropython/bundles/bundle-networking/manifest.py

diff --git a/micropython/bundles/README.md b/micropython/bundles/README.md
new file mode 100644
index 000000000..c4b3d19b0
--- /dev/null
+++ b/micropython/bundles/README.md
@@ -0,0 +1,7 @@
+These are "meta packages" designed to make it easy to provide defined
+bundles of related packages.
+
+For example, all deployments of MicroPython with networking support
+(WiFi/Ethernet) should add `require("bundle-networking")` to their
+`manifest.py` to ensure that the the standard set of networking packages
+(including HTTP requests, WebREPL, NTP, package management) are included.
diff --git a/micropython/bundles/bundle-networking/manifest.py b/micropython/bundles/bundle-networking/manifest.py
new file mode 100644
index 000000000..049d2f64b
--- /dev/null
+++ b/micropython/bundles/bundle-networking/manifest.py
@@ -0,0 +1,9 @@
+metadata(
+    version="0.1.0",
+    metadata="Common networking packages for all network-capable deployments of MicroPython.",
+)
+
+require("mip")
+require("ntptime")
+require("urequests")
+require("webrepl")

From 212cb7790f9a649c102cd354e796b78661e67e26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Feb 2023 12:02:46 +1100
Subject: [PATCH 135/343] urllib.parse: Fix require of collections-defaultdict.

Signed-off-by: Damien George <damien@micropython.org>
---
 unix-ffi/urllib.parse/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix-ffi/urllib.parse/manifest.py b/unix-ffi/urllib.parse/manifest.py
index ad213bf06..7023883f4 100644
--- a/unix-ffi/urllib.parse/manifest.py
+++ b/unix-ffi/urllib.parse/manifest.py
@@ -2,6 +2,6 @@
 
 require("re", unix_ffi=True)
 require("collections")
-require("collections.defaultdict")
+require("collections-defaultdict")
 
 package("urllib")

From 2cd63d6cf4c6e34c3ae1a5b8cf50e29b64c01f79 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Feb 2023 12:05:20 +1100
Subject: [PATCH 136/343] glob: Fix require of os-path.

Signed-off-by: Damien George <damien@micropython.org>
---
 unix-ffi/glob/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix-ffi/glob/manifest.py b/unix-ffi/glob/manifest.py
index 0d0a25d3d..622289bca 100644
--- a/unix-ffi/glob/manifest.py
+++ b/unix-ffi/glob/manifest.py
@@ -1,7 +1,7 @@
 metadata(version="0.5.2")
 
 require("os", unix_ffi=True)
-require("os.path")
+require("os-path")
 require("re", unix_ffi=True)
 require("fnmatch")
 

From e3059a9b58aa5d0a3316be4cefacb1b9166c836d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Feb 2023 12:08:51 +1100
Subject: [PATCH 137/343] bundle-networking: Fix metadata to correctly use
 "description" field.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/bundles/bundle-networking/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/bundles/bundle-networking/manifest.py b/micropython/bundles/bundle-networking/manifest.py
index 049d2f64b..1db1b08cd 100644
--- a/micropython/bundles/bundle-networking/manifest.py
+++ b/micropython/bundles/bundle-networking/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     version="0.1.0",
-    metadata="Common networking packages for all network-capable deployments of MicroPython.",
+    description="Common networking packages for all network-capable deployments of MicroPython.",
 )
 
 require("mip")

From c1526d2d1eb68c4c3b0ff8940b012c98a80301f1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Feb 2023 11:48:37 +1100
Subject: [PATCH 138/343] github/workflows: Add workflow to build all packages.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/build_packages.yml | 16 ++++++++++++++++
 tools/ci.sh                          | 26 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 .github/workflows/build_packages.yml

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
new file mode 100644
index 000000000..7b79225ce
--- /dev/null
+++ b/.github/workflows/build_packages.yml
@@ -0,0 +1,16 @@
+name: Build all packages
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Setup environment
+      run: source tools/ci.sh && ci_build_packages_setup
+    - name: Check manifest files
+      run: source tools/ci.sh && ci_build_packages_check_manifest
+    - name: Compile package index
+      run: source tools/ci.sh && ci_build_packages_compile_index
diff --git a/tools/ci.sh b/tools/ci.sh
index 66a0e6cc4..75c8791d5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -14,3 +14,29 @@ function ci_code_formatting_setup {
 function ci_code_formatting_run {
     tools/codeformat.py -v
 }
+
+########################################################################################
+# build packages
+
+function ci_build_packages_setup {
+    git clone https://github.com/micropython/micropython.git /tmp/micropython
+
+    # build mpy-cross (use -O0 to speed up the build)
+    make -C /tmp/micropython/mpy-cross -j CFLAGS_EXTRA=-O0
+
+    # check the required programs run
+    /tmp/micropython/mpy-cross/build/mpy-cross --version
+    python3 /tmp/micropython/tools/manifestfile.py --help
+}
+
+function ci_build_packages_check_manifest {
+    for file in $(find -name manifest.py); do
+        echo "##################################################"
+        echo "# Testing $file"
+        python3 /tmp/micropython/tools/manifestfile.py --lib . --compile $file
+    done
+}
+
+function ci_build_packages_compile_index {
+    python3 tools/build.py --micropython /tmp/micropython --output /tmp/micropython-lib-deploy
+}

From a08087249fda8a7994f7c54ccaad29fb9fcc448a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 2 Feb 2023 15:09:36 +1100
Subject: [PATCH 139/343] top: Update Python formatting to black "2023 stable
 style".

See https://black.readthedocs.io/en/stable/the_black_code_style/index.html

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble/aioble/client.py        |  1 +
 .../bluetooth/aioble/multitests/ble_write_order.py   |  1 +
 micropython/drivers/codec/wm8960/wm8960.py           | 12 ------------
 micropython/drivers/display/ssd1306/ssd1306.py       |  1 +
 micropython/drivers/storage/sdcard/sdcard.py         |  1 -
 micropython/umqtt.robust/umqtt/robust.py             |  1 -
 micropython/umqtt.simple/example_sub.py              |  1 +
 python-stdlib/contextlib/tests.py                    |  1 -
 python-stdlib/copy/copy.py                           |  1 +
 python-stdlib/json/json/encoder.py                   |  1 -
 python-stdlib/logging/examples/example_logging_2.py  |  1 +
 python-stdlib/textwrap/textwrap.py                   |  1 -
 python-stdlib/unittest/tests/test_assertions.py      |  1 -
 unix-ffi/email.internal/email/_encoded_words.py      |  1 -
 unix-ffi/email.internal/email/_policybase.py         |  1 -
 unix-ffi/email.utils/email/utils.py                  |  1 +
 unix-ffi/html.entities/html/entities.py              |  2 +-
 unix-ffi/http.client/http/client.py                  |  1 -
 unix-ffi/machine/machine/pin.py                      |  1 -
 unix-ffi/urllib.parse/urllib/parse.py                |  1 +
 20 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/client.py b/micropython/bluetooth/aioble/aioble/client.py
index 8f3bf2c67..a205e0a3b 100644
--- a/micropython/bluetooth/aioble/aioble/client.py
+++ b/micropython/bluetooth/aioble/aioble/client.py
@@ -34,6 +34,7 @@
 _FLAG_NOTIFY = const(0x0010)
 _FLAG_INDICATE = const(0x0020)
 
+
 # Forward IRQs directly to static methods on the type that handles them and
 # knows how to map handles to instances. Note: We copy all uuid and data
 # params here for safety, but a future optimisation might be able to avoid
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_order.py b/micropython/bluetooth/aioble/multitests/ble_write_order.py
index 4b64031e5..8bd15e400 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_order.py
+++ b/micropython/bluetooth/aioble/multitests/ble_write_order.py
@@ -21,6 +21,7 @@
 CHAR_FIRST_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
 CHAR_SECOND_UUID = bluetooth.UUID("00000000-1111-2222-3333-555555555555")
 
+
 # Acting in peripheral role.
 async def instance0_task():
     service = aioble.Service(SERVICE_UUID)
diff --git a/micropython/drivers/codec/wm8960/wm8960.py b/micropython/drivers/codec/wm8960/wm8960.py
index ad1cb1cbf..d1670220f 100644
--- a/micropython/drivers/codec/wm8960/wm8960.py
+++ b/micropython/drivers/codec/wm8960/wm8960.py
@@ -244,7 +244,6 @@ def __setitem__(self, reg, value):
 
 
 class WM8960:
-
     _bit_clock_divider_table = {
         2: 0,
         3: 1,
@@ -399,7 +398,6 @@ def __init__(
         self.config_data_format(sysclk, sample_rate, bits)
 
     def deinit(self):
-
         self.set_module(MODULE_ADC, False)
         self.set_module(MODULE_DAC, False)
         self.set_module(MODULE_VREF, False)
@@ -467,33 +465,28 @@ def set_speaker_clock(self, sysclk):
         )
 
     def set_module(self, module, is_enabled):
-
         is_enabled = 1 if is_enabled else 0
         regs = self.regs
 
         if module == MODULE_ADC:
-
             regs[_POWER1] = (
                 _POWER1_ADCL_MASK | _POWER1_ADCR_MASK,
                 (_POWER1_ADCL_MASK | _POWER1_ADCR_MASK) * is_enabled,
             )
 
         elif module == MODULE_DAC:
-
             regs[_POWER2] = (
                 _POWER2_DACL_MASK | _POWER2_DACR_MASK,
                 (_POWER2_DACL_MASK | _POWER2_DACR_MASK) * is_enabled,
             )
 
         elif module == MODULE_VREF:
-
             regs[_POWER1] = (
                 _POWER1_VREF_MASK,
                 (is_enabled << _POWER1_VREF_SHIFT),
             )
 
         elif module == MODULE_LINE_IN:
-
             regs[_POWER1] = (
                 _POWER1_AINL_MASK | _POWER1_AINR_MASK,
                 (_POWER1_AINL_MASK | _POWER1_AINR_MASK) * is_enabled,
@@ -504,21 +497,18 @@ def set_module(self, module, is_enabled):
             )
 
         elif module == MODULE_LINE_OUT:
-
             regs[_POWER2] = (
                 _POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK,
                 (_POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK) * is_enabled,
             )
 
         elif module == MODULE_MIC_BIAS:
-
             regs[_POWER1] = (
                 _POWER1_MICB_MASK,
                 (is_enabled << _POWER1_MICB_SHIFT),
             )
 
         elif module == MODULE_SPEAKER:
-
             regs[_POWER2] = (
                 _POWER2_SPKL_MASK | _POWER2_SPKR_MASK,
                 (_POWER2_SPKL_MASK | _POWER2_SPKR_MASK) * is_enabled,
@@ -526,14 +516,12 @@ def set_module(self, module, is_enabled):
             regs[_CLASSD1] = 0xF7
 
         elif module == MODULE_OMIX:
-
             regs[_POWER3] = (
                 _POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK,
                 (_POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK) * is_enabled,
             )
 
         elif module == MODULE_MONO_OUT:
-
             regs[_MONOMIX1] = regs[_MONOMIX2] = is_enabled << 7
             regs[_MONO] = is_enabled << 6
 
diff --git a/micropython/drivers/display/ssd1306/ssd1306.py b/micropython/drivers/display/ssd1306/ssd1306.py
index a504cdadc..37ad682de 100644
--- a/micropython/drivers/display/ssd1306/ssd1306.py
+++ b/micropython/drivers/display/ssd1306/ssd1306.py
@@ -24,6 +24,7 @@
 SET_VCOM_DESEL = const(0xDB)
 SET_CHARGE_PUMP = const(0x8D)
 
+
 # Subclassing FrameBuffer provides support for graphics primitives
 # http://docs.micropython.org/en/latest/pyboard/library/framebuf.html
 class SSD1306(framebuf.FrameBuffer):
diff --git a/micropython/drivers/storage/sdcard/sdcard.py b/micropython/drivers/storage/sdcard/sdcard.py
index 0c9f2d5fa..c9c991f59 100644
--- a/micropython/drivers/storage/sdcard/sdcard.py
+++ b/micropython/drivers/storage/sdcard/sdcard.py
@@ -64,7 +64,6 @@ def init_spi(self, baudrate):
             self.spi.init(master, baudrate=baudrate, phase=0, polarity=0)
 
     def init_card(self, baudrate):
-
         # init CS pin
         self.cs.init(self.cs.OUT, value=1)
 
diff --git a/micropython/umqtt.robust/umqtt/robust.py b/micropython/umqtt.robust/umqtt/robust.py
index d9e4e9e97..4cc10e336 100644
--- a/micropython/umqtt.robust/umqtt/robust.py
+++ b/micropython/umqtt.robust/umqtt/robust.py
@@ -3,7 +3,6 @@
 
 
 class MQTTClient(simple.MQTTClient):
-
     DELAY = 2
     DEBUG = False
 
diff --git a/micropython/umqtt.simple/example_sub.py b/micropython/umqtt.simple/example_sub.py
index 890aa29b3..41fc55bcf 100644
--- a/micropython/umqtt.simple/example_sub.py
+++ b/micropython/umqtt.simple/example_sub.py
@@ -4,6 +4,7 @@
 # Publish test messages e.g. with:
 # mosquitto_pub -t foo_topic -m hello
 
+
 # Received messages from subscriptions will be delivered to this callback
 def sub_cb(topic, msg):
     print((topic, msg))
diff --git a/python-stdlib/contextlib/tests.py b/python-stdlib/contextlib/tests.py
index fd924cf3d..19f07add8 100644
--- a/python-stdlib/contextlib/tests.py
+++ b/python-stdlib/contextlib/tests.py
@@ -37,7 +37,6 @@ def test_suppress(self):
 
 
 class TestExitStack(unittest.TestCase):
-
     # @support.requires_docstrings
     def _test_instance_docs(self):
         # Issue 19330: ensure context manager instances have good docstrings
diff --git a/python-stdlib/copy/copy.py b/python-stdlib/copy/copy.py
index 024a428ef..f7bfdd6a1 100644
--- a/python-stdlib/copy/copy.py
+++ b/python-stdlib/copy/copy.py
@@ -374,6 +374,7 @@ def _reconstruct(x, info, deep, memo=None):
 
 del types
 
+
 # Helper for instance creation without calling __init__
 class _EmptyClass:
     pass
diff --git a/python-stdlib/json/json/encoder.py b/python-stdlib/json/json/encoder.py
index ba798a0b0..2adf366e3 100644
--- a/python-stdlib/json/json/encoder.py
+++ b/python-stdlib/json/json/encoder.py
@@ -294,7 +294,6 @@ def _make_iterencode(
     str=str,
     tuple=tuple,
 ):
-
     if _indent is not None and not isinstance(_indent, str):
         _indent = " " * _indent
 
diff --git a/python-stdlib/logging/examples/example_logging_2.py b/python-stdlib/logging/examples/example_logging_2.py
index a349d13bf..1dba328bc 100644
--- a/python-stdlib/logging/examples/example_logging_2.py
+++ b/python-stdlib/logging/examples/example_logging_2.py
@@ -37,6 +37,7 @@
 except:
     logger.error("Some trouble (%s)", "expected")
 
+
 # Custom handler example
 class MyHandler(logging.Handler):
     def emit(self, record):
diff --git a/python-stdlib/textwrap/textwrap.py b/python-stdlib/textwrap/textwrap.py
index 424387132..4e9f35069 100644
--- a/python-stdlib/textwrap/textwrap.py
+++ b/python-stdlib/textwrap/textwrap.py
@@ -248,7 +248,6 @@ def _wrap_chunks(self, chunks):
         chunks.reverse()
 
         while chunks:
-
             # Start the list of chunks that will make up the current line.
             # cur_len is just the length of all the chunks in cur_line.
             cur_line = []
diff --git a/python-stdlib/unittest/tests/test_assertions.py b/python-stdlib/unittest/tests/test_assertions.py
index 089a528aa..b191220e6 100644
--- a/python-stdlib/unittest/tests/test_assertions.py
+++ b/python-stdlib/unittest/tests/test_assertions.py
@@ -112,7 +112,6 @@ def testSkip(self):
         self.fail("this should be skipped")
 
     def testAssert(self):
-
         e1 = None
         try:
 
diff --git a/unix-ffi/email.internal/email/_encoded_words.py b/unix-ffi/email.internal/email/_encoded_words.py
index ac982cf0c..683ff3c52 100644
--- a/unix-ffi/email.internal/email/_encoded_words.py
+++ b/unix-ffi/email.internal/email/_encoded_words.py
@@ -74,7 +74,6 @@ def decode_q(encoded):
 
 # dict mapping bytes to their encoded form
 class _QByteMap(dict):
-
     safe = b"-!*+/" + ascii_letters.encode("ascii") + digits.encode("ascii")
 
     def __missing__(self, key):
diff --git a/unix-ffi/email.internal/email/_policybase.py b/unix-ffi/email.internal/email/_policybase.py
index f59434272..7e93ca4de 100644
--- a/unix-ffi/email.internal/email/_policybase.py
+++ b/unix-ffi/email.internal/email/_policybase.py
@@ -115,7 +115,6 @@ def _extend_docstrings(cls):
 
 
 class Policy(_PolicyBase):  # , metaclass=abc.ABCMeta):
-
     r"""Controls for how messages are interpreted and formatted.
 
     Most of the classes and many of the methods in the email package accept
diff --git a/unix-ffi/email.utils/email/utils.py b/unix-ffi/email.utils/email/utils.py
index e0ebdd342..b67502cff 100644
--- a/unix-ffi/email.utils/email/utils.py
+++ b/unix-ffi/email.utils/email/utils.py
@@ -58,6 +58,7 @@
 # source with undecodable characters.
 _has_surrogates = re.compile("([^\ud800-\udbff]|\A)[\udc00-\udfff]([^\udc00-\udfff]|\Z)").search
 
+
 # How to deal with a string containing bytes before handing it to the
 # application through the 'normal' interface.
 def _sanitize(string):
diff --git a/unix-ffi/html.entities/html/entities.py b/unix-ffi/html.entities/html/entities.py
index b4644b37a..223af74aa 100644
--- a/unix-ffi/html.entities/html/entities.py
+++ b/unix-ffi/html.entities/html/entities.py
@@ -2499,7 +2499,7 @@
 # (or a character reference if the character is outside the Latin-1 range)
 entitydefs = {}
 
-for (name, codepoint) in name2codepoint.items():
+for name, codepoint in name2codepoint.items():
     codepoint2name[codepoint] = name
     entitydefs[name] = chr(codepoint)
 
diff --git a/unix-ffi/http.client/http/client.py b/unix-ffi/http.client/http/client.py
index 5d30cbfe0..856848283 100644
--- a/unix-ffi/http.client/http/client.py
+++ b/unix-ffi/http.client/http/client.py
@@ -740,7 +740,6 @@ def getcode(self):
 
 
 class HTTPConnection:
-
     _http_vsn = 11
     _http_vsn_str = "HTTP/1.1"
 
diff --git a/unix-ffi/machine/machine/pin.py b/unix-ffi/machine/machine/pin.py
index 9774bf19c..c7d827be5 100644
--- a/unix-ffi/machine/machine/pin.py
+++ b/unix-ffi/machine/machine/pin.py
@@ -2,7 +2,6 @@
 
 
 class Pin(umachine.PinBase):
-
     IN = "in"
     OUT = "out"
 
diff --git a/unix-ffi/urllib.parse/urllib/parse.py b/unix-ffi/urllib.parse/urllib/parse.py
index 709cc578f..1ec75378c 100644
--- a/unix-ffi/urllib.parse/urllib/parse.py
+++ b/unix-ffi/urllib.parse/urllib/parse.py
@@ -332,6 +332,7 @@ def _hostinfo(self):
 # retained since deprecating it isn't worth the hassle
 ResultBase = _NetlocResultMixinStr
 
+
 # Structured result objects for string data
 class DefragResult(_DefragResultBase, _ResultMixinStr):
     __slots__ = ()

From 203e1e63b17bc957ebf63d30e04bba4d9c6ff525 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 23 Dec 2022 10:38:23 +0100
Subject: [PATCH 140/343] hs3003: Add new relative humidity and temperature
 sensor driver.

Renesas HS3003 Humidity and Temperature sensor driver.
---
 micropython/drivers/sensor/hs3003/hs3003.py   | 64 +++++++++++++++++++
 micropython/drivers/sensor/hs3003/manifest.py |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 micropython/drivers/sensor/hs3003/hs3003.py
 create mode 100644 micropython/drivers/sensor/hs3003/manifest.py

diff --git a/micropython/drivers/sensor/hs3003/hs3003.py b/micropython/drivers/sensor/hs3003/hs3003.py
new file mode 100644
index 000000000..003501649
--- /dev/null
+++ b/micropython/drivers/sensor/hs3003/hs3003.py
@@ -0,0 +1,64 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+
+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.
+
+HS3003 driver for MicroPython.
+
+Example usage:
+
+import time
+from hs3003 import HS3003
+from machine import Pin, I2C
+
+bus = I2C(1, scl=Pin(15), sda=Pin(14))
+hts = HS3003(bus)
+
+while True:
+    rH   = hts.humidity()
+    temp = hts.temperature()
+    print ("rH: %.2f%% T: %.2fC" %(rH, temp))
+    time.sleep_ms(100)
+"""
+
+import struct
+
+
+class HS3003:
+    def __init__(self, bus, address=0x44):
+        self.bus = bus
+        self.address = address
+
+    def _read_data(self):
+        # Init measurement mode
+        self.bus.writeto(self.address, b"")
+        # Data fetch
+        return struct.unpack(">HH", self.bus.readfrom(self.address, 4))
+
+    def humidity(self):
+        """Returns the relative humidity in percent."""
+        h, t = self._read_data()
+        return ((h & 0x3FFF) / 16383) * 100
+
+    def temperature(self):
+        """Returns the temperature in degrees Celsius."""
+        h, t = self._read_data()
+        return ((t >> 2) / 16383) * 165 - 40
diff --git a/micropython/drivers/sensor/hs3003/manifest.py b/micropython/drivers/sensor/hs3003/manifest.py
new file mode 100644
index 000000000..8409c76d8
--- /dev/null
+++ b/micropython/drivers/sensor/hs3003/manifest.py
@@ -0,0 +1,2 @@
+metadata(description="Renesas HS3003 Humidity and Temperature sensor driver.", version="1.0.0")
+module("hs3003.py", opt=3)

From e88aa3af16490e1deef471c14f8663d792e57ccd Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 30 Dec 2022 19:18:17 +0100
Subject: [PATCH 141/343] lsm6dsox: Refactor driver.

Changes are:
- fix typos
- make constants global
- rename functions with double underscore to single underscore
- rename __init__ keyword argument cs_pin -> cs
- rename read_mlc_output() -> mlc_output()
- rename read_gyro() -> gyro()
- rename read_accel() -> accel()
- update manifest
---
 micropython/drivers/imu/lsm6dsox/lsm6dsox.py  | 130 +++++++++---------
 .../drivers/imu/lsm6dsox/lsm6dsox_basic.py    |   6 +-
 .../drivers/imu/lsm6dsox/lsm6dsox_mlc.py      |   4 +-
 micropython/drivers/imu/lsm6dsox/manifest.py  |   1 +
 4 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
index 98e19fa4c..2e043f24c 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
@@ -5,7 +5,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2021 Damien P. George
-Copyright (c) 2021-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+Copyright (c) 2021-2023 Ibrahim Abdelkader <iabdalkader@openmv.io>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -35,11 +35,11 @@
 lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
 
 # Or init in SPI mode.
-#lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
+#lsm = LSM6DSOX(SPI(5), cs=Pin(10))
 
 while (True):
-    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_accel()))
-    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_gyro()))
+    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.accel()))
+    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.gyro()))
     print("")
     time.sleep_ms(100)
 """
@@ -47,39 +47,39 @@
 import array
 from micropython import const
 
+_CTRL3_C = const(0x12)
+_CTRL1_XL = const(0x10)
+_CTRL8_XL = const(0x17)
+_CTRL9_XL = const(0x18)
 
-class LSM6DSOX:
-    _CTRL3_C = const(0x12)
-    _CTRL1_XL = const(0x10)
-    _CTRL8_XL = const(0x17)
-    _CTRL9_XL = const(0x18)
+_CTRL2_G = const(0x11)
+_CTRL7_G = const(0x16)
 
-    _CTRL2_G = const(0x11)
-    _CTRL7_G = const(0x16)
+_OUTX_L_G = const(0x22)
+_OUTX_L_XL = const(0x28)
+_MLC_STATUS = const(0x38)
 
-    _OUTX_L_G = const(0x22)
-    _OUTX_L_XL = const(0x28)
-    _MLC_STATUS = const(0x38)
+_DEFAULT_ADDR = const(0x6A)
+_WHO_AM_I_REG = const(0x0F)
 
-    _DEFAULT_ADDR = const(0x6A)
-    _WHO_AM_I_REG = const(0x0F)
+_FUNC_CFG_ACCESS = const(0x01)
+_FUNC_CFG_BANK_USER = const(0)
+_FUNC_CFG_BANK_HUB = const(1)
+_FUNC_CFG_BANK_EMBED = const(2)
 
-    _FUNC_CFG_ACCESS = const(0x01)
-    _FUNC_CFG_BANK_USER = const(0)
-    _FUNC_CFG_BANK_HUB = const(1)
-    _FUNC_CFG_BANK_EMBED = const(2)
+_MLC0_SRC = const(0x70)
+_MLC_INT1 = const(0x0D)
+_TAP_CFG0 = const(0x56)
 
-    _MLC0_SRC = const(0x70)
-    _MLC_INT1 = const(0x0D)
-    _TAP_CFG0 = const(0x56)
+_EMB_FUNC_EN_A = const(0x04)
+_EMB_FUNC_EN_B = const(0x05)
 
-    _EMB_FUNC_EN_A = const(0x04)
-    _EMB_FUNC_EN_B = const(0x05)
 
+class LSM6DSOX:
     def __init__(
         self,
         bus,
-        cs_pin=None,
+        cs=None,
         address=_DEFAULT_ADDR,
         gyro_odr=104,
         accel_odr=104,
@@ -95,15 +95,15 @@ def __init__(
         ucf: MLC program to load.
         """
         self.bus = bus
-        self.cs_pin = cs_pin
+        self.cs = cs
         self.address = address
         self._use_i2c = hasattr(self.bus, "readfrom_mem")
 
-        if not self._use_i2c and cs_pin is None:
+        if not self._use_i2c and cs is None:
             raise ValueError("A CS pin must be provided in SPI mode")
 
         # check the id of the Accelerometer/Gyro
-        if self.__read_reg(_WHO_AM_I_REG) != 108:
+        if self._read_reg(_WHO_AM_I_REG) != 108:
             raise OSError("No LSM6DS device was found at address 0x%x" % (self.address))
 
         # allocate scratch buffer for efficient conversions and memread op's
@@ -131,7 +131,7 @@ def __init__(
 
         # Sanity checks
         if not gyro_odr in ODR:
-            raise ValueError("Invalid sampling rate: %d" % accel_odr)
+            raise ValueError("Invalid sampling rate: %d" % gyro_odr)
         if not gyro_scale in SCALE_GYRO:
             raise ValueError("invalid gyro scaling: %d" % gyro_scale)
         if not accel_odr in ODR:
@@ -148,74 +148,74 @@ def __init__(
 
         # Set Gyroscope datarate and scale.
         # Note output from LPF2 second filtering stage is selected. See Figure 18.
-        self.__write_reg(_CTRL1_XL, (ODR[accel_odr] << 4) | (SCALE_ACCEL[accel_scale] << 2) | 2)
+        self._write_reg(_CTRL1_XL, (ODR[accel_odr] << 4) | (SCALE_ACCEL[accel_scale] << 2) | 2)
 
         # Enable LPF2 and HPF fast-settling mode, ODR/4
-        self.__write_reg(_CTRL8_XL, 0x09)
+        self._write_reg(_CTRL8_XL, 0x09)
 
         # Set Gyroscope datarate and scale.
-        self.__write_reg(_CTRL2_G, (ODR[gyro_odr] << 4) | (SCALE_GYRO[gyro_scale] << 2) | 0)
+        self._write_reg(_CTRL2_G, (ODR[gyro_odr] << 4) | (SCALE_GYRO[gyro_scale] << 2) | 0)
 
         self.gyro_scale = 32768 / gyro_scale
         self.accel_scale = 32768 / accel_scale
 
-    def __read_reg(self, reg, size=1):
+    def _read_reg(self, reg, size=1):
         if self._use_i2c:
             buf = self.bus.readfrom_mem(self.address, reg, size)
         else:
             try:
-                self.cs_pin(0)
+                self.cs(0)
                 self.bus.write(bytes([reg | 0x80]))
                 buf = self.bus.read(size)
             finally:
-                self.cs_pin(1)
+                self.cs(1)
         if size == 1:
             return int(buf[0])
         return [int(x) for x in buf]
 
-    def __write_reg(self, reg, val):
+    def _write_reg(self, reg, val):
         if self._use_i2c:
             self.bus.writeto_mem(self.address, reg, bytes([val]))
         else:
             try:
-                self.cs_pin(0)
+                self.cs(0)
                 self.bus.write(bytes([reg, val]))
             finally:
-                self.cs_pin(1)
+                self.cs(1)
 
-    def __read_reg_into(self, reg, buf):
+    def _read_reg_into(self, reg, buf):
         if self._use_i2c:
             self.bus.readfrom_mem_into(self.address, reg, buf)
         else:
             try:
-                self.cs_pin(0)
+                self.cs(0)
                 self.bus.write(bytes([reg | 0x80]))
                 self.bus.readinto(buf)
             finally:
-                self.cs_pin(1)
+                self.cs(1)
 
     def reset(self):
-        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x1)
+        self._write_reg(_CTRL3_C, self._read_reg(_CTRL3_C) | 0x1)
         for i in range(0, 10):
-            if (self.__read_reg(_CTRL3_C) & 0x01) == 0:
+            if (self._read_reg(_CTRL3_C) & 0x01) == 0:
                 return
             time.sleep_ms(10)
         raise OSError("Failed to reset LSM6DS device.")
 
     def set_mem_bank(self, bank):
-        cfg = self.__read_reg(_FUNC_CFG_ACCESS) & 0x3F
-        self.__write_reg(_FUNC_CFG_ACCESS, cfg | (bank << 6))
+        cfg = self._read_reg(_FUNC_CFG_ACCESS) & 0x3F
+        self._write_reg(_FUNC_CFG_ACCESS, cfg | (bank << 6))
 
     def set_embedded_functions(self, enable, emb_ab=None):
         self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
         if enable:
-            self.__write_reg(_EMB_FUNC_EN_A, emb_ab[0])
-            self.__write_reg(_EMB_FUNC_EN_B, emb_ab[1])
+            self._write_reg(_EMB_FUNC_EN_A, emb_ab[0])
+            self._write_reg(_EMB_FUNC_EN_B, emb_ab[1])
         else:
-            emb_a = self.__read_reg(_EMB_FUNC_EN_A)
-            emb_b = self.__read_reg(_EMB_FUNC_EN_B)
-            self.__write_reg(_EMB_FUNC_EN_A, (emb_a & 0xC7))
-            self.__write_reg(_EMB_FUNC_EN_B, (emb_b & 0xE6))
+            emb_a = self._read_reg(_EMB_FUNC_EN_A)
+            emb_b = self._read_reg(_EMB_FUNC_EN_B)
+            self._write_reg(_EMB_FUNC_EN_A, (emb_a & 0xC7))
+            self._write_reg(_EMB_FUNC_EN_B, (emb_b & 0xE6))
             emb_ab = (emb_a, emb_b)
 
         self.set_mem_bank(_FUNC_CFG_BANK_USER)
@@ -227,45 +227,45 @@ def load_mlc(self, ucf):
             for l in ucf_file:
                 if l.startswith("Ac"):
                     v = [int(v, 16) for v in l.strip().split(" ")[1:3]]
-                    self.__write_reg(v[0], v[1])
+                    self._write_reg(v[0], v[1])
 
         emb_ab = self.set_embedded_functions(False)
 
         # Disable I3C interface
-        self.__write_reg(_CTRL9_XL, self.__read_reg(_CTRL9_XL) | 0x01)
+        self._write_reg(_CTRL9_XL, self._read_reg(_CTRL9_XL) | 0x01)
 
         # Enable Block Data Update
-        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x40)
+        self._write_reg(_CTRL3_C, self._read_reg(_CTRL3_C) | 0x40)
 
         # Route signals on interrupt pin 1
         self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
-        self.__write_reg(_MLC_INT1, self.__read_reg(_MLC_INT1) & 0x01)
+        self._write_reg(_MLC_INT1, self._read_reg(_MLC_INT1) & 0x01)
         self.set_mem_bank(_FUNC_CFG_BANK_USER)
 
         # Configure interrupt pin mode
-        self.__write_reg(_TAP_CFG0, self.__read_reg(_TAP_CFG0) | 0x41)
+        self._write_reg(_TAP_CFG0, self._read_reg(_TAP_CFG0) | 0x41)
 
         self.set_embedded_functions(True, emb_ab)
 
-    def read_mlc_output(self):
+    def mlc_output(self):
         buf = None
-        if self.__read_reg(_MLC_STATUS) & 0x1:
-            self.__read_reg(0x1A, size=12)
+        if self._read_reg(_MLC_STATUS) & 0x1:
+            self._read_reg(0x1A, size=12)
             self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
-            buf = self.__read_reg(_MLC0_SRC, 8)
+            buf = self._read_reg(_MLC0_SRC, 8)
             self.set_mem_bank(_FUNC_CFG_BANK_USER)
         return buf
 
-    def read_gyro(self):
+    def gyro(self):
         """Returns gyroscope vector in degrees/sec."""
         mv = memoryview(self.scratch_int)
         f = self.gyro_scale
-        self.__read_reg_into(_OUTX_L_G, mv)
+        self._read_reg_into(_OUTX_L_G, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
 
-    def read_accel(self):
+    def accel(self):
         """Returns acceleration vector in gravity units (9.81m/s^2)."""
         mv = memoryview(self.scratch_int)
         f = self.accel_scale
-        self.__read_reg_into(_OUTX_L_XL, mv)
+        self._read_reg_into(_OUTX_L_XL, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py
index 0ffe9e92b..32084a56b 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox_basic.py
@@ -6,10 +6,10 @@
 
 lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
 # Or init in SPI mode.
-# lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
+# lsm = LSM6DSOX(SPI(5), cs=Pin(10))
 
 while True:
-    print("Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_accel()))
-    print("Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_gyro()))
+    print("Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.accel()))
+    print("Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.gyro()))
     print("")
     time.sleep_ms(100)
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
index 866498d0c..ce3ff8e92 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
@@ -41,8 +41,8 @@ def imu_int_handler(pin):
     if INT_MODE:
         if INT_FLAG:
             INT_FLAG = False
-            print(UCF_LABELS[lsm.read_mlc_output()[0]])
+            print(UCF_LABELS[lsm.mlc_output()[0]])
     else:
-        buf = lsm.read_mlc_output()
+        buf = lsm.mlc_output()
         if buf != None:
             print(UCF_LABELS[buf[0]])
diff --git a/micropython/drivers/imu/lsm6dsox/manifest.py b/micropython/drivers/imu/lsm6dsox/manifest.py
index 28f4b3565..3bf037679 100644
--- a/micropython/drivers/imu/lsm6dsox/manifest.py
+++ b/micropython/drivers/imu/lsm6dsox/manifest.py
@@ -1 +1,2 @@
+metadata(description="ST LSM6DSOX imu driver.", version="1.0.0")
 module("lsm6dsox.py", opt=3)

From bf8b3c04de67d04b4ea4487b09ae755785ee87a6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 29 Dec 2022 09:26:13 +0100
Subject: [PATCH 142/343] lsm9ds1: Refactor driver.

Changes are:
- fix typos
- simplify the driver init code
- support setting the magnetometer ODR separately
- update manifest
---
 micropython/drivers/imu/lsm9ds1/lsm9ds1.py  | 174 +++++++++++---------
 micropython/drivers/imu/lsm9ds1/manifest.py |   1 +
 2 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
index 5d9942a7b..8042ecc6f 100644
--- a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
+++ b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
@@ -2,6 +2,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2013, 2014 Damien P. George
+Copyright (c) 2022-2023 Ibrahim Abdelkader <iabdalkader@openmv.io>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -32,13 +33,13 @@
 from lsm9ds1 import LSM9DS1
 from machine import Pin, I2C
 
-lsm = LSM9DS1(I2C(1, scl=Pin(15), sda=Pin(14)))
+imu = LSM9DS1(I2C(1, scl=Pin(15), sda=Pin(14)))
 
 while (True):
-    #for g,a in lsm.iter_accel_gyro(): print(g,a)    # using fifo
-    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.accel()))
-    print('Magnetometer:  x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.magnet()))
-    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.gyro()))
+    #for g,a in imu.iter_accel_gyro(): print(g,a)    # using fifo
+    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*imu.accel()))
+    print('Magnetometer:  x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*imu.magnet()))
+    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*imu.gyro()))
     print("")
     time.sleep_ms(100)
 """
@@ -58,100 +59,113 @@
 _OFFSET_REG_X_M = const(0x05)
 _CTRL_REG1_M = const(0x20)
 _OUT_M = const(0x28)
-_SCALE_GYRO = const(((245, 0), (500, 1), (2000, 3)))
-_SCALE_ACCEL = const(((2, 0), (4, 2), (8, 3), (16, 1)))
+_ACCEL_SCALE = const((2, 16, 4, 8))
+_GYRO_SCALE = const((245, 500, 2000))
+_MAGNET_SCALE = const((4, 8, 12, 16))
+_ODR_IMU = const((0, 14.9, 59.5, 119, 238, 476, 952))
+_ODR_MAGNET = const((0.625, 1.25, 2.5, 5, 10, 20, 40, 80))
 
 
 class LSM9DS1:
-    def __init__(self, i2c, address_gyro=0x6B, address_magnet=0x1E):
-        self.i2c = i2c
-        self.address_gyro = address_gyro
+    def __init__(
+        self,
+        bus,
+        address_imu=0x6B,
+        address_magnet=0x1E,
+        gyro_odr=952,
+        gyro_scale=245,
+        accel_odr=952,
+        accel_scale=4,
+        magnet_odr=80,
+        magnet_scale=4,
+    ):
+        """Initalizes Gyro, Accelerometer and Magnetometer.
+        bus: IMU bus
+        address_imu: IMU I2C address.
+        address_magnet: Magnetometer I2C address.
+        gyro_odr: (0, 14.9Hz, 59.5Hz, 119Hz, 238Hz, 476Hz, 952Hz)
+        gyro_scale: (245dps, 500dps, 2000dps )
+        accel_odr: (0, 14.9Hz, 59.5Hz, 119Hz, 238Hz, 476Hz, 952Hz)
+        accel_scale: (+/-2g, +/-4g, +/-8g, +-16g)
+        magnet_odr: (0.625Hz, 1.25Hz, 2.5Hz, 5Hz, 10Hz, 20Hz, 40Hz, 80Hz)
+        magnet_scale: (+/-4, +/-8, +/-12, +/-16)
+        """
+        self.bus = bus
+        self.address_imu = address_imu
         self.address_magnet = address_magnet
-        # check id's of accelerometer/gyro and magnetometer
+
+        # Sanity checks
+        if not gyro_odr in _ODR_IMU:
+            raise ValueError("Invalid gyro sampling rate: %d" % gyro_odr)
+        if not gyro_scale in _GYRO_SCALE:
+            raise ValueError("Invalid gyro scaling: %d" % gyro_scale)
+
+        if not accel_odr in _ODR_IMU:
+            raise ValueError("Invalid accelerometer sampling rate: %d" % accel_odr)
+        if not accel_scale in _ACCEL_SCALE:
+            raise ValueError("Invalid accelerometer scaling: %d" % accel_scale)
+
+        if not magnet_odr in _ODR_MAGNET:
+            raise ValueError("Invalid magnet sampling rate: %d" % magnet_odr)
+        if not magnet_scale in _MAGNET_SCALE:
+            raise ValueError("Invalid magnet scaling: %d" % magnet_scale)
+
         if (self.magent_id() != b"=") or (self.gyro_id() != b"h"):
             raise OSError(
-                "Invalid LSM9DS1 device, using address {}/{}".format(address_gyro, address_magnet)
+                "Invalid LSM9DS1 device, using address {}/{}".format(address_imu, address_magnet)
             )
-        # allocate scratch buffer for efficient conversions and memread op's
-        self.scratch = array.array("B", [0, 0, 0, 0, 0, 0])
-        self.scratch_int = array.array("h", [0, 0, 0])
-        self.init_gyro_accel()
-        self.init_magnetometer()
-
-    def init_gyro_accel(self, sample_rate=6, scale_gyro=0, scale_accel=0):
-        """Initalizes Gyro and Accelerator.
-        sample rate: 0-6 (off, 14.9Hz, 59.5Hz, 119Hz, 238Hz, 476Hz, 952Hz)
-        scale_gyro: 0-2 (245dps, 500dps, 2000dps )
-        scale_accel: 0-3 (+/-2g, +/-4g, +/-8g, +-16g)
-        """
-        assert sample_rate <= 6, "invalid sampling rate: %d" % sample_rate
-        assert scale_gyro <= 2, "invalid gyro scaling: %d" % scale_gyro
-        assert scale_accel <= 3, "invalid accelerometer scaling: %d" % scale_accel
-
-        i2c = self.i2c
-        addr = self.address_gyro
-        mv = memoryview(self.scratch)
-        # angular control registers 1-3 / Orientation
-        mv[0] = ((sample_rate & 0x07) << 5) | ((_SCALE_GYRO[scale_gyro][1] & 0x3) << 3)
+
+        mv = memoryview(bytearray(6))
+
+        # Configure Gyroscope.
+        mv[0] = (_ODR_IMU.index(gyro_odr) << 5) | ((_GYRO_SCALE.index(gyro_scale)) << 3)
         mv[1:4] = b"\x00\x00\x00"
-        i2c.writeto_mem(addr, _CTRL_REG1_G, mv[:5])
-        # ctrl4 - enable x,y,z, outputs, no irq latching, no 4D
-        # ctrl5 - enable all axes, no decimation
+        self.bus.writeto_mem(self.address_imu, _CTRL_REG1_G, mv[:5])
+
+        # Configure Accelerometer
+        mv[0] = 0x38  # ctrl4 - enable x,y,z, outputs, no irq latching, no 4D
+        mv[1] = 0x38  # ctrl5 - enable all axes, no decimation
         # ctrl6 - set scaling and sample rate of accel
-        # ctrl7,8 - leave at default values
-        # ctrl9 - FIFO enabled
-        mv[0] = mv[1] = 0x38
-        mv[2] = ((sample_rate & 7) << 5) | ((_SCALE_ACCEL[scale_accel][1] & 0x3) << 3)
-        mv[3] = 0x00
-        mv[4] = 0x4
-        mv[5] = 0x2
-        i2c.writeto_mem(addr, _CTRL_REG4_G, mv[:6])
+        mv[2] = (_ODR_IMU.index(accel_odr) << 5) | ((_ACCEL_SCALE.index(accel_scale)) << 3)
+        mv[3] = 0x00  # ctrl7 - leave at default values
+        mv[4] = 0x4  # ctrl8 - leave at default values
+        mv[5] = 0x2  # ctrl9 - FIFO enabled
+        self.bus.writeto_mem(self.address_imu, _CTRL_REG4_G, mv)
 
         # fifo: use continous mode (overwrite old data if overflow)
-        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\x00")
-        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\xc0")
-
-        self.scale_gyro = 32768 / _SCALE_GYRO[scale_gyro][0]
-        self.scale_accel = 32768 / _SCALE_ACCEL[scale_accel][0]
+        self.bus.writeto_mem(self.address_imu, _FIFO_CTRL_REG, b"\x00")
+        self.bus.writeto_mem(self.address_imu, _FIFO_CTRL_REG, b"\xc0")
 
-    def init_magnetometer(self, sample_rate=7, scale_magnet=0):
-        """
-        sample rates = 0-7 (0.625, 1.25, 2.5, 5, 10, 20, 40, 80Hz)
-        scaling = 0-3 (+/-4, +/-8, +/-12, +/-16 Gauss)
-        """
-        assert sample_rate < 8, "invalid sample rate: %d (0-7)" % sample_rate
-        assert scale_magnet < 4, "invalid scaling: %d (0-3)" % scale_magnet
-        i2c = self.i2c
-        addr = self.address_magnet
-        mv = memoryview(self.scratch)
-        mv[0] = 0x40 | (sample_rate << 2)  # ctrl1: high performance mode
-        mv[1] = scale_magnet << 5  # ctrl2: scale, normal mode, no reset
+        # Configure Magnetometer
+        mv[0] = 0x40 | (magnet_odr << 2)  # ctrl1: high performance mode
+        mv[1] = _MAGNET_SCALE.index(magnet_scale) << 5  # ctrl2: scale, normal mode, no reset
         mv[2] = 0x00  # ctrl3: continous conversion, no low power, I2C
         mv[3] = 0x08  # ctrl4: high performance z-axis
         mv[4] = 0x00  # ctr5: no fast read, no block update
-        i2c.writeto_mem(addr, _CTRL_REG1_M, mv[:5])
-        self.scale_factor_magnet = 32768 / ((scale_magnet + 1) * 4)
+        self.bus.writeto_mem(self.address_magnet, _CTRL_REG1_M, mv[:5])
+
+        self.gyro_scale = 32768 / gyro_scale
+        self.accel_scale = 32768 / accel_scale
+        self.scale_factor_magnet = 32768 / ((_MAGNET_SCALE.index(magnet_scale) + 1) * 4)
+
+        # Allocate scratch buffer for efficient conversions and memread op's
+        self.scratch_int = array.array("h", [0, 0, 0])
 
     def calibrate_magnet(self, offset):
         """
-        offset is a magnet vecor that will be substracted by the magnetometer
+        offset is a magnet vector that will be subtracted by the magnetometer
         for each measurement. It is written to the magnetometer's offset register
         """
+        import struct
+
         offset = [int(i * self.scale_factor_magnet) for i in offset]
-        mv = memoryview(self.scratch)
-        mv[0] = offset[0] & 0xFF
-        mv[1] = offset[0] >> 8
-        mv[2] = offset[1] & 0xFF
-        mv[3] = offset[1] >> 8
-        mv[4] = offset[2] & 0xFF
-        mv[5] = offset[2] >> 8
-        self.i2c.writeto_mem(self.address_magnet, _OFFSET_REG_X_M, mv[:6])
+        self.bus.writeto_mem(self.address_magnet, _OFFSET_REG_X_M, struct.pack("<HHH", offset))
 
     def gyro_id(self):
-        return self.i2c.readfrom_mem(self.address_gyro, _WHO_AM_I, 1)
+        return self.bus.readfrom_mem(self.address_imu, _WHO_AM_I, 1)
 
     def magent_id(self):
-        return self.i2c.readfrom_mem(self.address_magnet, _WHO_AM_I, 1)
+        return self.bus.readfrom_mem(self.address_magnet, _WHO_AM_I, 1)
 
     def magnet(self):
         """Returns magnetometer vector in gauss.
@@ -159,28 +173,28 @@ def magnet(self):
         """
         mv = memoryview(self.scratch_int)
         f = self.scale_factor_magnet
-        self.i2c.readfrom_mem_into(self.address_magnet, _OUT_M | 0x80, mv)
+        self.bus.readfrom_mem_into(self.address_magnet, _OUT_M | 0x80, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
 
     def gyro(self):
         """Returns gyroscope vector in degrees/sec."""
         mv = memoryview(self.scratch_int)
-        f = self.scale_gyro
-        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_G | 0x80, mv)
+        f = self.gyro_scale
+        self.bus.readfrom_mem_into(self.address_imu, _OUT_G | 0x80, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
 
     def accel(self):
         """Returns acceleration vector in gravity units (9.81m/s^2)."""
         mv = memoryview(self.scratch_int)
-        f = self.scale_accel
-        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_XL | 0x80, mv)
+        f = self.accel_scale
+        self.bus.readfrom_mem_into(self.address_imu, _OUT_XL | 0x80, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
 
     def iter_accel_gyro(self):
         """A generator that returns tuples of (gyro,accelerometer) data from the fifo."""
         while True:
             fifo_state = int.from_bytes(
-                self.i2c.readfrom_mem(self.address_gyro, _FIFO_SRC, 1), "big"
+                self.bus.readfrom_mem(self.address_imu, _FIFO_SRC, 1), "big"
             )
             if fifo_state & 0x3F:
                 # print("Available samples=%d" % (fifo_state & 0x1f))
diff --git a/micropython/drivers/imu/lsm9ds1/manifest.py b/micropython/drivers/imu/lsm9ds1/manifest.py
index 6779362de..c15c914b3 100644
--- a/micropython/drivers/imu/lsm9ds1/manifest.py
+++ b/micropython/drivers/imu/lsm9ds1/manifest.py
@@ -1 +1,2 @@
+metadata(description="Driver for ST LSM9DS1 IMU.", version="1.0.0")
 module("lsm9ds1.py", opt=3)

From 92854c1754f5d0883d5cc7196ddb8844d48437b4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Dec 2022 16:43:34 +0100
Subject: [PATCH 143/343] bmi270: Add new IMU driver.

For the BOSCH BMI270 IMU.
---
 micropython/drivers/imu/bmi270/bmi270.py   | 634 +++++++++++++++++++++
 micropython/drivers/imu/bmi270/manifest.py |   2 +
 2 files changed, 636 insertions(+)
 create mode 100644 micropython/drivers/imu/bmi270/bmi270.py
 create mode 100644 micropython/drivers/imu/bmi270/manifest.py

diff --git a/micropython/drivers/imu/bmi270/bmi270.py b/micropython/drivers/imu/bmi270/bmi270.py
new file mode 100644
index 000000000..9e21b7395
--- /dev/null
+++ b/micropython/drivers/imu/bmi270/bmi270.py
@@ -0,0 +1,634 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+
+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.
+
+Basic example usage:
+
+import time
+from bmi270 import BMI270
+from machine import Pin, SPI, I2C
+
+# Init in I2C mode.
+imu = BMI270(I2C(1, scl=Pin(15), sda=Pin(14)))
+
+# Or init in SPI mode.
+# TODO: Not supported yet.
+# imu = BMI270(SPI(5), cs=Pin(10))
+
+while (True):
+    print('Accelerometer: x:{:>6.3f}  y:{:>6.3f}  z:{:>6.3f}'.format(*imu.accel()))
+    print('Gyroscope:     x:{:>6.3f}  y:{:>6.3f}  z:{:>6.3f}'.format(*imu.gyro()))
+    print('Magnetometer:  x:{:>8.3f}  y:{:>8.3f}  z:{:>8.3f}'.format(*imu.magnet()))
+    print("")
+    time.sleep_ms(100)
+"""
+
+import array
+import time
+from micropython import const
+
+_DEFAULT_ADDR = const(0x68)
+_CHIP_ID = const(0x00)
+_STATUS = const(0x21)
+_INIT_ADDR_0 = const(0x5B)
+_INIT_ADDR_1 = const(0x5C)
+_DATA_8 = const(0x0C)
+_DATA_14 = const(0x12)
+_CMD = const(0x7E)
+_CONFIG_DATA = const(
+    b"\xc8\x2e\x00\x2e\x80\x2e\x3d\xb1\xc8\x2e\x00\x2e\x80\x2e\x91\x03\x80\x2e\xbc"
+    b"\xb0\x80\x2e\xa3\x03\xc8\x2e\x00\x2e\x80\x2e\x00\xb0\x50\x30\x21\x2e\x59\xf5"
+    b"\x10\x30\x21\x2e\x6a\xf5\x80\x2e\x3b\x03\x00\x00\x00\x00\x08\x19\x01\x00\x22"
+    b"\x00\x75\x00\x00\x10\x00\x10\xd1\x00\xb3\x43\x80\x2e\x00\xc1\x80\x2e\x00\xc1"
+    b"\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00"
+    b"\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e"
+    b"\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1"
+    b"\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00"
+    b"\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e"
+    b"\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1"
+    b"\x80\x2e\x00\xc1\x80\x2e\x00\xc1\xe0\x5f\x00\x00\x00\x00\x01\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x92\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x08\x19\x00\x00\x88\x00\x00\x00\x00\x00\x00\x00\x05"
+    b"\xe0\xaa\x38\x05\xe0\x90\x30\xfa\x00\x96\x00\x4b\x09\x11\x00\x11\x00\x02\x00"
+    b"\x2d\x01\xd4\x7b\x3b\x01\xdb\x7a\x04\x00\x3f\x7b\xcd\x6c\xc3\x04\x85\x09\xc3"
+    b"\x04\xec\xe6\x0c\x46\x01\x00\x27\x00\x19\x00\x96\x00\xa0\x00\x01\x00\x0c\x00"
+    b"\xf0\x3c\x00\x01\x01\x00\x03\x00\x01\x00\x0e\x00\x00\x00\x32\x00\x05\x00\xee"
+    b"\x06\x04\x00\xc8\x00\x00\x00\x04\x00\xa8\x05\xee\x06\x00\x04\xbc\x02\xb3\x00"
+    b"\x85\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\xb4\x00\x01\x00\xb9\x00\x01\x00\x98\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x01\x00\x80\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x2e\x00\xc1\xfd\x2d\xde"
+    b"\x00\xeb\x00\xda\x00\x00\x0c\xff\x0f\x00\x04\xc0\x00\x5b\xf5\xc9\x01\x1e\xf2"
+    b"\x80\x00\x3f\xff\x19\xf4\x58\xf5\x66\xf5\x64\xf5\xc0\xf1\xf0\x00\xe0\x00\xcd"
+    b"\x01\xd3\x01\xdb\x01\xff\x7f\xff\x01\xe4\x00\x74\xf7\xf3\x00\xfa\x00\xff\x3f"
+    b"\xca\x03\x6c\x38\x56\xfe\x44\xfd\xbc\x02\xf9\x06\x00\xfc\x12\x02\xae\x01\x58"
+    b"\xfa\x9a\xfd\x77\x05\xbb\x02\x96\x01\x95\x01\x7f\x01\x82\x01\x89\x01\x87\x01"
+    b"\x88\x01\x8a\x01\x8c\x01\x8f\x01\x8d\x01\x92\x01\x91\x01\xdd\x00\x9f\x01\x7e"
+    b"\x01\xdb\x00\xb6\x01\x70\x69\x26\xd3\x9c\x07\x1f\x05\x9d\x00\x00\x08\xbc\x05"
+    b"\x37\xfa\xa2\x01\xaa\x01\xa1\x01\xa8\x01\xa0\x01\xa8\x05\xb4\x01\xb4\x01\xce"
+    b"\x00\xd0\x00\xfc\x00\xc5\x01\xff\xfb\xb1\x00\x00\x38\x00\x30\xfd\xf5\xfc\xf5"
+    b"\xcd\x01\xa0\x00\x5f\xff\x00\x40\xff\x00\x00\x80\x6d\x0f\xeb\x00\x7f\xff\xc2"
+    b"\xf5\x68\xf7\xb3\xf1\x67\x0f\x5b\x0f\x61\x0f\x80\x0f\x58\xf7\x5b\xf7\x83\x0f"
+    b"\x86\x00\x72\x0f\x85\x0f\xc6\xf1\x7f\x0f\x6c\xf7\x00\xe0\x00\xff\xd1\xf5\x87"
+    b"\x0f\x8a\x0f\xff\x03\xf0\x3f\x8b\x00\x8e\x00\x90\x00\xb9\x00\x2d\xf5\xca\xf5"
+    b"\xcb\x01\x20\xf2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x30\x50\x98\x2e"
+    b"\xd7\x0e\x50\x32\x98\x2e\xfa\x03\x00\x30\xf0\x7f\x00\x2e\x00\x2e\xd0\x2e\x00"
+    b"\x2e\x01\x80\x08\xa2\xfb\x2f\x98\x2e\xba\x03\x21\x2e\x19\x00\x01\x2e\xee\x00"
+    b"\x00\xb2\x07\x2f\x01\x2e\x19\x00\x00\xb2\x03\x2f\x01\x50\x03\x52\x98\x2e\x07"
+    b"\xcc\x01\x2e\xdd\x00\x00\xb2\x27\x2f\x05\x2e\x8a\x00\x05\x52\x98\x2e\xc7\xc1"
+    b"\x03\x2e\xe9\x00\x40\xb2\xf0\x7f\x08\x2f\x01\x2e\x19\x00\x00\xb2\x04\x2f\x00"
+    b"\x30\x21\x2e\xe9\x00\x98\x2e\xb4\xb1\x01\x2e\x18\x00\x00\xb2\x10\x2f\x05\x50"
+    b"\x98\x2e\x4d\xc3\x05\x50\x98\x2e\x5a\xc7\x98\x2e\xf9\xb4\x98\x2e\x54\xb2\x98"
+    b"\x2e\x67\xb6\x98\x2e\x17\xb2\x10\x30\x21\x2e\x77\x00\x01\x2e\xef\x00\x00\xb2"
+    b"\x04\x2f\x98\x2e\x7a\xb7\x00\x30\x21\x2e\xef\x00\x01\x2e\xd4\x00\x04\xae\x0b"
+    b"\x2f\x01\x2e\xdd\x00\x00\xb2\x07\x2f\x05\x52\x98\x2e\x8e\x0e\x00\xb2\x02\x2f"
+    b"\x10\x30\x21\x2e\x7d\x00\x01\x2e\x7d\x00\x00\x90\x90\x2e\xf1\x02\x01\x2e\xd7"
+    b"\x00\x00\xb2\x04\x2f\x98\x2e\x2f\x0e\x00\x30\x21\x2e\x7b\x00\x01\x2e\x7b\x00"
+    b"\x00\xb2\x12\x2f\x01\x2e\xd4\x00\x00\x90\x02\x2f\x98\x2e\x1f\x0e\x09\x2d\x98"
+    b"\x2e\x81\x0d\x01\x2e\xd4\x00\x04\x90\x02\x2f\x50\x32\x98\x2e\xfa\x03\x00\x30"
+    b"\x21\x2e\x7b\x00\x01\x2e\x7c\x00\x00\xb2\x90\x2e\x09\x03\x01\x2e\x7c\x00\x01"
+    b"\x31\x01\x08\x00\xb2\x04\x2f\x98\x2e\x47\xcb\x10\x30\x21\x2e\x77\x00\x81\x30"
+    b"\x01\x2e\x7c\x00\x01\x08\x00\xb2\x61\x2f\x03\x2e\x89\x00\x01\x2e\xd4\x00\x98"
+    b"\xbc\x98\xb8\x05\xb2\x0f\x58\x23\x2f\x07\x90\x09\x54\x00\x30\x37\x2f\x15\x41"
+    b"\x04\x41\xdc\xbe\x44\xbe\xdc\xba\x2c\x01\x61\x00\x0f\x56\x4a\x0f\x0c\x2f\xd1"
+    b"\x42\x94\xb8\xc1\x42\x11\x30\x05\x2e\x6a\xf7\x2c\xbd\x2f\xb9\x80\xb2\x08\x22"
+    b"\x98\x2e\xc3\xb7\x21\x2d\x61\x30\x23\x2e\xd4\x00\x98\x2e\xc3\xb7\x00\x30\x21"
+    b"\x2e\x5a\xf5\x18\x2d\xe1\x7f\x50\x30\x98\x2e\xfa\x03\x0f\x52\x07\x50\x50\x42"
+    b"\x70\x30\x0d\x54\x42\x42\x7e\x82\xe2\x6f\x80\xb2\x42\x42\x05\x2f\x21\x2e\xd4"
+    b"\x00\x10\x30\x98\x2e\xc3\xb7\x03\x2d\x60\x30\x21\x2e\xd4\x00\x01\x2e\xd4\x00"
+    b"\x06\x90\x18\x2f\x01\x2e\x76\x00\x0b\x54\x07\x52\xe0\x7f\x98\x2e\x7a\xc1\xe1"
+    b"\x6f\x08\x1a\x40\x30\x08\x2f\x21\x2e\xd4\x00\x20\x30\x98\x2e\xaf\xb7\x50\x32"
+    b"\x98\x2e\xfa\x03\x05\x2d\x98\x2e\x38\x0e\x00\x30\x21\x2e\xd4\x00\x00\x30\x21"
+    b"\x2e\x7c\x00\x18\x2d\x01\x2e\xd4\x00\x03\xaa\x01\x2f\x98\x2e\x45\x0e\x01\x2e"
+    b"\xd4\x00\x3f\x80\x03\xa2\x01\x2f\x00\x2e\x02\x2d\x98\x2e\x5b\x0e\x30\x30\x98"
+    b"\x2e\xce\xb7\x00\x30\x21\x2e\x7d\x00\x50\x32\x98\x2e\xfa\x03\x01\x2e\x77\x00"
+    b"\x00\xb2\x24\x2f\x98\x2e\xf5\xcb\x03\x2e\xd5\x00\x11\x54\x01\x0a\xbc\x84\x83"
+    b"\x86\x21\x2e\xc9\x01\xe0\x40\x13\x52\xc4\x40\x82\x40\xa8\xb9\x52\x42\x43\xbe"
+    b"\x53\x42\x04\x0a\x50\x42\xe1\x7f\xf0\x31\x41\x40\xf2\x6f\x25\xbd\x08\x08\x02"
+    b"\x0a\xd0\x7f\x98\x2e\xa8\xcf\x06\xbc\xd1\x6f\xe2\x6f\x08\x0a\x80\x42\x98\x2e"
+    b"\x58\xb7\x00\x30\x21\x2e\xee\x00\x21\x2e\x77\x00\x21\x2e\xdd\x00\x80\x2e\xf4"
+    b"\x01\x1a\x24\x22\x00\x80\x2e\xec\x01\x10\x50\xfb\x7f\x98\x2e\xf3\x03\x57\x50"
+    b"\xfb\x6f\x01\x30\x71\x54\x11\x42\x42\x0e\xfc\x2f\xc0\x2e\x01\x42\xf0\x5f\x80"
+    b"\x2e\x00\xc1\xfd\x2d\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x9a\x01"
+    b"\x34\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x20\x50\xe7\x7f\xf6\x7f\x06\x32\x0f\x2e\x61\xf5\xfe\x09\xc0\xb3\x04"
+    b"\x2f\x17\x30\x2f\x2e\xef\x00\x2d\x2e\x61\xf5\xf6\x6f\xe7\x6f\xe0\x5f\xc8\x2e"
+    b"\x20\x50\xe7\x7f\xf6\x7f\x46\x30\x0f\x2e\xa4\xf1\xbe\x09\x80\xb3\x06\x2f\x0d"
+    b"\x2e\xd4\x00\x84\xaf\x02\x2f\x16\x30\x2d\x2e\x7b\x00\x86\x30\x2d\x2e\x60\xf5"
+    b"\xf6\x6f\xe7\x6f\xe0\x5f\xc8\x2e\x01\x2e\x77\xf7\x09\xbc\x0f\xb8\x00\xb2\x10"
+    b"\x50\xfb\x7f\x10\x30\x0b\x2f\x03\x2e\x8a\x00\x96\xbc\x9f\xb8\x40\xb2\x05\x2f"
+    b"\x03\x2e\x68\xf7\x9e\xbc\x9f\xb8\x40\xb2\x07\x2f\x03\x2e\x7e\x00\x41\x90\x01"
+    b"\x2f\x98\x2e\xdc\x03\x03\x2c\x00\x30\x21\x2e\x7e\x00\xfb\x6f\xf0\x5f\xb8\x2e"
+    b"\x20\x50\xe0\x7f\xfb\x7f\x00\x2e\x27\x50\x98\x2e\x3b\xc8\x29\x50\x98\x2e\xa7"
+    b"\xc8\x01\x50\x98\x2e\x55\xcc\xe1\x6f\x2b\x50\x98\x2e\xe0\xc9\xfb\x6f\x00\x30"
+    b"\xe0\x5f\x21\x2e\x7e\x00\xb8\x2e\x73\x50\x01\x30\x57\x54\x11\x42\x42\x0e\xfc"
+    b"\x2f\xb8\x2e\x21\x2e\x59\xf5\x10\x30\xc0\x2e\x21\x2e\x4a\xf1\x90\x50\xf7\x7f"
+    b"\xe6\x7f\xd5\x7f\xc4\x7f\xb3\x7f\xa1\x7f\x90\x7f\x82\x7f\x7b\x7f\x98\x2e\x35"
+    b"\xb7\x00\xb2\x90\x2e\x97\xb0\x03\x2e\x8f\x00\x07\x2e\x91\x00\x05\x2e\xb1\x00"
+    b"\x3f\xba\x9f\xb8\x01\x2e\xb1\x00\xa3\xbd\x4c\x0a\x05\x2e\xb1\x00\x04\xbe\xbf"
+    b"\xb9\xcb\x0a\x4f\xba\x22\xbd\x01\x2e\xb3\x00\xdc\x0a\x2f\xb9\x03\x2e\xb8\x00"
+    b"\x0a\xbe\x9a\x0a\xcf\xb9\x9b\xbc\x01\x2e\x97\x00\x9f\xb8\x93\x0a\x0f\xbc\x91"
+    b"\x0a\x0f\xb8\x90\x0a\x25\x2e\x18\x00\x05\x2e\xc1\xf5\x2e\xbd\x2e\xb9\x01\x2e"
+    b"\x19\x00\x31\x30\x8a\x04\x00\x90\x07\x2f\x01\x2e\xd4\x00\x04\xa2\x03\x2f\x01"
+    b"\x2e\x18\x00\x00\xb2\x0c\x2f\x19\x50\x05\x52\x98\x2e\x4d\xb7\x05\x2e\x78\x00"
+    b"\x80\x90\x10\x30\x01\x2f\x21\x2e\x78\x00\x25\x2e\xdd\x00\x98\x2e\x3e\xb7\x00"
+    b"\xb2\x02\x30\x01\x30\x04\x2f\x01\x2e\x19\x00\x00\xb2\x00\x2f\x21\x30\x01\x2e"
+    b"\xea\x00\x08\x1a\x0e\x2f\x23\x2e\xea\x00\x33\x30\x1b\x50\x0b\x09\x01\x40\x17"
+    b"\x56\x46\xbe\x4b\x08\x4c\x0a\x01\x42\x0a\x80\x15\x52\x01\x42\x00\x2e\x01\x2e"
+    b"\x18\x00\x00\xb2\x1f\x2f\x03\x2e\xc0\xf5\xf0\x30\x48\x08\x47\xaa\x74\x30\x07"
+    b"\x2e\x7a\x00\x61\x22\x4b\x1a\x05\x2f\x07\x2e\x66\xf5\xbf\xbd\xbf\xb9\xc0\x90"
+    b"\x0b\x2f\x1d\x56\x2b\x30\xd2\x42\xdb\x42\x01\x04\xc2\x42\x04\xbd\xfe\x80\x81"
+    b"\x84\x23\x2e\x7a\x00\x02\x42\x02\x32\x25\x2e\x62\xf5\x05\x2e\xd6\x00\x81\x84"
+    b"\x25\x2e\xd6\x00\x02\x31\x25\x2e\x60\xf5\x05\x2e\x8a\x00\x0b\x50\x90\x08\x80"
+    b"\xb2\x0b\x2f\x05\x2e\xca\xf5\xf0\x3e\x90\x08\x25\x2e\xca\xf5\x05\x2e\x59\xf5"
+    b"\xe0\x3f\x90\x08\x25\x2e\x59\xf5\x90\x6f\xa1\x6f\xb3\x6f\xc4\x6f\xd5\x6f\xe6"
+    b"\x6f\xf7\x6f\x7b\x6f\x82\x6f\x70\x5f\xc8\x2e\xc0\x50\x90\x7f\xe5\x7f\xd4\x7f"
+    b"\xc3\x7f\xb1\x7f\xa2\x7f\x87\x7f\xf6\x7f\x7b\x7f\x00\x2e\x01\x2e\x60\xf5\x60"
+    b"\x7f\x98\x2e\x35\xb7\x02\x30\x63\x6f\x15\x52\x50\x7f\x62\x7f\x5a\x2c\x02\x32"
+    b"\x1a\x09\x00\xb3\x14\x2f\x00\xb2\x03\x2f\x09\x2e\x18\x00\x00\x91\x0c\x2f\x43"
+    b"\x7f\x98\x2e\x97\xb7\x1f\x50\x02\x8a\x02\x32\x04\x30\x25\x2e\x64\xf5\x15\x52"
+    b"\x50\x6f\x43\x6f\x44\x43\x25\x2e\x60\xf5\xd9\x08\xc0\xb2\x36\x2f\x98\x2e\x3e"
+    b"\xb7\x00\xb2\x06\x2f\x01\x2e\x19\x00\x00\xb2\x02\x2f\x50\x6f\x00\x90\x0a\x2f"
+    b"\x01\x2e\x79\x00\x00\x90\x19\x2f\x10\x30\x21\x2e\x79\x00\x00\x30\x98\x2e\xdc"
+    b"\x03\x13\x2d\x01\x2e\xc3\xf5\x0c\xbc\x0f\xb8\x12\x30\x10\x04\x03\xb0\x26\x25"
+    b"\x21\x50\x03\x52\x98\x2e\x4d\xb7\x10\x30\x21\x2e\xee\x00\x02\x30\x60\x7f\x25"
+    b"\x2e\x79\x00\x60\x6f\x00\x90\x05\x2f\x00\x30\x21\x2e\xea\x00\x15\x50\x21\x2e"
+    b"\x64\xf5\x15\x52\x23\x2e\x60\xf5\x02\x32\x50\x6f\x00\x90\x02\x2f\x03\x30\x27"
+    b"\x2e\x78\x00\x07\x2e\x60\xf5\x1a\x09\x00\x91\xa3\x2f\x19\x09\x00\x91\xa0\x2f"
+    b"\x90\x6f\xa2\x6f\xb1\x6f\xc3\x6f\xd4\x6f\xe5\x6f\x7b\x6f\xf6\x6f\x87\x6f\x40"
+    b"\x5f\xc8\x2e\xc0\x50\xe7\x7f\xf6\x7f\x26\x30\x0f\x2e\x61\xf5\x2f\x2e\x7c\x00"
+    b"\x0f\x2e\x7c\x00\xbe\x09\xa2\x7f\x80\x7f\x80\xb3\xd5\x7f\xc4\x7f\xb3\x7f\x91"
+    b"\x7f\x7b\x7f\x0b\x2f\x23\x50\x1a\x25\x12\x40\x42\x7f\x74\x82\x12\x40\x52\x7f"
+    b"\x00\x2e\x00\x40\x60\x7f\x98\x2e\x6a\xd6\x81\x30\x01\x2e\x7c\x00\x01\x08\x00"
+    b"\xb2\x42\x2f\x03\x2e\x89\x00\x01\x2e\x89\x00\x97\xbc\x06\xbc\x9f\xb8\x0f\xb8"
+    b"\x00\x90\x23\x2e\xd8\x00\x10\x30\x01\x30\x2a\x2f\x03\x2e\xd4\x00\x44\xb2\x05"
+    b"\x2f\x47\xb2\x00\x30\x2d\x2f\x21\x2e\x7c\x00\x2b\x2d\x03\x2e\xfd\xf5\x9e\xbc"
+    b"\x9f\xb8\x40\x90\x14\x2f\x03\x2e\xfc\xf5\x99\xbc\x9f\xb8\x40\x90\x0e\x2f\x03"
+    b"\x2e\x49\xf1\x25\x54\x4a\x08\x40\x90\x08\x2f\x98\x2e\x35\xb7\x00\xb2\x10\x30"
+    b"\x03\x2f\x50\x30\x21\x2e\xd4\x00\x10\x2d\x98\x2e\xaf\xb7\x00\x30\x21\x2e\x7c"
+    b"\x00\x0a\x2d\x05\x2e\x69\xf7\x2d\xbd\x2f\xb9\x80\xb2\x01\x2f\x21\x2e\x7d\x00"
+    b"\x23\x2e\x7c\x00\xe0\x31\x21\x2e\x61\xf5\xf6\x6f\xe7\x6f\x80\x6f\xa2\x6f\xb3"
+    b"\x6f\xc4\x6f\xd5\x6f\x7b\x6f\x91\x6f\x40\x5f\xc8\x2e\x60\x51\x0a\x25\x36\x88"
+    b"\xf4\x7f\xeb\x7f\x00\x32\x31\x52\x32\x30\x13\x30\x98\x2e\x15\xcb\x0a\x25\x33"
+    b"\x84\xd2\x7f\x43\x30\x05\x50\x2d\x52\x98\x2e\x95\xc1\xd2\x6f\x27\x52\x98\x2e"
+    b"\xd7\xc7\x2a\x25\xb0\x86\xc0\x7f\xd3\x7f\xaf\x84\x29\x50\xf1\x6f\x98\x2e\x4d"
+    b"\xc8\x2a\x25\xae\x8a\xaa\x88\xf2\x6e\x2b\x50\xc1\x6f\xd3\x6f\xf4\x7f\x98\x2e"
+    b"\xb6\xc8\xe0\x6e\x00\xb2\x32\x2f\x33\x54\x83\x86\xf1\x6f\xc3\x7f\x04\x30\x30"
+    b"\x30\xf4\x7f\xd0\x7f\xb2\x7f\xe3\x30\xc5\x6f\x56\x40\x45\x41\x28\x08\x03\x14"
+    b"\x0e\xb4\x08\xbc\x82\x40\x10\x0a\x2f\x54\x26\x05\x91\x7f\x44\x28\xa3\x7f\x98"
+    b"\x2e\xd9\xc0\x08\xb9\x33\x30\x53\x09\xc1\x6f\xd3\x6f\xf4\x6f\x83\x17\x47\x40"
+    b"\x6c\x15\xb2\x6f\xbe\x09\x75\x0b\x90\x42\x45\x42\x51\x0e\x32\xbc\x02\x89\xa1"
+    b"\x6f\x7e\x86\xf4\x7f\xd0\x7f\xb2\x7f\x04\x30\x91\x6f\xd6\x2f\xeb\x6f\xa0\x5e"
+    b"\xb8\x2e\x03\x2e\x97\x00\x1b\xbc\x60\x50\x9f\xbc\x0c\xb8\xf0\x7f\x40\xb2\xeb"
+    b"\x7f\x2b\x2f\x03\x2e\x7f\x00\x41\x40\x01\x2e\xc8\x00\x01\x1a\x11\x2f\x37\x58"
+    b"\x23\x2e\xc8\x00\x10\x41\xa0\x7f\x38\x81\x01\x41\xd0\x7f\xb1\x7f\x98\x2e\x64"
+    b"\xcf\xd0\x6f\x07\x80\xa1\x6f\x11\x42\x00\x2e\xb1\x6f\x01\x42\x11\x30\x01\x2e"
+    b"\xfc\x00\x00\xa8\x03\x30\xcb\x22\x4a\x25\x01\x2e\x7f\x00\x3c\x89\x35\x52\x05"
+    b"\x54\x98\x2e\xc4\xce\xc1\x6f\xf0\x6f\x98\x2e\x95\xcf\x04\x2d\x01\x30\xf0\x6f"
+    b"\x98\x2e\x95\xcf\xeb\x6f\xa0\x5f\xb8\x2e\x03\x2e\xb3\x00\x02\x32\xf0\x30\x03"
+    b"\x31\x30\x50\x8a\x08\x08\x08\xcb\x08\xe0\x7f\x80\xb2\xf3\x7f\xdb\x7f\x25\x2f"
+    b"\x03\x2e\xca\x00\x41\x90\x04\x2f\x01\x30\x23\x2e\xca\x00\x98\x2e\x3f\x03\xc0"
+    b"\xb2\x05\x2f\x03\x2e\xda\x00\x00\x30\x41\x04\x23\x2e\xda\x00\x98\x2e\x92\xb2"
+    b"\x10\x25\xf0\x6f\x00\xb2\x05\x2f\x01\x2e\xda\x00\x02\x30\x10\x04\x21\x2e\xda"
+    b"\x00\x40\xb2\x01\x2f\x23\x2e\xc8\x01\xdb\x6f\xe0\x6f\xd0\x5f\x80\x2e\x95\xcf"
+    b"\x01\x30\xe0\x6f\x98\x2e\x95\xcf\x11\x30\x23\x2e\xca\x00\xdb\x6f\xd0\x5f\xb8"
+    b"\x2e\xd0\x50\x0a\x25\x33\x84\x55\x50\xd2\x7f\xe2\x7f\x03\x8c\xc0\x7f\xbb\x7f"
+    b"\x00\x30\x05\x5a\x39\x54\x51\x41\xa5\x7f\x96\x7f\x80\x7f\x98\x2e\xd9\xc0\x05"
+    b"\x30\xf5\x7f\x20\x25\x91\x6f\x3b\x58\x3d\x5c\x3b\x56\x98\x2e\x67\xcc\xc1\x6f"
+    b"\xd5\x6f\x52\x40\x50\x43\xc1\x7f\xd5\x7f\x10\x25\x98\x2e\xfe\xc9\x10\x25\x98"
+    b"\x2e\x74\xc0\x86\x6f\x30\x28\x92\x6f\x82\x8c\xa5\x6f\x6f\x52\x69\x0e\x39\x54"
+    b"\xdb\x2f\x19\xa0\x15\x30\x03\x2f\x00\x30\x21\x2e\x81\x01\x0a\x2d\x01\x2e\x81"
+    b"\x01\x05\x28\x42\x36\x21\x2e\x81\x01\x02\x0e\x01\x2f\x98\x2e\xf3\x03\x57\x50"
+    b"\x12\x30\x01\x40\x98\x2e\xfe\xc9\x51\x6f\x0b\x5c\x8e\x0e\x3b\x6f\x57\x58\x02"
+    b"\x30\x21\x2e\x95\x01\x45\x6f\x2a\x8d\xd2\x7f\xcb\x7f\x13\x2f\x02\x30\x3f\x50"
+    b"\xd2\x7f\xa8\x0e\x0e\x2f\xc0\x6f\x53\x54\x02\x00\x51\x54\x42\x0e\x10\x30\x59"
+    b"\x52\x02\x30\x01\x2f\x00\x2e\x03\x2d\x50\x42\x42\x42\x12\x30\xd2\x7f\x80\xb2"
+    b"\x03\x2f\x00\x30\x21\x2e\x80\x01\x12\x2d\x01\x2e\xc9\x00\x02\x80\x05\x2e\x80"
+    b"\x01\x11\x30\x91\x28\x00\x40\x25\x2e\x80\x01\x10\x0e\x05\x2f\x01\x2e\x7f\x01"
+    b"\x01\x90\x01\x2f\x98\x2e\xf3\x03\x00\x2e\xa0\x41\x01\x90\xa6\x7f\x90\x2e\xe3"
+    b"\xb4\x01\x2e\x95\x01\x00\xa8\x90\x2e\xe3\xb4\x5b\x54\x95\x80\x82\x40\x80\xb2"
+    b"\x02\x40\x2d\x8c\x3f\x52\x96\x7f\x90\x2e\xc2\xb3\x29\x0e\x76\x2f\x01\x2e\xc9"
+    b"\x00\x00\x40\x81\x28\x45\x52\xb3\x30\x98\x2e\x0f\xca\x5d\x54\x80\x7f\x00\x2e"
+    b"\xa1\x40\x72\x7f\x82\x80\x82\x40\x60\x7f\x98\x2e\xfe\xc9\x10\x25\x98\x2e\x74"
+    b"\xc0\x62\x6f\x05\x30\x87\x40\xc0\x91\x04\x30\x05\x2f\x05\x2e\x83\x01\x80\xb2"
+    b"\x14\x30\x00\x2f\x04\x30\x05\x2e\xc9\x00\x73\x6f\x81\x40\xe2\x40\x69\x04\x11"
+    b"\x0f\xe1\x40\x16\x30\xfe\x29\xcb\x40\x02\x2f\x83\x6f\x83\x0f\x22\x2f\x47\x56"
+    b"\x13\x0f\x12\x30\x77\x2f\x49\x54\x42\x0e\x12\x30\x73\x2f\x00\x91\x0a\x2f\x01"
+    b"\x2e\x8b\x01\x19\xa8\x02\x30\x6c\x2f\x63\x50\x00\x2e\x17\x42\x05\x42\x68\x2c"
+    b"\x12\x30\x0b\x25\x08\x0f\x50\x30\x02\x2f\x21\x2e\x83\x01\x03\x2d\x40\x30\x21"
+    b"\x2e\x83\x01\x2b\x2e\x85\x01\x5a\x2c\x12\x30\x00\x91\x2b\x25\x04\x2f\x63\x50"
+    b"\x02\x30\x17\x42\x17\x2c\x02\x42\x98\x2e\xfe\xc9\x10\x25\x98\x2e\x74\xc0\x05"
+    b"\x2e\xc9\x00\x81\x84\x5b\x30\x82\x40\x37\x2e\x83\x01\x02\x0e\x07\x2f\x5f\x52"
+    b"\x40\x30\x62\x40\x41\x40\x91\x0e\x01\x2f\x21\x2e\x83\x01\x05\x30\x2b\x2e\x85"
+    b"\x01\x12\x30\x36\x2c\x16\x30\x15\x25\x81\x7f\x98\x2e\xfe\xc9\x10\x25\x98\x2e"
+    b"\x74\xc0\x19\xa2\x16\x30\x15\x2f\x05\x2e\x97\x01\x80\x6f\x82\x0e\x05\x2f\x01"
+    b"\x2e\x86\x01\x06\x28\x21\x2e\x86\x01\x0b\x2d\x03\x2e\x87\x01\x5f\x54\x4e\x28"
+    b"\x91\x42\x00\x2e\x82\x40\x90\x0e\x01\x2f\x21\x2e\x88\x01\x02\x30\x13\x2c\x05"
+    b"\x30\xc0\x6f\x08\x1c\xa8\x0f\x16\x30\x05\x30\x5b\x50\x09\x2f\x02\x80\x2d\x2e"
+    b"\x82\x01\x05\x42\x05\x80\x00\x2e\x02\x42\x3e\x80\x00\x2e\x06\x42\x02\x30\x90"
+    b"\x6f\x3e\x88\x01\x40\x04\x41\x4c\x28\x01\x42\x07\x80\x10\x25\x24\x40\x00\x40"
+    b"\x00\xa8\xf5\x22\x23\x29\x44\x42\x7a\x82\x7e\x88\x43\x40\x04\x41\x00\xab\xf5"
+    b"\x23\xdf\x28\x43\x42\xd9\xa0\x14\x2f\x00\x90\x02\x2f\xd2\x6f\x81\xb2\x05\x2f"
+    b"\x63\x54\x06\x28\x90\x42\x85\x42\x09\x2c\x02\x30\x5b\x50\x03\x80\x29\x2e\x7e"
+    b"\x01\x2b\x2e\x82\x01\x05\x42\x12\x30\x2b\x2e\x83\x01\x45\x82\x00\x2e\x40\x40"
+    b"\x7a\x82\x02\xa0\x08\x2f\x63\x50\x3b\x30\x15\x42\x05\x42\x37\x80\x37\x2e\x7e"
+    b"\x01\x05\x42\x12\x30\x01\x2e\xc9\x00\x02\x8c\x40\x40\x84\x41\x7a\x8c\x04\x0f"
+    b"\x03\x2f\x01\x2e\x8b\x01\x19\xa4\x04\x2f\x2b\x2e\x82\x01\x98\x2e\xf3\x03\x12"
+    b"\x30\x81\x90\x61\x52\x08\x2f\x65\x42\x65\x42\x43\x80\x39\x84\x82\x88\x05\x42"
+    b"\x45\x42\x85\x42\x05\x43\x00\x2e\x80\x41\x00\x90\x90\x2e\xe1\xb4\x65\x54\xc1"
+    b"\x6f\x80\x40\x00\xb2\x43\x58\x69\x50\x44\x2f\x55\x5c\xb7\x87\x8c\x0f\x0d\x2e"
+    b"\x96\x01\xc4\x40\x36\x2f\x41\x56\x8b\x0e\x2a\x2f\x0b\x52\xa1\x0e\x0a\x2f\x05"
+    b"\x2e\x8f\x01\x14\x25\x98\x2e\xfe\xc9\x4b\x54\x02\x0f\x69\x50\x05\x30\x65\x54"
+    b"\x15\x2f\x03\x2e\x8e\x01\x4d\x5c\x8e\x0f\x3a\x2f\x05\x2e\x8f\x01\x98\x2e\xfe"
+    b"\xc9\x4f\x54\x82\x0f\x05\x30\x69\x50\x65\x54\x30\x2f\x6d\x52\x15\x30\x42\x8c"
+    b"\x45\x42\x04\x30\x2b\x2c\x84\x43\x6b\x52\x42\x8c\x00\x2e\x85\x43\x15\x30\x24"
+    b"\x2c\x45\x42\x8e\x0f\x20\x2f\x0d\x2e\x8e\x01\xb1\x0e\x1c\x2f\x23\x2e\x8e\x01"
+    b"\x1a\x2d\x0e\x0e\x17\x2f\xa1\x0f\x15\x2f\x23\x2e\x8d\x01\x13\x2d\x98\x2e\x74"
+    b"\xc0\x43\x54\xc2\x0e\x0a\x2f\x65\x50\x04\x80\x0b\x30\x06\x82\x0b\x42\x79\x80"
+    b"\x41\x40\x12\x30\x25\x2e\x8c\x01\x01\x42\x05\x30\x69\x50\x65\x54\x84\x82\x43"
+    b"\x84\xbe\x8c\x84\x40\x86\x41\x26\x29\x94\x42\xbe\x8e\xd5\x7f\x19\xa1\x43\x40"
+    b"\x0b\x2e\x8c\x01\x84\x40\xc7\x41\x5d\x29\x27\x29\x45\x42\x84\x42\xc2\x7f\x01"
+    b"\x2f\xc0\xb3\x1d\x2f\x05\x2e\x94\x01\x99\xa0\x01\x2f\x80\xb3\x13\x2f\x80\xb3"
+    b"\x18\x2f\xc0\xb3\x16\x2f\x12\x40\x01\x40\x92\x7f\x98\x2e\x74\xc0\x92\x6f\x10"
+    b"\x0f\x20\x30\x03\x2f\x10\x30\x21\x2e\x7e\x01\x0a\x2d\x21\x2e\x7e\x01\x07\x2d"
+    b"\x20\x30\x21\x2e\x7e\x01\x03\x2d\x10\x30\x21\x2e\x7e\x01\xc2\x6f\x01\x2e\xc9"
+    b"\x00\xbc\x84\x02\x80\x82\x40\x00\x40\x90\x0e\xd5\x6f\x02\x2f\x15\x30\x98\x2e"
+    b"\xf3\x03\x41\x91\x05\x30\x07\x2f\x67\x50\x3d\x80\x2b\x2e\x8f\x01\x05\x42\x04"
+    b"\x80\x00\x2e\x05\x42\x02\x2c\x00\x30\x00\x30\xa2\x6f\x98\x8a\x86\x40\x80\xa7"
+    b"\x05\x2f\x98\x2e\xf3\x03\xc0\x30\x21\x2e\x95\x01\x06\x25\x1a\x25\xe2\x6f\x76"
+    b"\x82\x96\x40\x56\x43\x51\x0e\xfb\x2f\xbb\x6f\x30\x5f\xb8\x2e\x01\x2e\xb8\x00"
+    b"\x01\x31\x41\x08\x40\xb2\x20\x50\xf2\x30\x02\x08\xfb\x7f\x01\x30\x10\x2f\x05"
+    b"\x2e\xcc\x00\x81\x90\xe0\x7f\x03\x2f\x23\x2e\xcc\x00\x98\x2e\x55\xb6\x98\x2e"
+    b"\x1d\xb5\x10\x25\xfb\x6f\xe0\x6f\xe0\x5f\x80\x2e\x95\xcf\x98\x2e\x95\xcf\x10"
+    b"\x30\x21\x2e\xcc\x00\xfb\x6f\xe0\x5f\xb8\x2e\x00\x51\x05\x58\xeb\x7f\x2a\x25"
+    b"\x89\x52\x6f\x5a\x89\x50\x13\x41\x06\x40\xb3\x01\x16\x42\xcb\x16\x06\x40\xf3"
+    b"\x02\x13\x42\x65\x0e\xf5\x2f\x05\x40\x14\x30\x2c\x29\x04\x42\x08\xa1\x00\x30"
+    b"\x90\x2e\x52\xb6\xb3\x88\xb0\x8a\xb6\x84\xa4\x7f\xc4\x7f\xb5\x7f\xd5\x7f\x92"
+    b"\x7f\x73\x30\x04\x30\x55\x40\x42\x40\x8a\x17\xf3\x08\x6b\x01\x90\x02\x53\xb8"
+    b"\x4b\x82\xad\xbe\x71\x7f\x45\x0a\x09\x54\x84\x7f\x98\x2e\xd9\xc0\xa3\x6f\x7b"
+    b"\x54\xd0\x42\xa3\x7f\xf2\x7f\x60\x7f\x20\x25\x71\x6f\x75\x5a\x77\x58\x79\x5c"
+    b"\x75\x56\x98\x2e\x67\xcc\xb1\x6f\x62\x6f\x50\x42\xb1\x7f\xb3\x30\x10\x25\x98"
+    b"\x2e\x0f\xca\x84\x6f\x20\x29\x71\x6f\x92\x6f\xa5\x6f\x76\x82\x6a\x0e\x73\x30"
+    b"\x00\x30\xd0\x2f\xd2\x6f\xd1\x7f\xb4\x7f\x98\x2e\x2b\xb7\x15\xbd\x0b\xb8\x02"
+    b"\x0a\xc2\x6f\xc0\x7f\x98\x2e\x2b\xb7\x15\xbd\x0b\xb8\x42\x0a\xc0\x6f\x08\x17"
+    b"\x41\x18\x89\x16\xe1\x18\xd0\x18\xa1\x7f\x27\x25\x16\x25\x98\x2e\x79\xc0\x8b"
+    b"\x54\x90\x7f\xb3\x30\x82\x40\x80\x90\x0d\x2f\x7d\x52\x92\x6f\x98\x2e\x0f\xca"
+    b"\xb2\x6f\x90\x0e\x06\x2f\x8b\x50\x14\x30\x42\x6f\x51\x6f\x14\x42\x12\x42\x01"
+    b"\x42\x00\x2e\x31\x6f\x98\x2e\x74\xc0\x41\x6f\x80\x7f\x98\x2e\x74\xc0\x82\x6f"
+    b"\x10\x04\x43\x52\x01\x0f\x05\x2e\xcb\x00\x00\x30\x04\x30\x21\x2f\x51\x6f\x43"
+    b"\x58\x8c\x0e\x04\x30\x1c\x2f\x85\x88\x41\x6f\x04\x41\x8c\x0f\x04\x30\x16\x2f"
+    b"\x84\x88\x00\x2e\x04\x41\x04\x05\x8c\x0e\x04\x30\x0f\x2f\x82\x88\x31\x6f\x04"
+    b"\x41\x04\x05\x8c\x0e\x04\x30\x08\x2f\x83\x88\x00\x2e\x04\x41\x8c\x0f\x04\x30"
+    b"\x02\x2f\x21\x2e\xad\x01\x14\x30\x00\x91\x14\x2f\x03\x2e\xa1\x01\x41\x90\x0e"
+    b"\x2f\x03\x2e\xad\x01\x14\x30\x4c\x28\x23\x2e\xad\x01\x46\xa0\x06\x2f\x81\x84"
+    b"\x8d\x52\x48\x82\x82\x40\x21\x2e\xa1\x01\x42\x42\x5c\x2c\x02\x30\x05\x2e\xaa"
+    b"\x01\x80\xb2\x02\x30\x55\x2f\x03\x2e\xa9\x01\x92\x6f\xb3\x30\x98\x2e\x0f\xca"
+    b"\xb2\x6f\x90\x0f\x00\x30\x02\x30\x4a\x2f\xa2\x6f\x87\x52\x91\x00\x85\x52\x51"
+    b"\x0e\x02\x2f\x00\x2e\x43\x2c\x02\x30\xc2\x6f\x7f\x52\x91\x0e\x02\x30\x3c\x2f"
+    b"\x51\x6f\x81\x54\x98\x2e\xfe\xc9\x10\x25\xb3\x30\x21\x25\x98\x2e\x0f\xca\x32"
+    b"\x6f\xc0\x7f\xb3\x30\x12\x25\x98\x2e\x0f\xca\x42\x6f\xb0\x7f\xb3\x30\x12\x25"
+    b"\x98\x2e\x0f\xca\xb2\x6f\x90\x28\x83\x52\x98\x2e\xfe\xc9\xc2\x6f\x90\x0f\x00"
+    b"\x30\x02\x30\x1d\x2f\x05\x2e\xa1\x01\x80\xb2\x12\x30\x0f\x2f\x42\x6f\x03\x2e"
+    b"\xab\x01\x91\x0e\x02\x30\x12\x2f\x52\x6f\x03\x2e\xac\x01\x91\x0f\x02\x30\x0c"
+    b"\x2f\x21\x2e\xaa\x01\x0a\x2c\x12\x30\x03\x2e\xcb\x00\x8d\x58\x08\x89\x41\x40"
+    b"\x11\x43\x00\x43\x25\x2e\xa1\x01\xd4\x6f\x8f\x52\x00\x43\x3a\x89\x00\x2e\x10"
+    b"\x43\x10\x43\x61\x0e\xfb\x2f\x03\x2e\xa0\x01\x11\x1a\x02\x2f\x02\x25\x21\x2e"
+    b"\xa0\x01\xeb\x6f\x00\x5f\xb8\x2e\x91\x52\x10\x30\x02\x30\x95\x56\x52\x42\x4b"
+    b"\x0e\xfc\x2f\x8d\x54\x88\x82\x93\x56\x80\x42\x53\x42\x40\x42\x42\x86\x83\x54"
+    b"\xc0\x2e\xc2\x42\x00\x2e\xa3\x52\x00\x51\x52\x40\x47\x40\x1a\x25\x01\x2e\x97"
+    b"\x00\x8f\xbe\x72\x86\xfb\x7f\x0b\x30\x7c\xbf\xa5\x50\x10\x08\xdf\xba\x70\x88"
+    b"\xf8\xbf\xcb\x42\xd3\x7f\x6c\xbb\xfc\xbb\xc5\x0a\x90\x7f\x1b\x7f\x0b\x43\xc0"
+    b"\xb2\xe5\x7f\xb7\x7f\xa6\x7f\xc4\x7f\x90\x2e\x1c\xb7\x07\x2e\xd2\x00\xc0\xb2"
+    b"\x0b\x2f\x97\x52\x01\x2e\xcd\x00\x82\x7f\x98\x2e\xbb\xcc\x0b\x30\x37\x2e\xd2"
+    b"\x00\x82\x6f\x90\x6f\x1a\x25\x00\xb2\x8b\x7f\x14\x2f\xa6\xbd\x25\xbd\xb6\xb9"
+    b"\x2f\xb9\x80\xb2\xd4\xb0\x0c\x2f\x99\x54\x9b\x56\x0b\x30\x0b\x2e\xb1\x00\xa1"
+    b"\x58\x9b\x42\xdb\x42\x6c\x09\x2b\x2e\xb1\x00\x8b\x42\xcb\x42\x86\x7f\x73\x84"
+    b"\xa7\x56\xc3\x08\x39\x52\x05\x50\x72\x7f\x63\x7f\x98\x2e\xc2\xc0\xe1\x6f\x62"
+    b"\x6f\xd1\x0a\x01\x2e\xcd\x00\xd5\x6f\xc4\x6f\x72\x6f\x97\x52\x9d\x5c\x98\x2e"
+    b"\x06\xcd\x23\x6f\x90\x6f\x99\x52\xc0\xb2\x04\xbd\x54\x40\xaf\xb9\x45\x40\xe1"
+    b"\x7f\x02\x30\x06\x2f\xc0\xb2\x02\x30\x03\x2f\x9b\x5c\x12\x30\x94\x43\x85\x43"
+    b"\x03\xbf\x6f\xbb\x80\xb3\x20\x2f\x06\x6f\x26\x01\x16\x6f\x6e\x03\x45\x42\xc0"
+    b"\x90\x29\x2e\xce\x00\x9b\x52\x14\x2f\x9b\x5c\x00\x2e\x93\x41\x86\x41\xe3\x04"
+    b"\xae\x07\x80\xab\x04\x2f\x80\x91\x0a\x2f\x86\x6f\x73\x0f\x07\x2f\x83\x6f\xc0"
+    b"\xb2\x04\x2f\x54\x42\x45\x42\x12\x30\x04\x2c\x11\x30\x02\x2c\x11\x30\x11\x30"
+    b"\x02\xbc\x0f\xb8\xd2\x7f\x00\xb2\x0a\x2f\x01\x2e\xfc\x00\x05\x2e\xc7\x01\x10"
+    b"\x1a\x02\x2f\x21\x2e\xc7\x01\x03\x2d\x02\x2c\x01\x30\x01\x30\xb0\x6f\x98\x2e"
+    b"\x95\xcf\xd1\x6f\xa0\x6f\x98\x2e\x95\xcf\xe2\x6f\x9f\x52\x01\x2e\xce\x00\x82"
+    b"\x40\x50\x42\x0c\x2c\x42\x42\x11\x30\x23\x2e\xd2\x00\x01\x30\xb0\x6f\x98\x2e"
+    b"\x95\xcf\xa0\x6f\x01\x30\x98\x2e\x95\xcf\x00\x2e\xfb\x6f\x00\x5f\xb8\x2e\x83"
+    b"\x86\x01\x30\x00\x30\x94\x40\x24\x18\x06\x00\x53\x0e\x4f\x02\xf9\x2f\xb8\x2e"
+    b"\xa9\x52\x00\x2e\x60\x40\x41\x40\x0d\xbc\x98\xbc\xc0\x2e\x01\x0a\x0f\xb8\xab"
+    b"\x52\x53\x3c\x52\x40\x40\x40\x4b\x00\x82\x16\x26\xb9\x01\xb8\x41\x40\x10\x08"
+    b"\x97\xb8\x01\x08\xc0\x2e\x11\x30\x01\x08\x43\x86\x25\x40\x04\x40\xd8\xbe\x2c"
+    b"\x0b\x22\x11\x54\x42\x03\x80\x4b\x0e\xf6\x2f\xb8\x2e\x9f\x50\x10\x50\xad\x52"
+    b"\x05\x2e\xd3\x00\xfb\x7f\x00\x2e\x13\x40\x93\x42\x41\x0e\xfb\x2f\x98\x2e\xa5"
+    b"\xb7\x98\x2e\x87\xcf\x01\x2e\xd9\x00\x00\xb2\xfb\x6f\x0b\x2f\x01\x2e\x69\xf7"
+    b"\xb1\x3f\x01\x08\x01\x30\xf0\x5f\x23\x2e\xd9\x00\x21\x2e\x69\xf7\x80\x2e\x7a"
+    b"\xb7\xf0\x5f\xb8\x2e\x01\x2e\xc0\xf8\x03\x2e\xfc\xf5\x15\x54\xaf\x56\x82\x08"
+    b"\x0b\x2e\x69\xf7\xcb\x0a\xb1\x58\x80\x90\xdd\xbe\x4c\x08\x5f\xb9\x59\x22\x80"
+    b"\x90\x07\x2f\x03\x34\xc3\x08\xf2\x3a\x0a\x08\x02\x35\xc0\x90\x4a\x0a\x48\x22"
+    b"\xc0\x2e\x23\x2e\xfc\xf5\x10\x50\xfb\x7f\x98\x2e\x56\xc7\x98\x2e\x49\xc3\x10"
+    b"\x30\xfb\x6f\xf0\x5f\x21\x2e\xcc\x00\x21\x2e\xca\x00\xb8\x2e\x03\x2e\xd3\x00"
+    b"\x16\xb8\x02\x34\x4a\x0c\x21\x2e\x2d\xf5\xc0\x2e\x23\x2e\xd3\x00\x03\xbc\x21"
+    b"\x2e\xd5\x00\x03\x2e\xd5\x00\x40\xb2\x10\x30\x21\x2e\x77\x00\x01\x30\x05\x2f"
+    b"\x05\x2e\xd8\x00\x80\x90\x01\x2f\x23\x2e\x6f\xf5\xc0\x2e\x21\x2e\xd9\x00\x11"
+    b"\x30\x81\x08\x01\x2e\x6a\xf7\x71\x3f\x23\xbd\x01\x08\x02\x0a\xc0\x2e\x21\x2e"
+    b"\x6a\xf7\x30\x25\x00\x30\x21\x2e\x5a\xf5\x10\x50\x21\x2e\x7b\x00\x21\x2e\x7c"
+    b"\x00\xfb\x7f\x98\x2e\xc3\xb7\x40\x30\x21\x2e\xd4\x00\xfb\x6f\xf0\x5f\x03\x25"
+    b"\x80\x2e\xaf\xb7\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00"
+    b"\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e"
+    b"\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1\x80\x2e\x00\xc1\x01\x2e\x5d\xf7\x08\xbc\x80\xac\x0e\xbb\x02\x2f"
+    b"\x00\x30\x41\x04\x82\x06\xc0\xa4\x00\x30\x11\x2f\x40\xa9\x03\x2f\x40\x91\x0d"
+    b"\x2f\x00\xa7\x0b\x2f\x80\xb3\xb3\x58\x02\x2f\x90\xa1\x26\x13\x20\x23\x80\x90"
+    b"\x10\x30\x01\x2f\xcc\x0e\x00\x2f\x00\x30\xb8\x2e\xb5\x50\x18\x08\x08\xbc\x88"
+    b"\xb6\x0d\x17\xc6\xbd\x56\xbc\xb7\x58\xda\xba\x04\x01\x1d\x0a\x10\x50\x05\x30"
+    b"\x32\x25\x45\x03\xfb\x7f\xf6\x30\x21\x25\x98\x2e\x37\xca\x16\xb5\x9a\xbc\x06"
+    b"\xb8\x80\xa8\x41\x0a\x0e\x2f\x80\x90\x02\x2f\x2d\x50\x48\x0f\x09\x2f\xbf\xa0"
+    b"\x04\x2f\xbf\x90\x06\x2f\xb7\x54\xca\x0f\x03\x2f\x00\x2e\x02\x2c\xb7\x52\x2d"
+    b"\x52\xf2\x33\x98\x2e\xd9\xc0\xfb\x6f\xf1\x37\xc0\x2e\x01\x08\xf0\x5f\xbf\x56"
+    b"\xb9\x54\xd0\x40\xc4\x40\x0b\x2e\xfd\xf3\xbf\x52\x90\x42\x94\x42\x95\x42\x05"
+    b"\x30\xc1\x50\x0f\x88\x06\x40\x04\x41\x96\x42\xc5\x42\x48\xbe\x73\x30\x0d\x2e"
+    b"\xd8\x00\x4f\xba\x84\x42\x03\x42\x81\xb3\x02\x2f\x2b\x2e\x6f\xf5\x06\x2d\x05"
+    b"\x2e\x77\xf7\xbd\x56\x93\x08\x25\x2e\x77\xf7\xbb\x54\x25\x2e\xc2\xf5\x07\x2e"
+    b"\xfd\xf3\x42\x30\xb4\x33\xda\x0a\x4c\x00\x27\x2e\xfd\xf3\x43\x40\xd4\x3f\xdc"
+    b"\x08\x43\x42\x00\x2e\x00\x2e\x43\x40\x24\x30\xdc\x0a\x43\x42\x04\x80\x03\x2e"
+    b"\xfd\xf3\x4a\x0a\x23\x2e\xfd\xf3\x61\x34\xc0\x2e\x01\x42\x00\x2e\x60\x50\x1a"
+    b"\x25\x7a\x86\xe0\x7f\xf3\x7f\x03\x25\xc3\x52\x41\x84\xdb\x7f\x33\x30\x98\x2e"
+    b"\x16\xc2\x1a\x25\x7d\x82\xf0\x6f\xe2\x6f\x32\x25\x16\x40\x94\x40\x26\x01\x85"
+    b"\x40\x8e\x17\xc4\x42\x6e\x03\x95\x42\x41\x0e\xf4\x2f\xdb\x6f\xa0\x5f\xb8\x2e"
+    b"\xb0\x51\xfb\x7f\x98\x2e\xe8\x0d\x5a\x25\x98\x2e\x0f\x0e\xcb\x58\x32\x87\xc4"
+    b"\x7f\x65\x89\x6b\x8d\xc5\x5a\x65\x7f\xe1\x7f\x83\x7f\xa6\x7f\x74\x7f\xd0\x7f"
+    b"\xb6\x7f\x94\x7f\x17\x30\xc7\x52\xc9\x54\x51\x7f\x00\x2e\x85\x6f\x42\x7f\x00"
+    b"\x2e\x51\x41\x45\x81\x42\x41\x13\x40\x3b\x8a\x00\x40\x4b\x04\xd0\x06\xc0\xac"
+    b"\x85\x7f\x02\x2f\x02\x30\x51\x04\xd3\x06\x41\x84\x05\x30\x5d\x02\xc9\x16\xdf"
+    b"\x08\xd3\x00\x8d\x02\xaf\xbc\xb1\xb9\x59\x0a\x65\x6f\x11\x43\xa1\xb4\x52\x41"
+    b"\x53\x41\x01\x43\x34\x7f\x65\x7f\x26\x31\xe5\x6f\xd4\x6f\x98\x2e\x37\xca\x32"
+    b"\x6f\x75\x6f\x83\x40\x42\x41\x23\x7f\x12\x7f\xf6\x30\x40\x25\x51\x25\x98\x2e"
+    b"\x37\xca\x14\x6f\x20\x05\x70\x6f\x25\x6f\x69\x07\xa2\x6f\x31\x6f\x0b\x30\x04"
+    b"\x42\x9b\x42\x8b\x42\x55\x42\x32\x7f\x40\xa9\xc3\x6f\x71\x7f\x02\x30\xd0\x40"
+    b"\xc3\x7f\x03\x2f\x40\x91\x15\x2f\x00\xa7\x13\x2f\x00\xa4\x11\x2f\x84\xbd\x98"
+    b"\x2e\x79\xca\x55\x6f\xb7\x54\x54\x41\x82\x00\xf3\x3f\x45\x41\xcb\x02\xf6\x30"
+    b"\x98\x2e\x37\xca\x35\x6f\xa4\x6f\x41\x43\x03\x2c\x00\x43\xa4\x6f\x35\x6f\x17"
+    b"\x30\x42\x6f\x51\x6f\x93\x40\x42\x82\x00\x41\xc3\x00\x03\x43\x51\x7f\x00\x2e"
+    b"\x94\x40\x41\x41\x4c\x02\xc4\x6f\xd1\x56\x63\x0e\x74\x6f\x51\x43\xa5\x7f\x8a"
+    b"\x2f\x09\x2e\xd8\x00\x01\xb3\x21\x2f\xcb\x58\x90\x6f\x13\x41\xb6\x6f\xe4\x7f"
+    b"\x00\x2e\x91\x41\x14\x40\x92\x41\x15\x40\x17\x2e\x6f\xf5\xb6\x7f\xd0\x7f\xcb"
+    b"\x7f\x98\x2e\x00\x0c\x07\x15\xc2\x6f\x14\x0b\x29\x2e\x6f\xf5\xc3\xa3\xc1\x8f"
+    b"\xe4\x6f\xd0\x6f\xe6\x2f\x14\x30\x05\x2e\x6f\xf5\x14\x0b\x29\x2e\x6f\xf5\x18"
+    b"\x2d\xcd\x56\x04\x32\xb5\x6f\x1c\x01\x51\x41\x52\x41\xc3\x40\xb5\x7f\xe4\x7f"
+    b"\x98\x2e\x1f\x0c\xe4\x6f\x21\x87\x00\x43\x04\x32\xcf\x54\x5a\x0e\xef\x2f\x15"
+    b"\x54\x09\x2e\x77\xf7\x22\x0b\x29\x2e\x77\xf7\xfb\x6f\x50\x5e\xb8\x2e\x10\x50"
+    b"\x01\x2e\xd4\x00\x00\xb2\xfb\x7f\x51\x2f\x01\xb2\x48\x2f\x02\xb2\x42\x2f\x03"
+    b"\x90\x56\x2f\xd7\x52\x79\x80\x42\x40\x81\x84\x00\x40\x42\x42\x98\x2e\x93\x0c"
+    b"\xd9\x54\xd7\x50\xa1\x40\x98\xbd\x82\x40\x3e\x82\xda\x0a\x44\x40\x8b\x16\xe3"
+    b"\x00\x53\x42\x00\x2e\x43\x40\x9a\x02\x52\x42\x00\x2e\x41\x40\x15\x54\x4a\x0e"
+    b"\x3a\x2f\x3a\x82\x00\x30\x41\x40\x21\x2e\x85\x0f\x40\xb2\x0a\x2f\x98\x2e\xb1"
+    b"\x0c\x98\x2e\x45\x0e\x98\x2e\x5b\x0e\xfb\x6f\xf0\x5f\x00\x30\x80\x2e\xce\xb7"
+    b"\xdd\x52\xd3\x54\x42\x42\x4f\x84\x73\x30\xdb\x52\x83\x42\x1b\x30\x6b\x42\x23"
+    b"\x30\x27\x2e\xd7\x00\x37\x2e\xd4\x00\x21\x2e\xd6\x00\x7a\x84\x17\x2c\x42\x42"
+    b"\x30\x30\x21\x2e\xd4\x00\x12\x2d\x21\x30\x00\x30\x23\x2e\xd4\x00\x21\x2e\x7b"
+    b"\xf7\x0b\x2d\x17\x30\x98\x2e\x51\x0c\xd5\x50\x0c\x82\x72\x30\x2f\x2e\xd4\x00"
+    b"\x25\x2e\x7b\xf7\x40\x42\x00\x2e\xfb\x6f\xf0\x5f\xb8\x2e\x70\x50\x0a\x25\x39"
+    b"\x86\xfb\x7f\xe1\x32\x62\x30\x98\x2e\xc2\xc4\xb5\x56\xa5\x6f\xab\x08\x91\x6f"
+    b"\x4b\x08\xdf\x56\xc4\x6f\x23\x09\x4d\xba\x93\xbc\x8c\x0b\xd1\x6f\x0b\x09\xcb"
+    b"\x52\xe1\x5e\x56\x42\xaf\x09\x4d\xba\x23\xbd\x94\x0a\xe5\x6f\x68\xbb\xeb\x08"
+    b"\xbd\xb9\x63\xbe\xfb\x6f\x52\x42\xe3\x0a\xc0\x2e\x43\x42\x90\x5f\xd1\x50\x03"
+    b"\x2e\x25\xf3\x13\x40\x00\x40\x9b\xbc\x9b\xb4\x08\xbd\xb8\xb9\x98\xbc\xda\x0a"
+    b"\x08\xb6\x89\x16\xc0\x2e\x19\x00\x62\x02\x10\x50\xfb\x7f\x98\x2e\x81\x0d\x01"
+    b"\x2e\xd4\x00\x31\x30\x08\x04\xfb\x6f\x01\x30\xf0\x5f\x23\x2e\xd6\x00\x21\x2e"
+    b"\xd7\x00\xb8\x2e\x01\x2e\xd7\x00\x03\x2e\xd6\x00\x48\x0e\x01\x2f\x80\x2e\x1f"
+    b"\x0e\xb8\x2e\xe3\x50\x21\x34\x01\x42\x82\x30\xc1\x32\x25\x2e\x62\xf5\x01\x00"
+    b"\x22\x30\x01\x40\x4a\x0a\x01\x42\xb8\x2e\xe3\x54\xf0\x3b\x83\x40\xd8\x08\xe5"
+    b"\x52\x83\x42\x00\x30\x83\x30\x50\x42\xc4\x32\x27\x2e\x64\xf5\x94\x00\x50\x42"
+    b"\x40\x42\xd3\x3f\x84\x40\x7d\x82\xe3\x08\x40\x42\x83\x42\xb8\x2e\xdd\x52\x00"
+    b"\x30\x40\x42\x7c\x86\xb9\x52\x09\x2e\x70\x0f\xbf\x54\xc4\x42\xd3\x86\x54\x40"
+    b"\x55\x40\x94\x42\x85\x42\x21\x2e\xd7\x00\x42\x40\x25\x2e\xfd\xf3\xc0\x42\x7e"
+    b"\x82\x05\x2e\x7d\x00\x80\xb2\x14\x2f\x05\x2e\x89\x00\x27\xbd\x2f\xb9\x80\x90"
+    b"\x02\x2f\x21\x2e\x6f\xf5\x0c\x2d\x07\x2e\x71\x0f\x14\x30\x1c\x09\x05\x2e\x77"
+    b"\xf7\xbd\x56\x47\xbe\x93\x08\x94\x0a\x25\x2e\x77\xf7\xe7\x54\x50\x42\x4a\x0e"
+    b"\xfc\x2f\xb8\x2e\x50\x50\x02\x30\x43\x86\xe5\x50\xfb\x7f\xe3\x7f\xd2\x7f\xc0"
+    b"\x7f\xb1\x7f\x00\x2e\x41\x40\x00\x40\x48\x04\x98\x2e\x74\xc0\x1e\xaa\xd3\x6f"
+    b"\x14\x30\xb1\x6f\xe3\x22\xc0\x6f\x52\x40\xe4\x6f\x4c\x0e\x12\x42\xd3\x7f\xeb"
+    b"\x2f\x03\x2e\x86\x0f\x40\x90\x11\x30\x03\x2f\x23\x2e\x86\x0f\x02\x2c\x00\x30"
+    b"\xd0\x6f\xfb\x6f\xb0\x5f\xb8\x2e\x40\x50\xf1\x7f\x0a\x25\x3c\x86\xeb\x7f\x41"
+    b"\x33\x22\x30\x98\x2e\xc2\xc4\xd3\x6f\xf4\x30\xdc\x09\x47\x58\xc2\x6f\x94\x09"
+    b"\xeb\x58\x6a\xbb\xdc\x08\xb4\xb9\xb1\xbd\xe9\x5a\x95\x08\x21\xbd\xf6\xbf\x77"
+    b"\x0b\x51\xbe\xf1\x6f\xeb\x6f\x52\x42\x54\x42\xc0\x2e\x43\x42\xc0\x5f\x50\x50"
+    b"\xf5\x50\x31\x30\x11\x42\xfb\x7f\x7b\x30\x0b\x42\x11\x30\x02\x80\x23\x33\x01"
+    b"\x42\x03\x00\x07\x2e\x80\x03\x05\x2e\xd3\x00\x23\x52\xe2\x7f\xd3\x7f\xc0\x7f"
+    b"\x98\x2e\xb6\x0e\xd1\x6f\x08\x0a\x1a\x25\x7b\x86\xd0\x7f\x01\x33\x12\x30\x98"
+    b"\x2e\xc2\xc4\xd1\x6f\x08\x0a\x00\xb2\x0d\x2f\xe3\x6f\x01\x2e\x80\x03\x51\x30"
+    b"\xc7\x86\x23\x2e\x21\xf2\x08\xbc\xc0\x42\x98\x2e\xa5\xb7\x00\x2e\x00\x2e\xd0"
+    b"\x2e\xb0\x6f\x0b\xb8\x03\x2e\x1b\x00\x08\x1a\xb0\x7f\x70\x30\x04\x2f\x21\x2e"
+    b"\x21\xf2\x00\x2e\x00\x2e\xd0\x2e\x98\x2e\x6d\xc0\x98\x2e\x5d\xc0\xed\x50\x98"
+    b"\x2e\x44\xcb\xef\x50\x98\x2e\x46\xc3\xf1\x50\x98\x2e\x53\xc7\x35\x50\x98\x2e"
+    b"\x64\xcf\x10\x30\x98\x2e\xdc\x03\x20\x26\xc0\x6f\x02\x31\x12\x42\xab\x33\x0b"
+    b"\x42\x37\x80\x01\x30\x01\x42\xf3\x37\xf7\x52\xfb\x50\x44\x40\xa2\x0a\x42\x42"
+    b"\x8b\x31\x09\x2e\x5e\xf7\xf9\x54\xe3\x08\x83\x42\x1b\x42\x23\x33\x4b\x00\xbc"
+    b"\x84\x0b\x40\x33\x30\x83\x42\x0b\x42\xe0\x7f\xd1\x7f\x98\x2e\x58\xb7\xd1\x6f"
+    b"\x80\x30\x40\x42\x03\x30\xe0\x6f\xf3\x54\x04\x30\x00\x2e\x00\x2e\x01\x89\x62"
+    b"\x0e\xfa\x2f\x43\x42\x11\x30\xfb\x6f\xc0\x2e\x01\x42\xb0\x5f\xc1\x4a\x00\x00"
+    b"\x6d\x57\x00\x00\x77\x8e\x00\x00\xe0\xff\xff\xff\xd3\xff\xff\xff\xe5\xff\xff"
+    b"\xff\xee\xe1\xff\xff\x7c\x13\x00\x00\x46\xe6\xff\xff\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1"
+    b"\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00"
+    b"\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e"
+    b"\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1"
+    b"\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00"
+    b"\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e"
+    b"\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1"
+    b"\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00"
+    b"\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e"
+    b"\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80\x2e\x00\xc1\x80"
+    b"\x2e\x00\xc1"
+)
+
+
+class BMI270:
+    def __init__(
+        self,
+        bus,
+        cs=None,
+        address=_DEFAULT_ADDR,
+        gyro_odr=100,
+        gyro_scale=2000,
+        accel_odr=100,
+        accel_scale=4,
+        bmm_magnet=None,
+    ):
+        """Initalizes Gyro and Accelerometer.
+        bus: IMU bus
+        address: I2C address (in I2C mode).
+        cs: SPI CS pin (in SPI mode).
+        gyro_odr:  (0.78, 1.5Hz, 3.1Hz, 6.25Hz, 12.5Hz, 25Hz, 50Hz, 100Hz, 200Hz, 400Hz, 800Hz, 1600Hz)
+        gyro_scale:  (125dps, 250dps, 500dps, 1000dps, 2000dps)
+        accel_odr: (0.78, 1.5Hz, 3.1Hz, 6.25Hz, 12.5Hz, 25Hz, 50Hz, 100Hz, 200Hz, 400Hz, 800Hz, 1600Hz)
+        accel_scale: (+/-2g, +/-4g, +/-8g, +-16g)
+        """
+        self.bus = bus
+        self.bmm_magnet = bmm_magnet
+        self.cs = cs
+        self.address = address
+        self._use_i2c = hasattr(self.bus, "readfrom_mem")
+
+        ACCEL_SCALE = (2, 4, 8, 16)
+        GYRO_SCALE = (2000, 1000, 500, 250, 125)
+        ODR = (0.78, 1.5, 3.1, 6.25, 12.5, 25, 50, 100, 200, 400, 800, 1200)
+
+        # Sanity checks
+        if not self._use_i2c:
+            raise ValueError("SPI mode is not supported")
+        if not gyro_odr in ODR:
+            raise ValueError("Invalid gyro sampling rate: %d" % gyro_odr)
+        if not gyro_scale in GYRO_SCALE:
+            raise ValueError("Invalid gyro scaling: %d" % gyro_scale)
+        if not accel_odr in ODR:
+            raise ValueError("Invalid accelerometer sampling rate: %d" % accel_odr)
+        if not accel_scale in ACCEL_SCALE:
+            raise ValueError("Invalid accelerometer scaling: %d" % accel_scale)
+        if self._read_reg(_CHIP_ID) != 0x24:
+            raise OSError("No BMI270 device was found at address 0x%x" % (self.address))
+
+        # Perform initialization sequence.
+        # 0. Soft-reset
+        self._write_reg(_CMD, 0xB6)
+        time.sleep_ms(250)
+
+        # 1. Disable power save mode.
+        self._write_reg(0x7C, 0x00)
+        time.sleep_ms(10)
+
+        # 2. Prepare config load.
+        self._write_reg(0x59, 0x00)
+
+        # 3. Load config data.
+        self._write_burst(0x5E, _CONFIG_DATA)
+
+        # 4. Finish config load.
+        self._write_reg(0x59, 0x01)
+
+        # 5. Check correct initialization status.
+        if not self._poll_reg(_STATUS, 0x01):
+            raise OSError("Init sequence failed")
+
+        # 6. Configure the device in normal power mode
+        # FIFO Reset
+        self._write_reg(_CMD, 0xB0)
+        # Enable accel, gyro and temperature data.
+        self._write_reg(0x7D, 0x0E)
+        # acc_filter_perf | acc_bwp normal mode | ODR
+        self._write_reg(0x40, 0xA | (ODR.index(accel_odr) + 1))
+        # gyr_filter_perf | gyr_bwp normal mode | ODR
+        self._write_reg(0x42, 0xA | (ODR.index(gyro_odr) + 1))
+        # Disable adv_power_save | Enable fifo_self_wakeup.
+        self._write_reg(0x7C, 0x02)
+
+        # Set accelerometer scale and range.
+        self.accel_scale = 32768 / accel_scale
+        self._write_reg(0x41, ACCEL_SCALE.index(accel_scale))
+
+        # Set gyroscope scale and range.
+        self.gyro_scale = 32768 / gyro_scale
+        self._write_reg(0x43, GYRO_SCALE.index(gyro_scale))
+
+        # Allocate scratch buffer and set scale.
+        self.scratch = memoryview(array.array("h", [0, 0, 0]))
+
+    def _read_reg(self, reg, size=1):
+        buf = self.bus.readfrom_mem(self.address, reg, size)
+        if size == 1:
+            return int(buf[0])
+        return buf
+
+    def _read_reg_into(self, reg, buf):
+        self.bus.readfrom_mem_into(self.address, reg, buf)
+
+    def _write_reg(self, reg, val):
+        if isinstance(val, int):
+            val = bytes([val])
+        self.bus.writeto_mem(self.address, reg, val)
+        time.sleep_ms(1)
+
+    def _write_burst(self, reg, data, chunk=16):
+        self._write_reg(_INIT_ADDR_0, 0)
+        self._write_reg(_INIT_ADDR_1, 0)
+        for i in range(0, len(data) // chunk):
+            offs = i * chunk
+            self._write_reg(reg, data[offs : offs + chunk])
+            init_addr = ((i + 1) * chunk) // 2
+            self._write_reg(_INIT_ADDR_0, (init_addr & 0x0F))
+            self._write_reg(_INIT_ADDR_1, (init_addr >> 4) & 0xFF)
+
+    def _poll_reg(self, reg, mask, retry=10, delay=100):
+        for i in range(0, retry):
+            if self._read_reg(reg) & mask:
+                return True
+            time.sleep_ms(delay)
+        return False
+
+    def reset(self):
+        self._write_reg(_CMD, 0xB6)
+
+    def gyro(self):
+        """Returns gyroscope vector in degrees/sec."""
+        f = self.gyro_scale
+        self._read_reg_into(_DATA_14, self.scratch)
+        return (self.scratch[0] / f, self.scratch[1] / f, self.scratch[2] / f)
+
+    def accel(self):
+        """Returns acceleration vector in gravity units (9.81m/s^2)."""
+        f = self.accel_scale
+        self._read_reg_into(_DATA_8, self.scratch)
+        return (self.scratch[0] / f, self.scratch[1] / f, self.scratch[2] / f)
+
+    def magnet(self):
+        """Returns magnetometer vector."""
+        if self.bmm_magnet is not None:
+            return self.bmm_magnet.magnet()
+        return (0.0, 0.0, 0.0)
diff --git a/micropython/drivers/imu/bmi270/manifest.py b/micropython/drivers/imu/bmi270/manifest.py
new file mode 100644
index 000000000..2d89bfe9d
--- /dev/null
+++ b/micropython/drivers/imu/bmi270/manifest.py
@@ -0,0 +1,2 @@
+metadata(description="BOSCH BMI270 IMU driver.", version="1.0.0")
+module("bmi270.py", opt=3)

From e3371bef6cd5be364f01508e3f0ece09a91c188c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 29 Dec 2022 11:47:06 +0100
Subject: [PATCH 144/343] bmm150: Add new magnetometer driver.

For the BOSCH BMM150 magnetometer.
---
 micropython/drivers/imu/bmm150/bmm150.py   | 187 +++++++++++++++++++++
 micropython/drivers/imu/bmm150/manifest.py |   2 +
 2 files changed, 189 insertions(+)
 create mode 100644 micropython/drivers/imu/bmm150/bmm150.py
 create mode 100644 micropython/drivers/imu/bmm150/manifest.py

diff --git a/micropython/drivers/imu/bmm150/bmm150.py b/micropython/drivers/imu/bmm150/bmm150.py
new file mode 100644
index 000000000..12220f643
--- /dev/null
+++ b/micropython/drivers/imu/bmm150/bmm150.py
@@ -0,0 +1,187 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+
+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.
+
+Basic example usage:
+
+import time
+from bmm150 import BMM150
+from machine import Pin, SPI, I2C
+
+# Init in I2C mode.
+imu = BMM150(I2C(1, scl=Pin(15), sda=Pin(14)))
+
+# Or init in SPI mode.
+# TODO: Not supported yet.
+# imu = BMM150(SPI(5), cs=Pin(10))
+
+while (True):
+    print('magnetometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*imu.magnet()))
+    time.sleep_ms(100)
+"""
+
+import array
+import time
+from micropython import const
+
+_DEFAULT_ADDR = const(0x10)
+_CHIP_ID = const(0x40)
+_DATA = const(0x42)
+_POWER = const(0x4B)
+_OPMODE = const(0x4C)
+_INT_STATUS = const(0x4A)
+_TRIM_X1 = const(0x5D)
+_TRIM_Y1 = const(0x5E)
+_TRIM_Z4_LSB = const(0x62)
+_TRIM_Z2_LSB = const(0x68)
+_XYAXES_FLIP = const(-4096)
+_ZHAXES_FLIP = const(-16384)
+_ODR = const((10, 2, 6, 8, 15, 20, 25, 30))
+
+
+class BMM150:
+    def __init__(
+        self,
+        bus,
+        cs=None,
+        address=_DEFAULT_ADDR,
+        magnet_odr=30,
+    ):
+        """Initalizes the Magnetometer.
+        bus: IMU bus
+        address: I2C address (in I2C mode).
+        cs: SPI CS pin (in SPI mode).
+        magnet_odr: (2, 6, 8, 10, 15, 20, 25, 30)
+        """
+        self.bus = bus
+        self.cs = cs
+        self.address = address
+        self._use_i2c = hasattr(self.bus, "readfrom_mem")
+
+        # Sanity checks
+        if not self._use_i2c:
+            raise ValueError("SPI mode is not supported")
+        if not magnet_odr in _ODR:
+            raise ValueError("Invalid sampling rate: %d" % magnet_odr)
+
+        # Perform soft reset, and power on.
+        self._write_reg(_POWER, 0x83)
+        time.sleep_ms(10)
+
+        if self._read_reg(_CHIP_ID) != 0x32:
+            raise OSError("No BMM150 device was found at address 0x%x" % (self.address))
+
+        # Configure the device.
+        # ODR | OP: Normal mode
+        self._write_reg(_OPMODE, _ODR.index(magnet_odr) << 3)
+
+        # Read trim registers.
+        trim_x1y1 = self._read_reg(_TRIM_X1, 2)
+        trim_xyz_data = self._read_reg(_TRIM_Z4_LSB, 4)
+        trim_xy1xy2 = self._read_reg(_TRIM_Z2_LSB, 10)
+
+        self.trim_x1 = trim_x1y1[0]
+        self.trim_y1 = trim_x1y1[1]
+        self.trim_x2 = trim_xyz_data[2]
+        self.trim_y2 = trim_xyz_data[3]
+        self.trim_z1 = (trim_xy1xy2[3] << 8) | trim_xy1xy2[2]
+        self.trim_z2 = (trim_xy1xy2[1] << 8) | trim_xy1xy2[0]
+        self.trim_z3 = (trim_xy1xy2[7] << 8) | trim_xy1xy2[6]
+        self.trim_z4 = (trim_xyz_data[1] << 8) | trim_xyz_data[0]
+        self.trim_xy1 = trim_xy1xy2[9]
+        self.trim_xy2 = trim_xy1xy2[8]
+        self.trim_xyz1 = ((trim_xy1xy2[5] & 0x7F) << 8) | trim_xy1xy2[4]
+
+        # Allocate scratch buffer.
+        self.scratch = memoryview(array.array("h", [0, 0, 0, 0]))
+
+    def _read_reg(self, reg, size=1):
+        buf = self.bus.readfrom_mem(self.address, reg, size)
+        if size == 1:
+            return int(buf[0])
+        return buf
+
+    def _read_reg_into(self, reg, buf):
+        self.bus.readfrom_mem_into(self.address, reg, buf)
+
+    def _write_reg(self, reg, val):
+        self.bus.writeto_mem(self.address, reg, bytes([val]))
+
+    def _compensate_x(self, raw, hall):
+        """Compensation equation ported from C driver"""
+        x = 0
+        if raw != _XYAXES_FLIP:
+            x0 = self.trim_xyz1 * 16384 / hall
+            x = x0 - 16384
+            x1 = (self.trim_xy2) * (x**2 / 268435456)
+            x2 = x1 + x * (self.trim_xy1) / 16384
+            x3 = (self.trim_x2) + 160
+            x4 = raw * ((x2 + 256) * x3)
+            x = ((x4 / 8192) + (self.trim_x1 * 8)) / 16
+        return x
+
+    def _compensate_y(self, raw, hall):
+        """Compensation equation ported from C driver"""
+        y = 0
+        if raw != _XYAXES_FLIP:
+            y0 = self.trim_xyz1 * 16384 / hall
+            y = y0 - 16384
+            y1 = self.trim_xy2 * (y**2 / 268435456)
+            y2 = y1 + y * self.trim_xy1 / 16384
+            y3 = self.trim_y2 + 160
+            y4 = raw * ((y2 + 256) * y3)
+            y = ((y4 / 8192) + (self.trim_y1 * 8)) / 16
+        return y
+
+    def _compensate_z(self, raw, hall):
+        """Compensation equation ported from C driver"""
+        z = 0
+        if raw != _ZHAXES_FLIP:
+            z0 = raw - self.trim_z4
+            z1 = hall - self.trim_xyz1
+            z2 = self.trim_z3 * z1
+            z3 = (self.trim_z1 * hall) / 32768
+            z4 = self.trim_z2 + z3
+            z5 = (z0 * 131072) - z2
+            z = (z5 / (z4 * 4)) / 16
+        return z
+
+    def reset(self):
+        self._write_reg(_CMD, 0xB6)
+
+    def magnet_raw(self):
+        for i in range(0, 10):
+            self._read_reg_into(_DATA, self.scratch)
+            if self.scratch[3] & 0x1:
+                return (
+                    self.scratch[0] >> 3,
+                    self.scratch[1] >> 3,
+                    self.scratch[2] >> 1,
+                    self.scratch[3] >> 2,
+                )
+            time.sleep_ms(30)
+        raise OSError("Data not ready")
+
+    def magnet(self):
+        """Returns magnetometer vector."""
+        x, y, z, h = self.magnet_raw()
+        return (self._compensate_x(x, h), self._compensate_y(y, h), self._compensate_z(z, h))
diff --git a/micropython/drivers/imu/bmm150/manifest.py b/micropython/drivers/imu/bmm150/manifest.py
new file mode 100644
index 000000000..e9c7cf66b
--- /dev/null
+++ b/micropython/drivers/imu/bmm150/manifest.py
@@ -0,0 +1,2 @@
+metadata(description="BOSCH BMM150 magnetometer driver.", version="1.0.0")
+module("bmm150.py", opt=3)

From 23018a86bfb1f3f590dd7cddfd0467eef1062166 Mon Sep 17 00:00:00 2001
From: Gavin Douch <gavin.douch@planetinnovation.com.au>
Date: Thu, 16 Feb 2023 11:40:58 +1100
Subject: [PATCH 145/343] unittest: Add subtest usage examples.

This work was funded by Planet Innovation.
---
 .../unittest/examples/example_subtest.py      | 214 ++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100644 python-stdlib/unittest/examples/example_subtest.py

diff --git a/python-stdlib/unittest/examples/example_subtest.py b/python-stdlib/unittest/examples/example_subtest.py
new file mode 100644
index 000000000..558af0b26
--- /dev/null
+++ b/python-stdlib/unittest/examples/example_subtest.py
@@ -0,0 +1,214 @@
+"""Tests using unittest.subtest as an example reference for how it is used"""
+
+import unittest
+
+
+def factorial(value: int) -> int:
+    """Iterative factorial algorithm implementation"""
+    result = 1
+
+    for i in range(1, value + 1):
+        result *= i
+
+    return result
+
+
+class Person:
+    """Represents a person with a name, age, and who can make friends"""
+
+    def __init__(self, name: str, age: int) -> None:
+        self.name = name
+        self.age = age
+        self.friends = set()
+
+    def __repr__(self) -> str:
+        return f"Person({self.name})"
+
+    def add_friend(self, friend):
+        """Logs that this Person has made a new friend"""
+        self.friends.add(friend)
+
+    def has_friend(self, friend_candidate) -> bool:
+        """Determines if this Person has the friend `friend_candidate`"""
+        return friend_candidate in self.friends
+
+    def is_oldest_friend(self) -> bool:
+        """Determines whether this Person is the oldest out of themself and their friends"""
+        return self.age > max(friend.age for friend in self.friends)
+
+
+class TestSubtest(unittest.TestCase):
+    """Examples/tests of unittest.subTest()"""
+
+    def test_sorted(self) -> None:
+        """Test that the selection sort function correctly sorts lists"""
+        tests = [
+            {
+                "unsorted": [-68, 15, 52, -54, -64, 20, 2, 66, 33],
+                "sorted": [-68, -64, -54, 2, 15, 20, 33, 52, 66],
+                "correct": True,
+            },
+            {
+                "unsorted": [-68, 15, 52, -54, -64, 20, 2, 66, 33],
+                "sorted": [-68, -54, -64, 2, 15, 20, 33, 52, 66],
+                "correct": False,
+            },
+            {
+                "unsorted": [-68, 15, 52, 54, -64, 20, 2, 66, 33],
+                "sorted": [-68, -64, -54, 2, 15, 20, 33, 52, 66],
+                "correct": False,
+            },
+            {
+                "unsorted": [],
+                "sorted": [],
+                "correct": True,
+            },
+            {
+                "unsorted": [42],
+                "sorted": [42],
+                "correct": True,
+            },
+            {
+                "unsorted": [42],
+                "sorted": [],
+                "correct": False,
+            },
+            {
+                "unsorted": [],
+                "sorted": [24],
+                "correct": False,
+            },
+            {
+                "unsorted": [43, 44],
+                "sorted": [43, 44],
+                "correct": True,
+            },
+            {
+                "unsorted": [44, 43],
+                "sorted": [43, 44],
+                "correct": True,
+            },
+        ]
+
+        for test in tests:
+            with self.subTest():  # Subtests continue to be tested, even if an earlier one fails
+                if test["correct"]:  # Tests that match what is expected
+                    self.assertEqual(sorted(test["unsorted"]), test["sorted"])
+                else:  # Tests that are meant to fail
+                    with self.assertRaises(AssertionError):
+                        self.assertEqual(sorted(test["unsorted"]), test["sorted"])
+
+    def test_factorial(self) -> None:
+        """Test that the factorial fuction correctly calculates factorials
+
+        Makes use of `msg` argument in subtest method to clarify which subtests had an
+        error in the results
+        """
+        tests = [
+            {
+                "operand": 0,
+                "result": 1,
+                "correct": True,
+            },
+            {
+                "operand": 1,
+                "result": 1,
+                "correct": True,
+            },
+            {
+                "operand": 1,
+                "result": 0,
+                "correct": False,
+            },
+            {
+                "operand": 2,
+                "result": 2,
+                "correct": True,
+            },
+            {
+                "operand": 3,
+                "result": 6,
+                "correct": True,
+            },
+            {
+                "operand": 3,
+                "result": -6,
+                "correct": False,
+            },
+            {
+                "operand": 4,
+                "result": 24,
+                "correct": True,
+            },
+            {
+                "operand": 15,
+                "result": 1_307_674_368_000,
+                "correct": True,
+            },
+            {
+                "operand": 15,
+                "result": 1_307_674_368_001,
+                "correct": False,
+            },
+            {
+                "operand": 11,
+                "result": 39_916_800,
+                "correct": True,
+            },
+        ]
+
+        for test in tests:
+            with self.subTest(
+                f"{test['operand']}!"
+            ):  # Let's us know we were testing "x!" when we get an error
+                if test["correct"]:
+                    self.assertEqual(factorial(test["operand"]), test["result"])
+                else:
+                    with self.assertRaises(AssertionError):
+                        self.assertEqual(factorial(test["operand"]), test["result"])
+
+    def test_person(self) -> None:
+        """Test the Person class and its friend-making ability
+
+        Makes use of subtest's params to specify relevant data about the tests, which is
+        helpful for debugging
+        """
+        # Create a friendship
+        alice = Person("Alice", 22)
+        bob = Person("Bob", 23)
+        alice.add_friend(bob)
+
+        # Test friendship init
+        with self.subTest(
+            "Alice should have Bob as a friend", name=alice.name, friends=bob.friends
+        ):  # Params `name` and `friends` provide useful data for debugging purposes
+            self.assertTrue(alice.has_friend(bob))
+
+        with self.subTest(
+            "Bob should not have Alice as a friend", name=bob.name, friends=bob.friends
+        ):
+            self.assertFalse(bob.has_friend(alice))
+
+        # Friendship is not always  commutative, so Bob is not implicitly friends with Alice
+        with self.subTest("Alice and Bob should not both be friends with eachother"):
+            with self.assertRaises(AssertionError):
+                self.assertTrue(bob.has_friend(alice) and alice.has_friend(bob))
+
+        # Bob becomes friends with Alice
+        bob.add_friend(alice)
+
+        with self.subTest(
+            "Bob should now have Alice as a friend", name=bob.name, friends=bob.friends
+        ):
+            self.assertTrue(bob.has_friend(alice))
+
+        with self.subTest(
+            "Bob should be the oldest of his friends",
+            age=bob.age,
+            friend_ages=[friend.age for friend in bob.friends],
+        ):  # Different params can be used for different subtests in the same test
+            self.assertTrue(bob.is_oldest_friend())
+
+
+if __name__ == "__main__":
+    unittest.main()

From 78900afca5ebf3d9096cd9725d235e7d254c5788 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <37907774+FlantasticDan@users.noreply.github.com>
Date: Wed, 15 Feb 2023 22:51:24 -0800
Subject: [PATCH 146/343] aioble: Add short name support to scan results.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/bluetooth/aioble-central/manifest.py | 2 +-
 micropython/bluetooth/aioble/aioble/central.py   | 5 +++--
 micropython/bluetooth/aioble/manifest.py         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/micropython/bluetooth/aioble-central/manifest.py b/micropython/bluetooth/aioble-central/manifest.py
index beec50460..128c90642 100644
--- a/micropython/bluetooth/aioble-central/manifest.py
+++ b/micropython/bluetooth/aioble-central/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/aioble/central.py b/micropython/bluetooth/aioble/aioble/central.py
index 46da907a7..adfc9729e 100644
--- a/micropython/bluetooth/aioble/aioble/central.py
+++ b/micropython/bluetooth/aioble/aioble/central.py
@@ -33,6 +33,7 @@
 
 _ADV_TYPE_FLAGS = const(0x01)
 _ADV_TYPE_NAME = const(0x09)
+_ADV_TYPE_SHORT_NAME = const(0x08)
 _ADV_TYPE_UUID16_INCOMPLETE = const(0x2)
 _ADV_TYPE_UUID16_COMPLETE = const(0x3)
 _ADV_TYPE_UUID32_INCOMPLETE = const(0x4)
@@ -187,9 +188,9 @@ def _decode_field(self, *adv_type):
                     yield payload[i + 2 : i + payload[i] + 1]
                 i += 1 + payload[i]
 
-    # Returns the value of the advertised name, otherwise empty string.
+    # Returns the value of the complete (or shortened) advertised name, if available.
     def name(self):
-        for n in self._decode_field(_ADV_TYPE_NAME):
+        for n in self._decode_field(_ADV_TYPE_NAME, _ADV_TYPE_SHORT_NAME):
             return str(n, "utf-8") if n else ""
 
     # Generator that enumerates the service UUIDs that are advertised.
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index a1463ca08..071e81814 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From 52fcb8e4a75f714997fbf72425d6dfaee08a125e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 29 Nov 2022 12:50:20 +0100
Subject: [PATCH 147/343] cbor2: Add cbor2 library.

This aims to follow the API of the cbor2 library found at
https://github.com/agronholm/cbor2 (also on PyPI as cbor2).

The original source for this MicroPython version of cbor2 is from
https://github.com/kpn-iot/senml-micropython-library.
---
 python-ecosys/cbor2/cbor2/__init__.py     |  28 +++
 python-ecosys/cbor2/cbor2/decoder.py      | 262 ++++++++++++++++++++++
 python-ecosys/cbor2/cbor2/encoder.py      | 184 +++++++++++++++
 python-ecosys/cbor2/examples/cbor_test.py |  39 ++++
 python-ecosys/cbor2/manifest.py           |   3 +
 5 files changed, 516 insertions(+)
 create mode 100644 python-ecosys/cbor2/cbor2/__init__.py
 create mode 100644 python-ecosys/cbor2/cbor2/decoder.py
 create mode 100644 python-ecosys/cbor2/cbor2/encoder.py
 create mode 100644 python-ecosys/cbor2/examples/cbor_test.py
 create mode 100644 python-ecosys/cbor2/manifest.py

diff --git a/python-ecosys/cbor2/cbor2/__init__.py b/python-ecosys/cbor2/cbor2/__init__.py
new file mode 100644
index 000000000..40114d8b2
--- /dev/null
+++ b/python-ecosys/cbor2/cbor2/__init__.py
@@ -0,0 +1,28 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from . import decoder
+from . import encoder
diff --git a/python-ecosys/cbor2/cbor2/decoder.py b/python-ecosys/cbor2/cbor2/decoder.py
new file mode 100644
index 000000000..2460d87a0
--- /dev/null
+++ b/python-ecosys/cbor2/cbor2/decoder.py
@@ -0,0 +1,262 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+import uio
+import ustruct as struct
+
+
+class CBORDecodeError(Exception):
+    """Raised when an error occurs deserializing a CBOR datastream."""
+
+
+break_marker = object()
+
+
+class CBORSimpleValue(object):
+    """
+    Represents a CBOR "simple value".
+    :param int value: the value (0-255)
+    """
+
+    def __init__(self, value):
+        if value < 0 or value > 255:
+            raise TypeError("simple value too big")
+        self.value = value
+
+    def __eq__(self, other):
+        if isinstance(other, CBORSimpleValue):
+            return self.value == other.value
+        elif isinstance(other, int):
+            return self.value == other
+        return NotImplemented
+
+    def __repr__(self):
+        return "CBORSimpleValue({self.value})".format(self=self)
+
+
+def decode_uint(decoder, subtype, allow_indefinite=False):
+    # Major tag 0
+    if subtype < 24:
+        return subtype
+    elif subtype == 24:
+        return struct.unpack(">B", decoder.read(1))[0]
+    elif subtype == 25:
+        return struct.unpack(">H", decoder.read(2))[0]
+    elif subtype == 26:
+        return struct.unpack(">L", decoder.read(4))[0]
+    elif subtype == 27:
+        return struct.unpack(">Q", decoder.read(8))[0]
+    elif subtype == 31 and allow_indefinite:
+        return None
+    else:
+        raise CBORDecodeError("unknown unsigned integer subtype 0x%x" % subtype)
+
+
+def decode_negint(decoder, subtype):
+    # Major tag 1
+    uint = decode_uint(decoder, subtype)
+    return -uint - 1
+
+
+def decode_bytestring(decoder, subtype):
+    # Major tag 2
+    length = decode_uint(decoder, subtype, allow_indefinite=True)
+    if length is None:
+        # Indefinite length
+        buf = bytearray()
+        while True:
+            initial_byte = decoder.read(1)[0]
+            if initial_byte == 255:
+                return buf
+            else:
+                length = decode_uint(decoder, initial_byte & 31)
+                value = decoder.read(length)
+                buf.extend(value)
+    else:
+        return decoder.read(length)
+
+
+def decode_string(decoder, subtype):
+    # Major tag 3
+    return decode_bytestring(decoder, subtype).decode("utf-8")
+
+
+def decode_array(decoder, subtype):
+    # Major tag 4
+    items = []
+    length = decode_uint(decoder, subtype, allow_indefinite=True)
+    if length is None:
+        # Indefinite length
+        while True:
+            value = decoder.decode()
+            if value is break_marker:
+                break
+            else:
+                items.append(value)
+    else:
+        for _ in range(length):
+            item = decoder.decode()
+            items.append(item)
+    return items
+
+
+def decode_map(decoder, subtype):
+    # Major tag 5
+    dictionary = {}
+    length = decode_uint(decoder, subtype, allow_indefinite=True)
+    if length is None:
+        # Indefinite length
+        while True:
+            key = decoder.decode()
+            if key is break_marker:
+                break
+            else:
+                value = decoder.decode()
+                dictionary[key] = value
+    else:
+        for _ in range(length):
+            key = decoder.decode()
+            value = decoder.decode()
+            dictionary[key] = value
+
+    return dictionary
+
+
+def decode_special(decoder, subtype):
+    # Simple value
+    if subtype < 20:
+        return CBORSimpleValue(subtype)
+
+    # Major tag 7
+    return special_decoders[subtype](decoder)
+
+
+def decode_simple_value(decoder):
+    return CBORSimpleValue(struct.unpack(">B", decoder.read(1))[0])
+
+
+def decode_float16(decoder):
+    payload = decoder.read(2)
+    return unpack_float16(payload)
+
+
+def decode_float32(decoder):
+    return struct.unpack(">f", decoder.read(4))[0]
+
+
+def decode_float64(decoder):
+    return struct.unpack(">d", decoder.read(8))[0]
+
+
+major_decoders = {
+    0: decode_uint,
+    1: decode_negint,
+    2: decode_bytestring,
+    3: decode_string,
+    4: decode_array,
+    5: decode_map,
+    7: decode_special,
+}
+
+special_decoders = {
+    20: lambda self: False,
+    21: lambda self: True,
+    22: lambda self: None,
+    23: lambda self: undefined,
+    24: decode_simple_value,
+    25: decode_float16,
+    26: decode_float32,
+    27: decode_float64,
+    31: lambda self: break_marker,
+}
+
+
+class CBORDecoder(object):
+    """
+    Deserializes a CBOR encoded byte stream.
+    """
+
+    def __init__(self, fp):
+        self.fp = fp
+
+    def read(self, amount):
+        """
+        Read bytes from the data stream.
+        :param int amount: the number of bytes to read
+        """
+        data = self.fp.read(amount)
+        if len(data) < amount:
+            raise CBORDecodeError(
+                "premature end of stream (expected to read {} bytes, got {} "
+                "instead)".format(amount, len(data))
+            )
+
+        return data
+
+    def decode(self):
+        """
+        Decode the next value from the stream.
+        :raises CBORDecodeError: if there is any problem decoding the stream
+        """
+        try:
+            initial_byte = self.fp.read(1)[0]
+            major_type = initial_byte >> 5
+            subtype = initial_byte & 31
+        except Exception as e:
+            raise CBORDecodeError(
+                "error reading major type at index {}: {}".format(self.fp.tell(), e)
+            )
+
+        decoder = major_decoders[major_type]
+        try:
+            return decoder(self, subtype)
+        except CBORDecodeError:
+            raise
+        except Exception as e:
+            raise CBORDecodeError(
+                "error decoding value {}".format(e)
+            )  # tell doesn't work on micropython at the moment
+
+
+def loads(payload, **kwargs):
+    """
+    Deserialize an object from a bytestring.
+    :param bytes payload: the bytestring to serialize
+    :param kwargs: keyword arguments passed to :class:`~.CBORDecoder`
+    :return: the deserialized object
+    """
+    fp = uio.BytesIO(payload)
+    return CBORDecoder(fp, **kwargs).decode()
+
+
+def load(fp, **kwargs):
+    """
+    Deserialize an object from an open file.
+    :param fp: the input file (any file-like object)
+    :param kwargs: keyword arguments passed to :class:`~.CBORDecoder`
+    :return: the deserialized object
+    """
+    return CBORDecoder(fp, **kwargs).decode()
diff --git a/python-ecosys/cbor2/cbor2/encoder.py b/python-ecosys/cbor2/cbor2/encoder.py
new file mode 100644
index 000000000..436886876
--- /dev/null
+++ b/python-ecosys/cbor2/cbor2/encoder.py
@@ -0,0 +1,184 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+import uio
+import math
+import ustruct as struct
+
+
+class CBOREncodeError(Exception):
+    """Raised when an error occurs while serializing an object into a CBOR datastream."""
+
+
+def encode_length(major_tag, length):
+    if length < 24:
+        return struct.pack(">B", major_tag | length)
+    elif length < 256:
+        return struct.pack(">BB", major_tag | 24, length)
+    elif length < 65536:
+        return struct.pack(">BH", major_tag | 25, length)
+    elif length < 4294967296:
+        return struct.pack(">BL", major_tag | 26, length)
+    else:
+        return struct.pack(">BQ", major_tag | 27, length)
+
+
+def encode_semantic(encoder, tag, value):
+    encoder.write(encode_length(0xC0, tag))
+    encoder.encode(value)
+
+
+def encode_float(encoder, value):
+    # Handle special values efficiently
+    import math
+
+    if math.isnan(value):
+        encoder.write(b"\xf9\x7e\x00")
+    elif math.isinf(value):
+        encoder.write(b"\xf9\x7c\x00" if value > 0 else b"\xf9\xfc\x00")
+    else:
+        encoder.write(struct.pack(">Bd", 0xFB, value))
+
+
+def encode_int(encoder, value):
+    # Big integers (2 ** 64 and over)
+    if value >= 18446744073709551616 or value < -18446744073709551616:
+        if value >= 0:
+            major_type = 0x02
+        else:
+            major_type = 0x03
+            value = -value - 1
+
+        values = []
+        while value > 0:
+            value, remainder = divmod(value, 256)
+            values.insert(0, remainder)
+
+        payload = bytes(values)
+        encode_semantic(encoder, major_type, payload)
+    elif value >= 0:
+        encoder.write(encode_length(0, value))
+    else:
+        encoder.write(encode_length(0x20, abs(value) - 1))
+
+
+def encode_bytestring(encoder, value):
+    encoder.write(encode_length(0x40, len(value)) + value)
+
+
+def encode_bytearray(encoder, value):
+    encode_bytestring(encoder, bytes(value))
+
+
+def encode_string(encoder, value):
+    encoded = value.encode("utf-8")
+    encoder.write(encode_length(0x60, len(encoded)) + encoded)
+
+
+def encode_map(encoder, value):
+    encoder.write(encode_length(0xA0, len(value)))
+    for key, val in value.items():
+        encoder.encode(key)
+        encoder.encode(val)
+
+
+def encode_array(encoder, value):
+    encoder.write(encode_length(0x80, len(value)))
+    for item in value:
+        encoder.encode(item)
+
+
+def encode_boolean(encoder, value):
+    encoder.write(b"\xf5" if value else b"\xf4")
+
+
+def encode_none(encoder, value):
+    encoder.write(b"\xf6")
+
+
+cbor_encoders = {  # supported data types and the encoder to use.
+    bytes: encode_bytestring,
+    bytearray: encode_bytearray,
+    str: encode_string,
+    int: encode_int,
+    float: encode_float,
+    bool: encode_boolean,
+    type(None): encode_none,
+    list: encode_array,
+    dict: encode_map,
+}
+
+
+class CBOREncoder(object):
+    """
+    Serializes objects to a byte stream using Concise Binary Object Representation.
+    """
+
+    def __init__(self, fp):
+        self.fp = fp
+
+    def _find_encoder(self, obj):
+        return cbor_encoders[type(obj)]
+
+    def write(self, data):
+        """
+        Write bytes to the data stream.
+        :param data: the bytes to write
+        """
+        self.fp.write(data)
+
+    def encode(self, obj):
+        """
+        Encode the given object using CBOR.
+        :param obj: the object to encode
+        """
+        encoder = self._find_encoder(obj)
+        if not encoder:
+            raise CBOREncodeError("cannot serialize type %s" % type(obj))
+        encoder(self, obj)
+
+
+def dumps(obj, **kwargs):
+    """
+    Serialize an object to a bytestring.
+    :param obj: the object to serialize
+    :param kwargs: keyword arguments passed to :class:`~.CBOREncoder`
+    :return: the serialized output
+    :rtype: bytes
+    """
+    fp = uio.BytesIO()
+    dump(obj, fp, **kwargs)
+    return fp.getvalue()
+
+
+def dump(obj, fp, **kwargs):
+    """
+    Serialize an object to a file.
+    :param obj: the object to serialize
+    :param fp: a file-like object
+    :param kwargs: keyword arguments passed to :class:`~.CBOREncoder`
+    """
+    CBOREncoder(fp, **kwargs).encode(obj)
diff --git a/python-ecosys/cbor2/examples/cbor_test.py b/python-ecosys/cbor2/examples/cbor_test.py
new file mode 100644
index 000000000..79ae6089e
--- /dev/null
+++ b/python-ecosys/cbor2/examples/cbor_test.py
@@ -0,0 +1,39 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from cbor2 import encoder
+from cbor2 import decoder
+
+input = [
+    {"bn": "urn:dev:ow:10e2073a01080063", "u": "Cel", "t": 1.276020076e09, "v": 23.5},
+    {"u": "Cel", "t": 1.276020091e09, "v": 23.6},
+]
+
+data = encoder.dumps(input)
+print(data)
+print(data.hex())
+text = decoder.loads(data)
+print(text)
diff --git a/python-ecosys/cbor2/manifest.py b/python-ecosys/cbor2/manifest.py
new file mode 100644
index 000000000..5a7ff9dc9
--- /dev/null
+++ b/python-ecosys/cbor2/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0")
+
+package("cbor2")

From 9ee02576cb1e1c6f9c7bcc226f511c031ef3f35d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Sep 2022 12:52:18 +0200
Subject: [PATCH 148/343] senml: Add SenML library.

This is a new library that doesn't follow any existing API.

The library is originally from
https://github.com/kpn-iot/senml-micropython-library.
---
 micropython/senml/README.md                   |  12 +
 micropython/senml/docs/_config.yml            |   1 +
 micropython/senml/docs/index.md               |  13 +
 micropython/senml/docs/senml_base.md          |   8 +
 micropython/senml/docs/senml_pack.md          | 216 +++++++++++
 micropython/senml/docs/senml_record.md        |  86 +++++
 micropython/senml/docs/senml_unit.md          | 183 +++++++++
 micropython/senml/examples/actuator.py        |  67 ++++
 micropython/senml/examples/base.py            |  47 +++
 micropython/senml/examples/basic.py           |  39 ++
 micropython/senml/examples/basic2.py          |  45 +++
 micropython/senml/examples/basic_cbor.py      |  42 ++
 micropython/senml/examples/custom_record.py   | 133 +++++++
 micropython/senml/examples/gateway.py         |  50 +++
 .../senml/examples/gateway_actuators.py       |  75 ++++
 .../senml/examples/supported_data_types.py    |  53 +++
 micropython/senml/manifest.py                 |   5 +
 micropython/senml/senml/__init__.py           |  30 ++
 micropython/senml/senml/senml_base.py         |  30 ++
 micropython/senml/senml/senml_pack.py         | 360 ++++++++++++++++++
 micropython/senml/senml/senml_record.py       | 245 ++++++++++++
 micropython/senml/senml/senml_unit.py         |  89 +++++
 22 files changed, 1829 insertions(+)
 create mode 100644 micropython/senml/README.md
 create mode 100644 micropython/senml/docs/_config.yml
 create mode 100644 micropython/senml/docs/index.md
 create mode 100644 micropython/senml/docs/senml_base.md
 create mode 100644 micropython/senml/docs/senml_pack.md
 create mode 100644 micropython/senml/docs/senml_record.md
 create mode 100644 micropython/senml/docs/senml_unit.md
 create mode 100644 micropython/senml/examples/actuator.py
 create mode 100644 micropython/senml/examples/base.py
 create mode 100644 micropython/senml/examples/basic.py
 create mode 100644 micropython/senml/examples/basic2.py
 create mode 100644 micropython/senml/examples/basic_cbor.py
 create mode 100644 micropython/senml/examples/custom_record.py
 create mode 100644 micropython/senml/examples/gateway.py
 create mode 100644 micropython/senml/examples/gateway_actuators.py
 create mode 100644 micropython/senml/examples/supported_data_types.py
 create mode 100644 micropython/senml/manifest.py
 create mode 100644 micropython/senml/senml/__init__.py
 create mode 100644 micropython/senml/senml/senml_base.py
 create mode 100644 micropython/senml/senml/senml_pack.py
 create mode 100644 micropython/senml/senml/senml_record.py
 create mode 100644 micropython/senml/senml/senml_unit.py

diff --git a/micropython/senml/README.md b/micropython/senml/README.md
new file mode 100644
index 000000000..9b79cbf67
--- /dev/null
+++ b/micropython/senml/README.md
@@ -0,0 +1,12 @@
+# Introduction
+
+The SenML library helps you create and parse [senml documents](https://tools.ietf.org/html/draft-ietf-core-senml-13)
+in both json and cbor format.
+
+# key features
+
+- Object oriented design.
+- built in support for [senml's unit registry](https://tools.ietf.org/html/draft-ietf-core-senml-12#section-12.1)
+- extensible for new data types
+- direct support to read/write in json and cbor format.
+- automatically adjusts record data with respect to base time, base value & base sum.
diff --git a/micropython/senml/docs/_config.yml b/micropython/senml/docs/_config.yml
new file mode 100644
index 000000000..c74188174
--- /dev/null
+++ b/micropython/senml/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-slate
\ No newline at end of file
diff --git a/micropython/senml/docs/index.md b/micropython/senml/docs/index.md
new file mode 100644
index 000000000..91ed7fe99
--- /dev/null
+++ b/micropython/senml/docs/index.md
@@ -0,0 +1,13 @@
+Welcome to the API documet site for the micro-python SenML library.
+
+The following api sections are available:
+
+- [senml-base](./senml_base): the base class for all senml objects.
+- [senml-pack](./senml_pack): the class that represents root documents.
+- [senml-record](./senml_record): the class that stores sensor measurements
+- [senml-unit](./senml_unit): the list of all unit names that can be used.
+
+
+
+Copyright (c) 2018 KPN
+Copyright (c) 2023 MicroPython
diff --git a/micropython/senml/docs/senml_base.md b/micropython/senml/docs/senml_base.md
new file mode 100644
index 000000000..feeff22e2
--- /dev/null
+++ b/micropython/senml/docs/senml_base.md
@@ -0,0 +1,8 @@
+
+# senml_base Module
+
+
+## senml_base.SenmlBase Objects
+
+
+the base class for all senml objects. 
diff --git a/micropython/senml/docs/senml_pack.md b/micropython/senml/docs/senml_pack.md
new file mode 100644
index 000000000..4a51cff78
--- /dev/null
+++ b/micropython/senml/docs/senml_pack.md
@@ -0,0 +1,216 @@
+
+# senml_pack Module
+
+
+## senml_pack.SenmlPack Objects
+
+
+represents a senml pack object. This can contain multiple records but also other (child) pack objects.
+When the pack object only contains records, it represents the data of a device.
+If the pack object has child pack objects, then it represents a gateway 
+
+### __enter__ 
+
+```Python
+__enter__(self)
+``` 
+
+for supporting the 'with' statement
+
+
+_returns_: self 
+
+### __exit__ 
+
+```Python
+__exit__(self, exc_type, exc_val, exc_tb)
+``` 
+
+when destroyed in a 'with' statement, make certain that the item is removed from the parent list.
+
+
+_returns_: None 
+
+### __init__ 
+
+```Python
+__init__(self, name, callback=None)
+``` 
+
+initialize the object
+
+_parameters:_
+
+- `name:` {string} the name of the pack 
+
+### __iter__ 
+
+```Python
+__iter__(self)
+``` 
+
+
+
+### add 
+
+```Python
+adds the item to the list of records
+``` 
+
+
+_parameters:_
+
+- `item:` {SenmlRecord} the item that needs to be added to the pack
+
+
+_returns_: None 
+
+### base_sum 
+
+the base sum of the pack.
+
+
+_returns_: a number 
+
+### base_time 
+
+Get the base time assigned to this pack object.
+While rendering, this value will be subtracted from the value of the records.
+
+
+_returns_: unix time stamp representing the base time 
+
+### base_value 
+
+the base value of the pack. The value of the records will be subtracted by this value during rendering.
+While parsing, this value is added to the value of the records.
+
+
+_returns_: a number 
+
+### clear 
+
+```Python
+clear(self)
+``` 
+clear the list of the pack
+
+
+
+_returns_: None 
+
+### do_actuate 
+
+```Python
+do_actuate(self, raw, naming_map, device=None)
+``` 
+
+called while parsing incoming data for a record that is not yet part of this pack object.
+adds a new record and raises the actuate callback of the pack with the newly created record as argument
+
+_parameters:_
+
+- naming_map:
+- `device:` optional: if the device was not found
+- `raw:` the raw record definition, as found in the json structure. this still has invalid labels.
+
+
+_returns_: None 
+
+### from_cbor 
+
+```Python
+from_cbor(self, data)
+``` 
+
+parse a cbor data byte array to a senml pack structure.
+
+_parameters:_
+
+- `data:` a byte array.
+
+
+_returns_: None 
+
+### from_json 
+
+```Python
+from_json(self, data)
+``` 
+
+parse a json string and convert it to a senml pack structure
+
+_parameters:_
+
+- `data:` a string containing json data.
+
+
+_returns_: None, will call the appropriate callback functions. 
+
+
+
+### remove 
+
+```Python
+remove(self, item)
+``` 
+removes the item from the pack
+
+
+_parameters:_
+
+- `item:` {SenmlRecord} the item that needs to be removed
+
+
+_returns_: None 
+
+### to_cbor 
+
+```Python
+to_cbor(self)
+``` 
+
+render the content of this object to a cbor byte array
+
+
+_returns_: a byte array 
+
+### to_json 
+
+```Python
+to_json(self)
+``` 
+
+render the content of this object to a string.
+
+
+_returns_: a string representing the senml pack object 
+
+## senml_pack.SenmlPackIterator Objects
+
+
+an iterator to walk over all records in a pack 
+
+### __init__ 
+
+```Python
+__init__(self, list)
+``` 
+
+
+
+### __iter__ 
+
+```Python
+__iter__(self)
+``` 
+
+
+
+### __next__ 
+
+```Python
+__next__(self)
+``` 
+
+
diff --git a/micropython/senml/docs/senml_record.md b/micropython/senml/docs/senml_record.md
new file mode 100644
index 000000000..6bac549a5
--- /dev/null
+++ b/micropython/senml/docs/senml_record.md
@@ -0,0 +1,86 @@
+
+# senml_record Module
+
+
+## senml_record.SenmlRecord Objects
+
+
+represents a single value in a senml pack object 
+
+### __enter__ 
+
+```Python
+__enter__(self)
+``` 
+
+for supporting the 'with' statement
+
+
+_returns_: self 
+
+### __exit__ 
+
+```Python
+__exit__(self, exc_type, exc_val, exc_tb)
+``` 
+
+when destroyed in a 'with' statement, make certain that the item is removed from the parent list.
+
+
+_returns_: None 
+
+### __init__ 
+
+```Python
+__init__(self, name, **kwargs)
+``` 
+
+create a new senml record
+
+_parameters:_
+
+- `kwargs:`  optional parameters:
+    - value: the value to store in the record
+    - time: the timestamp to use (when was the value measured)
+    - name: the name of hte record
+    - unit: unit value
+    - sum: sum value
+    - update_time: max time before sensor will provide an updated reading
+    - callback: a callback function taht will be called when actuator data has been found. Expects no params 
+
+### do_actuate 
+
+```Python
+do_actuate(self, raw, naming_map)
+``` 
+
+called when a raw senml record was found for this object. Stores the data and if there is a callback, calls it.
+
+_parameters:_
+
+- `raw:` raw senml object
+
+
+_returns_: None 
+
+### sum 
+
+
+
+### time 
+
+get the time at which the measurement for the record was taken.
+
+
+_returns_: a unix time stamp. This is the absolute value, not adjusted to the base time of the pack. 
+
+### update_time 
+
+get the time at which the next measurement is expected to be taken for this record.
+
+
+_returns_: a unix time stamp. This is the absolute value, not adjusted to the base time of the pack. 
+
+### value 
+
+get the value currently assigned to the object 
diff --git a/micropython/senml/docs/senml_unit.md b/micropython/senml/docs/senml_unit.md
new file mode 100644
index 000000000..816c40679
--- /dev/null
+++ b/micropython/senml/docs/senml_unit.md
@@ -0,0 +1,183 @@
+
+# senml_unit Module
+
+
+## Functions
+
+
+
+## senml_unit.SenmlUnits Objects
+
+
+
+
+##### `SENML_UNIT_ACCELERATION` 
+
+
+##### `SENML_UNIT_AMPERE` 
+
+
+##### `SENML_UNIT_BEATS` 
+
+
+##### `SENML_UNIT_BECQUEREL` 
+
+
+##### `SENML_UNIT_BEL` 
+
+
+##### `SENML_UNIT_BIT` 
+
+
+##### `SENML_UNIT_BIT_PER_SECOND` 
+
+
+##### `SENML_UNIT_BPM` 
+
+
+##### `SENML_UNIT_CANDELA` 
+
+
+##### `SENML_UNIT_CANDELA_PER_SQUARE_METER` 
+
+
+##### `SENML_UNIT_COULOMB` 
+
+
+##### `SENML_UNIT_COUNTER` 
+
+
+##### `SENML_UNIT_CUBIC_METER` 
+
+
+##### `SENML_UNIT_CUBIC_METER_PER_SECOND` 
+
+
+##### `SENML_UNIT_DECIBEL` 
+
+
+##### `SENML_UNIT_DECIBEL_RELATIVE_TO_1_W` 
+
+
+##### `SENML_UNIT_DEGREES_CELSIUS` 
+
+
+##### `SENML_UNIT_DEGREES_LATITUDE` 
+
+
+##### `SENML_UNIT_DEGREES_LONGITUDE` 
+
+
+##### `SENML_UNIT_EVENT_RATE_PER_MINUTE` 
+
+
+##### `SENML_UNIT_EVENT_RATE_PER_SECOND` 
+
+
+##### `SENML_UNIT_FARAD` 
+
+
+##### `SENML_UNIT_GRAM` 
+
+
+##### `SENML_UNIT_GRAY` 
+
+
+##### `SENML_UNIT_HENRY` 
+
+
+##### `SENML_UNIT_HERTZ` 
+
+
+##### `SENML_UNIT_JOULE` 
+
+
+##### `SENML_UNIT_KATAL` 
+
+
+##### `SENML_UNIT_KELVIN` 
+
+
+##### `SENML_UNIT_KILOGRAM` 
+
+
+##### `SENML_UNIT_LITER` 
+
+
+##### `SENML_UNIT_LITER_PER_SECOND` 
+
+
+##### `SENML_UNIT_LUMEN` 
+
+
+##### `SENML_UNIT_LUX` 
+
+
+##### `SENML_UNIT_METER` 
+
+
+##### `SENML_UNIT_MOLE` 
+
+
+##### `SENML_UNIT_NEWTON` 
+
+
+##### `SENML_UNIT_OHM` 
+
+
+##### `SENML_UNIT_PASCAL` 
+
+
+##### `SENML_UNIT_PERCENTAGE_REMAINING_BATTERY_LEVEL` 
+
+
+##### `SENML_UNIT_PH` 
+
+
+##### `SENML_UNIT_RADIAN` 
+
+
+##### `SENML_UNIT_RATIO` 
+
+
+##### `SENML_UNIT_RELATIVE_HUMIDITY` 
+
+
+##### `SENML_UNIT_SECOND` 
+
+
+##### `SENML_UNIT_SECONDS_REMAINING_BATTERY_LEVEL` 
+
+
+##### `SENML_UNIT_SIEMENS` 
+
+
+##### `SENML_UNIT_SIEMENS_PER_METER` 
+
+
+##### `SENML_UNIT_SIEVERT` 
+
+
+##### `SENML_UNIT_SQUARE_METER` 
+
+
+##### `SENML_UNIT_STERADIAN` 
+
+
+##### `SENML_UNIT_TESLA` 
+
+
+##### `SENML_UNIT_VELOCITY` 
+
+
+##### `SENML_UNIT_VOLT` 
+
+
+##### `SENML_UNIT_WATT` 
+
+
+##### `SENML_UNIT_WATT_PER_SQUARE_METER` 
+
+
+##### `SENML_UNIT_WEBER` 
+
diff --git a/micropython/senml/examples/actuator.py b/micropython/senml/examples/actuator.py
new file mode 100644
index 000000000..8e254349d
--- /dev/null
+++ b/micropython/senml/examples/actuator.py
@@ -0,0 +1,67 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+
+
+def do_actuate(record):
+    """
+    called when actuate_me receives a value.
+    :return: None
+    """
+    print(record.value)
+
+
+def generic_callback(record, **kwargs):
+    """
+    a generic callback, attached to the device. Called when a record is found that has not yet been registered
+    in the pack. When this callback is called, the record will already be added to the pack.
+    :param record: the newly found record.
+    :return: None
+    """
+    print("found record: " + record.name)
+    print("with value: " + str(record.value))
+
+
+pack = SenmlPack("device_name", generic_callback)
+actuate_me = SenmlRecord("actuator", callback=do_actuate)
+
+pack.add(actuate_me)
+
+json_data = '[{"bn": "device_name", "n":"actuator", "v": 10 }]'
+print(json_data)
+pack.from_json(json_data)
+
+json_data = (
+    '[{"bn": "device_name", "n":"actuator", "v": 20 }, {"n": "another_actuator", "vs": "a value"}]'
+)
+print(json_data)
+pack.from_json(json_data)
+
+print('[{"bn": "device_name", "n":"temp", "v": 20, "u": "Cel" }]')
+# this represents the cbor json struct: [{-2: "device_name", 0: "temp", 1: "Cel", 2: 20}]
+cbor_data = bytes.fromhex("81A4216B6465766963655F6E616D65006474656D70016343656C0214")
+pack.from_cbor(cbor_data)
diff --git a/micropython/senml/examples/base.py b/micropython/senml/examples/base.py
new file mode 100644
index 000000000..c68188863
--- /dev/null
+++ b/micropython/senml/examples/base.py
@@ -0,0 +1,47 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+import utime as time
+
+
+pack = SenmlPack("device_name")
+temp = SenmlRecord("temperature", unit=SenmlUnits.SENML_UNIT_DEGREES_CELSIUS, value=23.5)
+door_pos = SenmlRecord("doorPos", update_time=20, value=True)
+int_val = SenmlRecord("int_val", sum=100)
+
+pack.add(temp)
+pack.add(door_pos)
+pack.add(int_val)
+
+pack.base_time = time.time()
+pack.base_value = 5
+pack.base_sum = 50
+time.sleep(2)
+temp.time = time.time()
+
+
+print(pack.to_json())
diff --git a/micropython/senml/examples/basic.py b/micropython/senml/examples/basic.py
new file mode 100644
index 000000000..470364f1b
--- /dev/null
+++ b/micropython/senml/examples/basic.py
@@ -0,0 +1,39 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+import utime as time
+
+
+pack = SenmlPack("device")
+
+while True:
+    with SenmlRecord(
+        "test", value=1
+    ) as rec:  # use a with statement to automatically remove the item from the list when it goes out of scope
+        pack.add(rec)
+        print(pack.to_json())
+    time.sleep(1)
diff --git a/micropython/senml/examples/basic2.py b/micropython/senml/examples/basic2.py
new file mode 100644
index 000000000..7c4dee267
--- /dev/null
+++ b/micropython/senml/examples/basic2.py
@@ -0,0 +1,45 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+import utime as time
+
+
+pack = SenmlPack("device_name")
+temp = SenmlRecord("temperature", unit=SenmlUnits.SENML_UNIT_DEGREES_CELSIUS, value=23.5)
+door_pos = SenmlRecord("doorPos", update_time=20, value=True)
+str_val = SenmlRecord("str val")
+
+pack.add(temp)
+pack.add(door_pos)
+pack.add(str_val)
+
+while True:
+    temp.value = temp.value + 1.1
+    door_pos.value = not door_pos.value
+    str_val.value = "test"
+    print(pack.to_json())
+    time.sleep(1)
diff --git a/micropython/senml/examples/basic_cbor.py b/micropython/senml/examples/basic_cbor.py
new file mode 100644
index 000000000..de696b1a9
--- /dev/null
+++ b/micropython/senml/examples/basic_cbor.py
@@ -0,0 +1,42 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+import utime as time
+from cbor2 import decoder
+
+pack = SenmlPack("device_name")
+
+while True:
+    with SenmlRecord(
+        "test", value=10
+    ) as rec:  # use a with statement to automatically remove the item from the list when it goes out of scope, generate a value for the record
+        pack.add(rec)
+        cbor_val = pack.to_cbor()
+        print(cbor_val)
+        print(cbor_val.hex())
+        print(decoder.loads(cbor_val))  # convert to string again so we can print it.
+    time.sleep(1)
diff --git a/micropython/senml/examples/custom_record.py b/micropython/senml/examples/custom_record.py
new file mode 100644
index 000000000..07e4e177c
--- /dev/null
+++ b/micropython/senml/examples/custom_record.py
@@ -0,0 +1,133 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+
+import utime as time
+
+
+class Coordinates(SenmlRecord):
+    def __init__(self, name, **kwargs):
+        """overriding the init function so we can initiate the 3 senml records that will represent lat,lon, alt"""
+        self._lat = SenmlRecord(
+            "lattitude", unit=SenmlUnits.SENML_UNIT_DEGREES_LATITUDE
+        )  # create these befor calling base constructor so that all can be init correctly from constructor
+        self._lon = SenmlRecord("longitude", unit=SenmlUnits.SENML_UNIT_DEGREES_LONGITUDE)
+        self._alt = SenmlRecord("altitude", unit=SenmlUnits.SENML_UNIT_METER)
+        super(Coordinates, self).__init__(
+            name, **kwargs
+        )  # need to call base init, to make certain all is ok.
+
+    def _check_value_type(self, value):
+        """overriding the check on value type to make certain that only an array with 3 values is assigned: lat,lon/alt"""
+        if not value == None:
+            if not isinstance(value, list):
+                raise Exception("invalid data type: array with 3 elements expected lat, lon, alt")
+
+    def _build_rec_dict(self, naming_map, appendTo):
+        """
+        override the rendering of the senml data objects. These will be converted to json or cbor
+        :param naming_map: {dictionary} a map that determines the field names, these are different for json vs cbor
+        :param appendTo: {list} the result list
+        :return: None
+        """
+        self._lat._build_rec_dict(naming_map, appendTo)
+        self._lon._build_rec_dict(naming_map, appendTo)
+        self._alt._build_rec_dict(naming_map, appendTo)
+
+    @SenmlRecord.value.setter
+    def value(self, value):
+        """set the current value.
+        this is overridden so we can pass on the values to the internal objects. It's also stored in the parent
+        so that a 'get-value' still returns the array.
+        """
+        self._value = (
+            value  # micropython doesn't support calling setter of parent property, do it manually
+        )
+        if value:
+            self._lat.value = value[0]
+            self._lon.value = value[1]
+            self._alt.value = value[2]
+        else:
+            self._lat.value = None
+            self._lon.value = None
+            self._alt.value = None
+
+    @SenmlRecord.time.setter
+    def time(self, value):
+        """set the time stamp.
+        this is overridden so we can pass on the values to the internal objects.
+        """
+        self._check_number_type(
+            value, "time"
+        )  # micropython doesn't support calling setter of parent property, do it manually
+        self._time = value
+        self._lat.time = value
+        self._lon.time = value
+        self._alt.time = value
+
+    @SenmlRecord.update_time.setter
+    def update_time(self, value):
+        """set the time stamp.
+        this is overridden so we can pass on the values to the internal objects.
+        """
+        self._check_number_type(
+            value, "update_time"
+        )  # micropython doesn't support calling setter of parent property, do it manually
+        self._update_time = value
+        self._lat.update_time = value
+        self._lon.update_time = value
+        self._alt.update_time = value
+
+    @SenmlRecord._parent.setter
+    def _parent(self, value):
+        """set the time stamp.
+        this is overridden so we can pass on the values to the internal objects.
+        This is needed so that the child objects can correctly take base time (optionally also base-sum, base-value) into account
+        """
+        self.__parent = (
+            value  # micropython doesn't support calling setter of parent property, do it manually
+        )
+        self._lat._parent = value
+        self._lon._parent = value
+        self._alt._parent = value
+
+
+pack = SenmlPack("device_name")
+loc = Coordinates("location")
+loc2 = Coordinates("location", value=[52.0259, 5.4775, 230])
+pack.add(loc)
+pack.add(loc2)
+
+print(loc._parent.name)
+
+loc.value = [51.0259, 4.4775, 10]
+print(pack.to_json())
+
+pack.base_time = time.time()  # set a base time
+time.sleep(2)
+loc.time = time.time()  # all child objects will receive the time value
+print(pack.to_json())
diff --git a/micropython/senml/examples/gateway.py b/micropython/senml/examples/gateway.py
new file mode 100644
index 000000000..c3bef12da
--- /dev/null
+++ b/micropython/senml/examples/gateway.py
@@ -0,0 +1,50 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+import utime as time
+
+gateway_pack = SenmlPack("gateway")
+
+dev1_pack = SenmlPack("dev1")
+dev2_pack = SenmlPack("dev2")
+
+temp = SenmlRecord("temperature", unit=SenmlUnits.SENML_UNIT_DEGREES_CELSIUS, value=23.5)
+door_pos = SenmlRecord("doorPos", update_time=20, value=True)
+str_val = SenmlRecord("str val")
+
+gateway_pack.add(temp)
+gateway_pack.add(dev1_pack)
+gateway_pack.add(dev2_pack)
+dev1_pack.add(door_pos)
+dev2_pack.add(str_val)
+
+while True:
+    temp.value = temp.value + 1.1
+    door_pos.value = not door_pos.value
+    str_val.value = "test"
+    print(gateway_pack.to_json())
+    time.sleep(1)
diff --git a/micropython/senml/examples/gateway_actuators.py b/micropython/senml/examples/gateway_actuators.py
new file mode 100644
index 000000000..ae8514395
--- /dev/null
+++ b/micropython/senml/examples/gateway_actuators.py
@@ -0,0 +1,75 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+
+
+def do_actuate(record):
+    """
+    called when actuate_me receives a value.
+    :return: None
+    """
+    print("for known device: ")
+    print(record.value)
+
+
+def device_callback(record, **kwargs):
+    """
+    a generic callback, attached to the device. Called when a record is found that has not yet been registered
+    in the pack. When this callback is called, the record will already be added to the pack.
+    :param kwargs: optional extra parameters
+    :param record: the newly found record.
+    :return: None
+    """
+    print("found record: " + record.name)
+    print("with value: " + record.value)
+
+
+def gateway_callback(record, **kwargs):
+    """
+    a generic callback, attached to the device. Called when a record is found that has not yet been registered
+    in the pack. When this callback is called, the record will already be added to the pack.
+    :param record: the newly found record.
+    :param kwargs: optional extra parameters (device can be found here)
+    :return: None
+    """
+    if "device" in kwargs and kwargs["device"] != None:
+        print("for device: " + kwargs["device"].name)
+    else:
+        print("for gateway: ")
+    print("found record: " + record.name)
+    print("with value: " + str(record.value))
+
+
+gateway = SenmlPack("gateway_name", gateway_callback)
+device = SenmlPack("device_name", device_callback)
+actuate_me = SenmlRecord("actuator", callback=do_actuate)
+
+gateway.add(device)
+device.add(actuate_me)
+gateway.from_json(
+    '[{"bn": "gateway_name", "n":"temp", "v": 22},{"n": "gateway_actuator", "vb": true}, {"bn": "device_name", "n":"actuator", "v": 20 }, {"n": "another_actuator", "vs": "a value"}, {"bn": "device_2", "n":"temp", "v": 20 }, {"n": "actuator2", "vs": "value2"}]'
+)
diff --git a/micropython/senml/examples/supported_data_types.py b/micropython/senml/examples/supported_data_types.py
new file mode 100644
index 000000000..59799cb9c
--- /dev/null
+++ b/micropython/senml/examples/supported_data_types.py
@@ -0,0 +1,53 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml import *
+import utime as time
+
+pack = SenmlPack("device_name")
+
+double_val = SenmlRecord("double", value=23.5)
+int_val = SenmlRecord("int", value=23)
+bool_val = SenmlRecord("bool", value=True)
+str_val = SenmlRecord("str val", value="test")
+bytes_val = SenmlRecord("bytes", value=bytearray(b"00 1e 05 ff"))
+
+# invalid value
+try:
+    invalid = SenmlRecord("invalid", value={"a": 1})
+except Exception as error:
+    print(error)
+
+
+pack.add(double_val)
+pack.add(int_val)
+pack.add(bool_val)
+pack.add(str_val)
+pack.add(bytes_val)
+
+while True:
+    print(pack.to_json())
+    time.sleep(1)
diff --git a/micropython/senml/manifest.py b/micropython/senml/manifest.py
new file mode 100644
index 000000000..e09f1ab79
--- /dev/null
+++ b/micropython/senml/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.1.0")
+
+require("cbor2")
+
+package("senml")
diff --git a/micropython/senml/senml/__init__.py b/micropython/senml/senml/__init__.py
new file mode 100644
index 000000000..93cbd7700
--- /dev/null
+++ b/micropython/senml/senml/__init__.py
@@ -0,0 +1,30 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from .senml_base import SenmlBase
+from .senml_pack import SenmlPack
+from .senml_record import SenmlRecord
+from .senml_unit import SenmlUnits
diff --git a/micropython/senml/senml/senml_base.py b/micropython/senml/senml/senml_base.py
new file mode 100644
index 000000000..b277c9477
--- /dev/null
+++ b/micropython/senml/senml/senml_base.py
@@ -0,0 +1,30 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+class SenmlBase(object):
+    """
+    the base class for all senml objects.
+    """
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
new file mode 100644
index 000000000..03ca612ac
--- /dev/null
+++ b/micropython/senml/senml/senml_pack.py
@@ -0,0 +1,360 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+from senml.senml_record import SenmlRecord
+from senml.senml_base import SenmlBase
+import ujson
+from cbor2 import encoder
+from cbor2 import decoder
+
+
+class SenmlPackIterator:
+    """an iterator to walk over all records in a pack"""
+
+    def __init__(self, list):
+        self._list = list
+        self._index = 0
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        if self._index < len(self._list):
+            res = self._list[self._index]
+            self._index += 1
+            return res
+        else:
+            raise StopIteration()
+
+
+class SenmlPack(SenmlBase):
+    """
+    represents a sneml pack object. This can contain multiple records but also other (child) pack objects.
+    When the pack object only contains records, it represents the data of a device.
+    If the pack object has child pack objects, then it represents a gateway
+    """
+
+    json_mappings = {
+        "bn": "bn",
+        "bt": "bt",
+        "bu": "bu",
+        "bv": "bv",
+        "bs": "bs",
+        "n": "n",
+        "u": "u",
+        "v": "v",
+        "vs": "vs",
+        "vb": "vb",
+        "vd": "vd",
+        "s": "s",
+        "t": "t",
+        "ut": "ut",
+    }
+
+    def __init__(self, name, callback=None):
+        """
+        initialize the object
+        :param name: {string} the name of the pack
+        """
+        self._data = []
+        self.name = name
+        self._base_value = None
+        self._base_time = None
+        self._base_sum = None
+        self.base_unit = None
+        self._parent = None  # a pack can also be the child of another pack.
+        self.actuate = callback  # actuate callback function
+
+    def __iter__(self):
+        return SenmlPackIterator(self._data)
+
+    def __enter__(self):
+        """
+        for supporting the 'with' statement
+        :return: self
+        """
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """
+        when destroyed in a 'with' statement, make certain that the item is removed from the parent list.
+        :return: None
+        """
+        if self._parent:
+            self._parent.remove(self)
+
+    @property
+    def base_value(self):
+        """
+        the base value of the pack.
+        :return: a number
+        """
+        return self._base_value
+
+    @base_value.setter
+    def base_value(self, value):
+        """
+        set the base value.
+        :param value: only number allowed
+        :return:
+        """
+        self._check_value_type(value, "base_value")
+        self._base_value = value
+
+    @property
+    def base_sum(self):
+        """
+        the base sum of the pack.
+        :return: a number
+        """
+        return self._base_sum
+
+    @base_sum.setter
+    def base_sum(self, value):
+        """
+        set the base value.
+        :param value: only number allowed
+        :return:
+        """
+        self._check_value_type(value, "base_sum")
+        self._base_sum = value
+
+    @property
+    def base_time(self):
+        return self._base_time
+
+    @base_time.setter
+    def base_time(self, value):
+        self._check_value_type(value, "base_time")
+        self._base_time = value
+
+    def _check_value_type(self, value, field_name):
+        """
+        checks if the type of value is allowed for senml
+        :return: None, raisee exception if not ok.
+        """
+        if not value == None:
+            if not (isinstance(value, int) or isinstance(value, float)):
+                raise Exception("invalid type for " + field_name + ", only numbers allowed")
+
+    def from_json(self, data):
+        """
+        parse a json string and convert it to a senml pack structure
+        :param data: a string containing json data.
+        :return: None, will r
+        """
+        records = ujson.loads(data)  # load the raw senml data
+        self._process_incomming_data(records, SenmlPack.json_mappings)
+
+    def _process_incomming_data(self, records, naming_map):
+        """
+        generic processor for incomming data (actuators.
+        :param records: the list of raw senml data, parsed from a json or cbor structure
+        :param naming_map: translates cbor to json field names (when needed).
+        :return: None
+        """
+        cur_pack_el = self
+        new_pack = False
+        for item in records:
+            if naming_map["bn"] in item:  # ref to a pack element, either this or a child pack.
+                if item[naming_map["bn"]] != self.name:
+                    pack_el = [x for x in self._data if x.name == item[naming_map["bn"]]]
+                else:
+                    pack_el = [self]
+                if len(pack_el) > 0:
+                    cur_pack_el = pack_el[0]
+                    new_pack = False
+                else:
+                    device = SenmlPack(item[naming_map["bn"]])
+                    self._data.append(device)
+                    cur_pack_el = device
+                    new_pack = True
+
+                if (
+                    naming_map["bv"] in item
+                ):  # need to copy the base value assigned to the pack element so we can do proper conversion for actuators.
+                    cur_pack_el.base_value = item[naming_map["bv"]]
+
+                rec_el = [x for x in cur_pack_el._data if x.name == item[naming_map["n"]]]
+                if len(rec_el) > 0:
+                    rec_el[0].do_actuate(item, naming_map)
+                elif new_pack:
+                    self.do_actuate(item, naming_map, cur_pack_el)
+                else:
+                    cur_pack_el.do_actuate(item, naming_map)
+            else:
+                rec_el = [x for x in self._data if x.name == item[naming_map["n"]]]
+                if len(rec_el) > 0:
+                    rec_el[0].do_actuate(item, naming_map)
+                elif new_pack:
+                    self.do_actuate(item, naming_map, cur_pack_el)
+                else:
+                    cur_pack_el.do_actuate(item, naming_map)
+
+    def do_actuate(self, raw, naming_map, device=None):
+        """
+        called while parsing incoming data for a record that is not yet part of this pack object.
+        adds a new record and raises the actuate callback of the pack with the newly created record as argument
+        :param naming_map:
+        :param device: optional: if the device was not found
+        :param raw: the raw record definition, as found in the json structure. this still has invalid labels.
+        :return: None
+        """
+        rec = SenmlRecord(raw[naming_map["n"]])
+        if device:
+            device.add(rec)
+            rec._from_raw(raw, naming_map)
+            if self.actuate:
+                self.actuate(rec, device=device)
+        else:
+            self.add(rec)
+            rec._from_raw(raw, naming_map)
+            if self.actuate:
+                self.actuate(rec, device=None)
+
+    def to_json(self):
+        """
+        render the content of this object to a string.
+        :return: a string representing the senml pack object
+        """
+        converted = []
+        self._build_rec_dict(SenmlPack.json_mappings, converted)
+        return ujson.dumps(converted)
+
+    def _build_rec_dict(self, naming_map, appendTo):
+        """
+        converts the object to a senml object with the proper naming in place.
+        This can be recursive: a pack can contain other packs.
+        :param naming_map: a dictionary used to pick the correct field names for either senml json or senml cbor
+        :return:
+        """
+        internalList = []
+        for item in self._data:
+            item._build_rec_dict(naming_map, internalList)
+        if len(internalList) > 0:
+            first_rec = internalList[0]
+        else:
+            first_rec = {}
+            internalList.append(first_rec)
+
+        if self.name:
+            first_rec[naming_map["bn"]] = self.name
+        if self.base_value:
+            first_rec[naming_map["bv"]] = self.base_value
+        if self.base_unit:
+            first_rec[naming_map["bu"]] = self.base_unit
+        if self.base_sum:
+            first_rec[naming_map["bs"]] = self.base_sum
+        if self.base_time:
+            first_rec[naming_map["bt"]] = self.base_time
+        appendTo.extend(internalList)
+
+    def from_cbor(self, data):
+        """
+        parse a cbor data byte array to a senml pack structure.
+        :param data: a byte array.
+        :return: None
+        """
+        records = decoder.loads(data)  # load the raw senml data
+        naming_map = {
+            "bn": -2,
+            "bt": -3,
+            "bu": -4,
+            "bv": -5,
+            "bs": -16,
+            "n": 0,
+            "u": 1,
+            "v": 2,
+            "vs": 3,
+            "vb": 4,
+            "vd": 8,
+            "s": 5,
+            "t": 6,
+            "ut": 7,
+        }
+        self._process_incomming_data(records, naming_map)
+
+    def to_cbor(self):
+        """
+        render the content of this object to a cbor byte array
+        :return: a byte array
+        """
+        naming_map = {
+            "bn": -2,
+            "bt": -3,
+            "bu": -4,
+            "bv": -5,
+            "bs": -16,
+            "n": 0,
+            "u": 1,
+            "v": 2,
+            "vs": 3,
+            "vb": 4,
+            "vd": 8,
+            "s": 5,
+            "t": 6,
+            "ut": 7,
+        }
+        converted = []
+        self._build_rec_dict(naming_map, converted)
+        return encoder.dumps(converted)
+
+    def add(self, item):
+        """
+        adds the item to the list of records
+        :param item: {SenmlRecord} the item that needs to be added to the pack
+        :return: None
+        """
+        if not (isinstance(item, SenmlBase)):
+            raise Exception("invalid type of param, SenmlRecord or SenmlPack expected")
+        if not item._parent == None:
+            raise Exception("item is already part of a pack")
+
+        self._data.append(item)
+        item._parent = self
+
+    def remove(self, item):
+        """
+        removes the item from the list of records
+        :param item: {SenmlRecord} the item that needs to be removed
+        :return: None
+        """
+        if not (isinstance(item, SenmlBase)):
+            raise Exception("invalid type of param, SenmlRecord or SenmlPack expected")
+        if not item._parent == self:
+            raise Exception("item is not part of this pack")
+
+        self._data.remove(item)
+        item._parent = None
+
+    def clear(self):
+        """
+        clear the list of the pack
+        :return: None
+        """
+        for item in self._data:
+            item._parent = None
+        self._data = []
diff --git a/micropython/senml/senml/senml_record.py b/micropython/senml/senml/senml_record.py
new file mode 100644
index 000000000..be280d3ae
--- /dev/null
+++ b/micropython/senml/senml/senml_record.py
@@ -0,0 +1,245 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+import ubinascii
+from senml.senml_base import SenmlBase
+
+
+class SenmlRecord(SenmlBase):
+    """represents a single value in a senml pack object"""
+
+    def __init__(self, name, **kwargs):
+        """
+        create a new senml record
+        :param kwargs:  optional parameters:
+            - value: the value to store in the record
+            - time: the timestamp to use (when was the value measured)
+            - name: the name of hte record
+            - unit: unit value
+            - sum: sum value
+            - update_time: max time before sensor will provide an updated reading
+            - callback: a callback function taht will be called when actuator data has been found. Expects no params
+        """
+        self.__parent = None  # using double __ cause it's a field for an internal property
+        self._unit = None  # declare and init internal fields
+        self._value = None
+        self._time = None
+        self._sum = None
+        self._update_time = None
+
+        self._parent = None  # internal reference to the parent object
+        self.name = name
+        self.unit = kwargs.get("unit", None)
+        self.value = kwargs.get("value", None)
+        self.time = kwargs.get("time", None)
+        self.sum = kwargs.get("sum", None)
+        self.update_time = kwargs.get("update_time", None)
+        self.actuate = kwargs.get("callback", None)  # actuate callback function
+
+    def __enter__(self):
+        """
+        for supporting the 'with' statement
+        :return: self
+        """
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """
+        when destroyed in a 'with' statement, make certain that the item is removed from the parent list.
+        :return: None
+        """
+        if self._parent:
+            self._parent.remove(self)
+
+    def _check_value_type(self, value):
+        """
+        checks if the type of value is allowed for senml
+        :return: None, raisee exception if not ok.
+        """
+        if not value == None:
+            if not (
+                isinstance(value, bool)
+                or isinstance(value, int)
+                or isinstance(value, float)
+                or isinstance(value, bytearray)
+                or isinstance(value, str)
+            ):
+                raise Exception(
+                    "invalid type for value, only numbers, strings, boolean and byte arrays allowed"
+                )
+
+    def _check_number_type(self, value, field_name):
+        """
+        checks if the type of value is allowed for senml
+        :return: None, raisee exception if not ok.
+        """
+        if not value == None:
+            if not (isinstance(value, int) or isinstance(value, float)):
+                raise Exception("invalid type for " + field_name + ", only numbers allowed")
+
+    @property
+    def value(self):
+        """get the value currently assigned to the object"""
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """set the current value. Will not automatically update the time stamp. This has to be done seperatly for more
+        finegrained control
+        Note: when the value is a float, you can control rounding in the rendered output by using the function
+        round() while assigning the value. ex: record.value = round(12.2 / 1.5423, 2)
+        """
+        self._check_value_type(value)
+        self._value = value
+
+    @property
+    def time(self):
+        return self._time
+
+    @time.setter
+    def time(self, value):
+        self._check_number_type(value, "time")
+        self._time = value
+
+    @property
+    def update_time(self):
+        return self._update_time
+
+    @update_time.setter
+    def update_time(self, value):
+        self._check_number_type(value, "update_time")
+        self._update_time = value
+
+    @property
+    def sum(self):
+        return self._sum
+
+    @sum.setter
+    def sum(self, value):
+        self._check_number_type(value, "sum")
+        self._sum = value
+
+    @property
+    def _parent(self):
+        """
+        the parent pack object for this record. This is a property so that inheriters can override and do custom
+        actions when the parent is set (like passing it on to their children
+        :return:
+        """
+        return self.__parent
+
+    @_parent.setter
+    def _parent(self, value):
+        """
+        the parent pack object for this record. This is a property so that inheriters can override and do custom
+        actions when the parent is set (like passing it on to their children
+        :return:
+        """
+        self.__parent = value
+
+    def _build_rec_dict(self, naming_map, appendTo):
+        """
+        converts the object to a dictionary that can be rendered to senml.
+        :param naming_map: a dictionary that maps the field names to senml json or senml cbor. keys are in the
+        form 'n', 'v',...  values for 'n' are either 'n' or 0 (number is for cbor)
+        :return: a senml dictionary representation of the record
+        """
+        result = {}
+
+        if self.name:
+            result[naming_map["n"]] = self.name
+
+        if self._sum:
+            if self._parent and self._parent.base_sum:
+                result[naming_map["s"]] = self._sum - self._parent.base_sum
+            else:
+                result[naming_map["s"]] = self._sum
+        elif isinstance(self._value, bool):
+            result[naming_map["vb"]] = self._value
+        elif isinstance(self._value, int) or isinstance(self._value, float):
+            if self._parent and self._parent.base_value:
+                result[naming_map["v"]] = self._value - self._parent.base_value
+            else:
+                result[naming_map["v"]] = self._value
+        elif isinstance(self._value, str):
+            result[naming_map["vs"]] = self._value
+        elif isinstance(self._value, bytearray):
+            if (
+                naming_map["vd"] == "vd"
+            ):  # neeed to make a distinction between json (needs base64) and cbor (needs binary)
+                result[naming_map["vd"]] = base64.b64encode(self._value)
+            else:
+                result[naming_map["vd"]] = self._value
+        else:
+            raise Exception("sum or value of type bootl, number, string or byte-array is required")
+
+        if self._time:
+            if self._parent and self._parent.base_time:
+                result[naming_map["t"]] = self._time - self._parent.base_time
+            else:
+                result[naming_map["t"]] = self._time
+
+        if self.unit:
+            result[naming_map["u"]] = self.unit
+
+        if self._update_time:
+            if self._parent and self._parent.base_time:
+                result[naming_map["ut"]] = self._update_time - self._parent.base_time
+            else:
+                result[naming_map["ut"]] = self._update_time
+
+        appendTo.append(result)
+
+    def _from_raw(self, raw, naming_map):
+        """
+        extracts te data from the raw record. Used during parsing of incoming data.
+        :param raw: a raw senml record which still contains the original field names
+        :param naming_map: used to map cbor names to json field names
+        :return:
+        """
+        if naming_map["v"] in raw:
+            val = raw[naming_map["v"]]
+            if self._parent and self._parent.base_value:
+                val += self._parent.base_value
+        elif naming_map["vs"] in raw:
+            val = raw[naming_map["vs"]]
+        elif naming_map["vb"] in raw:
+            val = raw[naming_map["vb"]]
+        elif naming_map["vd"] in raw:
+            val = ubinascii.a2b_base64(raw[naming_map["vb"]])
+        else:
+            val = None
+        self.value = val
+
+    def do_actuate(self, raw, naming_map):
+        """
+        called when a raw senml record was found for this object. Stores the data and if there is a callback, calls it.
+        :param raw: raw senml object
+        :return: None
+        """
+        self._from_raw(raw, naming_map)
+        if self.actuate:
+            self.actuate(self)
diff --git a/micropython/senml/senml/senml_unit.py b/micropython/senml/senml/senml_unit.py
new file mode 100644
index 000000000..bf7753c4d
--- /dev/null
+++ b/micropython/senml/senml/senml_unit.py
@@ -0,0 +1,89 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2023 Arduino SA
+Copyright (c) 2018 KPN (Jan Bogaerts)
+
+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.
+"""
+
+
+def enum(**enums):
+    return type("Enum", (), enums)
+
+
+SenmlUnits = enum(
+    SENML_UNIT_METER="m",
+    SENML_UNIT_KILOGRAM="kg",
+    SENML_UNIT_GRAM="g",
+    SENML_UNIT_SECOND="s",
+    SENML_UNIT_AMPERE="A",
+    SENML_UNIT_KELVIN="K",
+    SENML_UNIT_CANDELA="cd",
+    SENML_UNIT_MOLE="mol",
+    SENML_UNIT_HERTZ="Hz",
+    SENML_UNIT_RADIAN="rad",
+    SENML_UNIT_STERADIAN="sr",
+    SENML_UNIT_NEWTON="N",
+    SENML_UNIT_PASCAL="Pa",
+    SENML_UNIT_JOULE="J",
+    SENML_UNIT_WATT="W",
+    SENML_UNIT_COULOMB="C",
+    SENML_UNIT_VOLT="V",
+    SENML_UNIT_FARAD="F",
+    SENML_UNIT_OHM="Ohm",
+    SENML_UNIT_SIEMENS="S",
+    SENML_UNIT_WEBER="Wb",
+    SENML_UNIT_TESLA="T",
+    SENML_UNIT_HENRY="H",
+    SENML_UNIT_DEGREES_CELSIUS="Cel",
+    SENML_UNIT_LUMEN="lm",
+    SENML_UNIT_LUX="lx",
+    SENML_UNIT_BECQUEREL="Bq",
+    SENML_UNIT_GRAY="Gy",
+    SENML_UNIT_SIEVERT="Sv",
+    SENML_UNIT_KATAL="kat",
+    SENML_UNIT_SQUARE_METER="m2",
+    SENML_UNIT_CUBIC_METER="m3",
+    SENML_UNIT_LITER="l",
+    SENML_UNIT_VELOCITY="m/s",
+    SENML_UNIT_ACCELERATION="m/s2",
+    SENML_UNIT_CUBIC_METER_PER_SECOND="m3/s",
+    SENML_UNIT_LITER_PER_SECOND="l/s",
+    SENML_UNIT_WATT_PER_SQUARE_METER="W/m2",
+    SENML_UNIT_CANDELA_PER_SQUARE_METER="cd/m2",
+    SENML_UNIT_BIT="bit",
+    SENML_UNIT_BIT_PER_SECOND="bit/s",
+    SENML_UNIT_DEGREES_LATITUDE="lat",
+    SENML_UNIT_DEGREES_LONGITUDE="lon",
+    SENML_UNIT_PH="pH",
+    SENML_UNIT_DECIBEL="db",
+    SENML_UNIT_DECIBEL_RELATIVE_TO_1_W="dBW",
+    SENML_UNIT_BEL="Bspl",
+    SENML_UNIT_COUNTER="count",
+    SENML_UNIT_RATIO="//",
+    SENML_UNIT_RELATIVE_HUMIDITY="%RH",
+    SENML_UNIT_PERCENTAGE_REMAINING_BATTERY_LEVEL="%EL",
+    SENML_UNIT_SECONDS_REMAINING_BATTERY_LEVEL="EL",
+    SENML_UNIT_EVENT_RATE_PER_SECOND="1/s",
+    SENML_UNIT_EVENT_RATE_PER_MINUTE="1/min",
+    SENML_UNIT_BPM="beat/min",
+    SENML_UNIT_BEATS="beats",
+    SENML_UNIT_SIEMENS_PER_METER="S/m",
+)

From 1eb282ad475909d818b5964bd0ad22c582399492 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Mon, 20 Feb 2023 13:54:55 +1100
Subject: [PATCH 149/343] tools/ci.sh: Support publishing package and index
 files to GitHub Pages.

Opt-in feature to make it easier for folks to test packages that are still
in development, open in Pull Requests, or even in independent forks.

---

To enable this on your own GitHub fork of the micropython-lib repository
then navigate to the fork's "Settings" -> "Secrets and variables" ->
"Actions" -> "Variables" page, then click "New repository variable", and
create a variable named MIP_INDEX with value true (or any "truthy" value).

Once enabled then any time a branch is pushed to your fork and builds
successfully, GitHub Actions will also push the built packages and package
index to the gh-pages branch which is associated with the repo's GitHub
Pages web site.  The packages can then be installed remotely via:

    mpremote mip --index \
      https://USERNAME.github.io/micropython-lib/mip/BRANCH_NAME PACKAGE_NAME

or on a device as:

    mip.install(PACKAGE_NAME, index="https://USERNAME.github.io/micropython-lib/mip/BRANCHNAME")

(Replace USERNAME, BRANCH_NAME and PACKAGE_NAME as applicable. If you've
renamed your fork, change the name micropython-lib to match.)

Note: As well as the MIP_INDEX repository variable, this functionality
depends on both GitHub Actions and GitHub Pages being enabled on your
repository in GitHub.  However both options should enable automatically,
unless they have been manually disabled.

This work was funded through GitHub Sponsors.
---
 .github/workflows/build_packages.yml          |   3 +
 .../workflows/cleanup_published_packages.yml  |  12 ++
 CONTRIBUTING.md                               |  46 ++++++++
 README.md                                     |  31 ++++++
 tools/ci.sh                                   | 105 +++++++++++++++++-
 5 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/cleanup_published_packages.yml

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index 7b79225ce..ed469a0b2 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -14,3 +14,6 @@ jobs:
       run: source tools/ci.sh && ci_build_packages_check_manifest
     - name: Compile package index
       run: source tools/ci.sh && ci_build_packages_compile_index
+    - name: Publish packages for branch
+      if: vars.MICROPY_PUBLISH_MIP_INDEX && github.event_name == 'push' && ! github.event.deleted
+      run: source tools/ci.sh && ci_push_package_index
diff --git a/.github/workflows/cleanup_published_packages.yml b/.github/workflows/cleanup_published_packages.yml
new file mode 100644
index 000000000..c6a33cece
--- /dev/null
+++ b/.github/workflows/cleanup_published_packages.yml
@@ -0,0 +1,12 @@
+name: Cleanup published packages
+
+on: delete
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    if: vars.MICROPY_PUBLISH_MIP_INDEX
+    steps:
+    - uses: actions/checkout@v2
+    - name: Clean up published files
+      run: source tools/ci.sh && ci_cleanup_package_index ${{ github.event.ref }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 715477171..804a26bef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,3 +69,49 @@ There are some specific conventions and guidelines for micropython-lib:
 
 * When porting an existing third-party package, please ensure that the source
   license is compatible.
+
+* To make it easier for others to install packages directly from your PR before
+  it is merged, consider opting-in to automatic package publishing (see
+  [Publishing packages from forks](#publishing-packages-from-forks)). If you do
+  this, consider quoting the [commands to install
+  packages](README.md#installing-packages-from-forks) in your Pull Request
+  description.
+
+### Publishing packages from forks
+
+You can easily publish the packages from your micropython-lib
+[fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)
+by opting in to a system based on [GitHub
+Actions](https://docs.github.com/en/actions) and [GitHub
+Pages](https://docs.github.com/en/pages):
+
+1. Open your fork's repository in the GitHub web interface.
+2. Navigate to "Settings" -> "Secrets and variables" -> "Actions" -> "Variables".
+3. Click "New repository variable"
+4. Create a variable named `MICROPY_PUBLISH_MIP_INDEX` with value `true` (or any
+   "truthy" value).
+5. The settings for GitHub Actions and GitHub Pages features should not need to
+   be changed from the repository defaults, unless you've explicitly disabled
+   them.
+
+The next time you push commits to a branch in your fork, GitHub Actions will run
+an additional step in the "Build All Packages" workflow named "Publish Packages
+for branch".
+
+Anyone can then install these packages as described under [Installing packages
+from forks](README.md#installing-packages-from-forks). The exact commands are also
+quoted in the GitHub Actions log for the "Publish Packages for branch" step.
+
+#### Opting Back Out
+
+To opt-out again, delete the `MICROPY_PUBLISH_MIP_INDEX` variable and
+(optionally) delete the `gh-pages` branch from your fork.
+
+*Note*: While enabled, all micropython-lib packages will be published each time
+a change is pushed to any branch in your fork. A commit is added to the
+`gh-pages` branch each time. In a busy repository, the `gh-pages` branch may
+become quite large. The actual `.git` directory size on disk should still be
+quite small, as most of the content will be duplicated. If you're worried that
+the `gh-pages` branch has become too large then you can always delete this
+branch from GitHub. GitHub Actions will create a new `gh-pages` branch the next
+time you push a change.
diff --git a/README.md b/README.md
index c47c0acf9..73417b965 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,37 @@ Note that unlike the other three approaches based on `mip` or `manifest.py`,
 you will need to manually resolve dependencies. You can inspect the relevant
 `manifest.py` file to view the list of dependencies for a given package.
 
+## Installing packages from forks
+
+It is possible to use the `mpremote mip install` or `mip.install()` methods to
+install packages built from a
+[fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)
+of micropython-lib, if the fork's owner has opted in.
+
+This can be useful to install packages from a pending Pull Request, for example.
+
+First, the owner of the fork must opt-in as described under
+[Publishing packages from forks](CONTRIBUTING.md#publishing-packages-from-forks).
+
+After this has happened, each time someone pushes to a branch in that fork then
+GitHub Actions will automatically publish the packages to a GitHub Pages site.
+
+To install these packages, use commands such as:
+
+```bash
+$ mpremote connect /dev/ttyUSB0 mip install --index https://USERNAME.github.io/micropython-lib/mip/BRANCH_NAME PACKAGE_NAME
+```
+
+Or from a networked device:
+
+```py
+import mip
+mip.install(PACKAGE_NAME, index="https://USERNAME.github.io/micropython-lib/mip/BRANCH_NAME")
+```
+
+(Where `USERNAME`, `BRANCH_NAME` and `PACKAGE_NAME` are replaced with the owner
+of the fork, the branch the packages were built from, and the package name.)
+
 ## Contributing
 
 We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)
diff --git a/tools/ci.sh b/tools/ci.sh
index 75c8791d5..548680682 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+########################################################################################
+# common "constants"
+PACKAGE_INDEX_PATH=/tmp/micropython-lib-deploy
+
 ########################################################################################
 # code formatting
 
@@ -38,5 +42,104 @@ function ci_build_packages_check_manifest {
 }
 
 function ci_build_packages_compile_index {
-    python3 tools/build.py --micropython /tmp/micropython --output /tmp/micropython-lib-deploy
+    python3 tools/build.py --micropython /tmp/micropython --output $PACKAGE_INDEX_PATH
+}
+
+function ci_push_package_index {
+    set -euo pipefail
+
+    # Note: This feature is opt-in, so this function is only run by GitHub
+    # Actions if the MICROPY_PUBLISH_MIP_INDEX repository variable is set to a
+    # "truthy" value in the "Secrets and variables" -> "Actions"
+    # -> "Variables" setting of the GitHub repo.
+
+    PAGES_PATH=/tmp/gh-pages
+
+    if git fetch --depth=1 origin gh-pages; then
+        git worktree add ${PAGES_PATH} gh-pages
+        cd ${PAGES_PATH}
+        NEW_BRANCH=0
+    else
+        echo "Creating gh-pages branch for $GITHUB_REPOSITORY..."
+        git worktree add --force ${PAGES_PATH} HEAD
+        cd ${PAGES_PATH}
+        git switch --orphan gh-pages
+        NEW_BRANCH=1
+    fi
+
+    DEST_PATH=${PAGES_PATH}/mip/${GITHUB_REF_NAME}
+    if [ -d ${DEST_PATH} ]; then
+        git rm -r ${DEST_PATH}
+    fi
+    mkdir -p ${DEST_PATH}
+    cd ${DEST_PATH}
+
+    cp -r ${PACKAGE_INDEX_PATH}/* .
+
+    git add .
+    git_bot_commit "Add CI built packages from commit ${GITHUB_SHA} of ${GITHUB_REF_NAME}"
+
+    if [ "$NEW_BRANCH" -eq 0 ]; then
+        # A small race condition exists here if another CI job pushes to
+        # gh-pages at the same time, but this narrows the race to the time
+        # between these two commands.
+        git pull --rebase origin gh-pages
+    fi
+    git push origin gh-pages
+
+    INDEX_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/$(echo ${GITHUB_REPOSITORY} | cut -d'/' -f2-)/mip/${GITHUB_REF_NAME}"
+
+    echo ""
+    echo "--------------------------------------------------"
+    echo "Uploaded package files to GitHub Pages."
+    echo ""
+    echo "Unless GitHub Pages is disabled on this repo, these files can be installed remotely with:"
+    echo ""
+    echo "mpremote mip install --index ${INDEX_URL} PACKAGE_NAME"
+    echo ""
+    echo "or on the device as:"
+    echo ""
+    echo "import mip"
+    echo "mip.install(PACKAGE_NAME, index=\"${INDEX_URL}\")"
+}
+
+function ci_cleanup_package_index()
+{
+    if ! git fetch --depth=1 origin gh-pages; then
+        exit 0
+    fi
+
+    # Argument $1 is github.event.ref, passed in from workflow file.
+    #
+    # this value seems to be a REF_NAME, without heads/ or tags/ prefix. (Can't
+    # use GITHUB_REF_NAME, this evaluates to the default branch.)
+    DELETED_REF="$1"
+
+    if [ -z "$DELETED_REF" ]; then
+        echo "Bad DELETE_REF $DELETED_REF"
+        exit 1  # Internal error with ref format, better than removing all mip/ directory in a commit
+    fi
+
+    # We need Actions to check out default branch and run tools/ci.sh, but then
+    # we switch branches
+    git switch gh-pages
+
+    echo "Removing any published packages for ${DELETED_REF}..."
+    if [ -d mip/${DELETED_REF} ]; then
+        git rm -r mip/${DELETED_REF}
+        git_bot_commit "Remove CI built packages from deleted ${DELETED_REF}"
+        git pull --rebase origin gh-pages
+        git push origin gh-pages
+    else
+        echo "Nothing to remove."
+    fi
+}
+
+# Make a git commit with bot authorship
+# Argument $1 is the commit message
+function git_bot_commit {
+    # Ref https://github.com/actions/checkout/discussions/479
+    git config user.name 'github-actions[bot]'
+    git config user.email 'github-actions[bot]@users.noreply.github.com'
+    git commit -m "$1"
 }

From 40dfc5fbc520c735fae332631df3d66ac46df205 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 24 Feb 2023 18:06:25 +1100
Subject: [PATCH 150/343] github/workflows: Attach built packages to GitHub
 workflow artifacts.

---
 .github/workflows/build_packages.yml | 8 ++++++++
 tools/ci.sh                          | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index ed469a0b2..b6781be44 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -2,6 +2,9 @@ name: Build all packages
 
 on: [push, pull_request]
 
+env:
+  PACKAGE_INDEX_PATH: /tmp/micropython-lib-deploy
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -17,3 +20,8 @@ jobs:
     - name: Publish packages for branch
       if: vars.MICROPY_PUBLISH_MIP_INDEX && github.event_name == 'push' && ! github.event.deleted
       run: source tools/ci.sh && ci_push_package_index
+    - name: Upload packages as artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: packages-${{ github.sha }}
+        path: ${{ env.PACKAGE_INDEX_PATH }}
diff --git a/tools/ci.sh b/tools/ci.sh
index 548680682..6490a95c0 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-########################################################################################
-# common "constants"
-PACKAGE_INDEX_PATH=/tmp/micropython-lib-deploy
-
 ########################################################################################
 # code formatting
 

From b9741f658417892f91728280508360d776e0175e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 2 Mar 2023 15:34:39 +0100
Subject: [PATCH 151/343] cbor2: Remove u-module prefix from imports.

---
 python-ecosys/cbor2/cbor2/decoder.py | 6 +++---
 python-ecosys/cbor2/cbor2/encoder.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python-ecosys/cbor2/cbor2/decoder.py b/python-ecosys/cbor2/cbor2/decoder.py
index 2460d87a0..f0784d4be 100644
--- a/python-ecosys/cbor2/cbor2/decoder.py
+++ b/python-ecosys/cbor2/cbor2/decoder.py
@@ -24,8 +24,8 @@
 """
 
 
-import uio
-import ustruct as struct
+import io
+import struct
 
 
 class CBORDecodeError(Exception):
@@ -248,7 +248,7 @@ def loads(payload, **kwargs):
     :param kwargs: keyword arguments passed to :class:`~.CBORDecoder`
     :return: the deserialized object
     """
-    fp = uio.BytesIO(payload)
+    fp = io.BytesIO(payload)
     return CBORDecoder(fp, **kwargs).decode()
 
 
diff --git a/python-ecosys/cbor2/cbor2/encoder.py b/python-ecosys/cbor2/cbor2/encoder.py
index 436886876..d739cea40 100644
--- a/python-ecosys/cbor2/cbor2/encoder.py
+++ b/python-ecosys/cbor2/cbor2/encoder.py
@@ -24,9 +24,9 @@
 """
 
 
-import uio
+import io
 import math
-import ustruct as struct
+import struct
 
 
 class CBOREncodeError(Exception):
@@ -169,7 +169,7 @@ def dumps(obj, **kwargs):
     :return: the serialized output
     :rtype: bytes
     """
-    fp = uio.BytesIO()
+    fp = io.BytesIO()
     dump(obj, fp, **kwargs)
     return fp.getvalue()
 

From 295a9e300a60f749c5aa54556be98614ad439f41 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 2 Mar 2023 15:35:25 +0100
Subject: [PATCH 152/343] senml: Remove u-module prefix from imports.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/senml/examples/base.py                 | 2 +-
 micropython/senml/examples/basic.py                | 2 +-
 micropython/senml/examples/basic2.py               | 2 +-
 micropython/senml/examples/basic_cbor.py           | 2 +-
 micropython/senml/examples/custom_record.py        | 2 +-
 micropython/senml/examples/gateway.py              | 2 +-
 micropython/senml/examples/supported_data_types.py | 2 +-
 micropython/senml/senml/senml_pack.py              | 6 +++---
 micropython/senml/senml/senml_record.py            | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/micropython/senml/examples/base.py b/micropython/senml/examples/base.py
index c68188863..426cbbd0e 100644
--- a/micropython/senml/examples/base.py
+++ b/micropython/senml/examples/base.py
@@ -25,7 +25,7 @@
 
 
 from senml import *
-import utime as time
+import time
 
 
 pack = SenmlPack("device_name")
diff --git a/micropython/senml/examples/basic.py b/micropython/senml/examples/basic.py
index 470364f1b..18a3a9a06 100644
--- a/micropython/senml/examples/basic.py
+++ b/micropython/senml/examples/basic.py
@@ -25,7 +25,7 @@
 
 
 from senml import *
-import utime as time
+import time
 
 
 pack = SenmlPack("device")
diff --git a/micropython/senml/examples/basic2.py b/micropython/senml/examples/basic2.py
index 7c4dee267..c2ea153bd 100644
--- a/micropython/senml/examples/basic2.py
+++ b/micropython/senml/examples/basic2.py
@@ -25,7 +25,7 @@
 
 
 from senml import *
-import utime as time
+import time
 
 
 pack = SenmlPack("device_name")
diff --git a/micropython/senml/examples/basic_cbor.py b/micropython/senml/examples/basic_cbor.py
index de696b1a9..f5e92af37 100644
--- a/micropython/senml/examples/basic_cbor.py
+++ b/micropython/senml/examples/basic_cbor.py
@@ -25,7 +25,7 @@
 
 
 from senml import *
-import utime as time
+import time
 from cbor2 import decoder
 
 pack = SenmlPack("device_name")
diff --git a/micropython/senml/examples/custom_record.py b/micropython/senml/examples/custom_record.py
index 07e4e177c..e754c897c 100644
--- a/micropython/senml/examples/custom_record.py
+++ b/micropython/senml/examples/custom_record.py
@@ -26,7 +26,7 @@
 
 from senml import *
 
-import utime as time
+import time
 
 
 class Coordinates(SenmlRecord):
diff --git a/micropython/senml/examples/gateway.py b/micropython/senml/examples/gateway.py
index c3bef12da..d28e4cffc 100644
--- a/micropython/senml/examples/gateway.py
+++ b/micropython/senml/examples/gateway.py
@@ -25,7 +25,7 @@
 
 
 from senml import *
-import utime as time
+import time
 
 gateway_pack = SenmlPack("gateway")
 
diff --git a/micropython/senml/examples/supported_data_types.py b/micropython/senml/examples/supported_data_types.py
index 59799cb9c..3149f49d2 100644
--- a/micropython/senml/examples/supported_data_types.py
+++ b/micropython/senml/examples/supported_data_types.py
@@ -25,7 +25,7 @@
 
 
 from senml import *
-import utime as time
+import time
 
 pack = SenmlPack("device_name")
 
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
index 03ca612ac..d528911ff 100644
--- a/micropython/senml/senml/senml_pack.py
+++ b/micropython/senml/senml/senml_pack.py
@@ -26,7 +26,7 @@
 
 from senml.senml_record import SenmlRecord
 from senml.senml_base import SenmlBase
-import ujson
+import json
 from cbor2 import encoder
 from cbor2 import decoder
 
@@ -166,7 +166,7 @@ def from_json(self, data):
         :param data: a string containing json data.
         :return: None, will r
         """
-        records = ujson.loads(data)  # load the raw senml data
+        records = json.loads(data)  # load the raw senml data
         self._process_incomming_data(records, SenmlPack.json_mappings)
 
     def _process_incomming_data(self, records, naming_map):
@@ -242,7 +242,7 @@ def to_json(self):
         """
         converted = []
         self._build_rec_dict(SenmlPack.json_mappings, converted)
-        return ujson.dumps(converted)
+        return json.dumps(converted)
 
     def _build_rec_dict(self, naming_map, appendTo):
         """
diff --git a/micropython/senml/senml/senml_record.py b/micropython/senml/senml/senml_record.py
index be280d3ae..5c99a4474 100644
--- a/micropython/senml/senml/senml_record.py
+++ b/micropython/senml/senml/senml_record.py
@@ -24,7 +24,7 @@
 """
 
 
-import ubinascii
+import binascii
 from senml.senml_base import SenmlBase
 
 
@@ -229,7 +229,7 @@ def _from_raw(self, raw, naming_map):
         elif naming_map["vb"] in raw:
             val = raw[naming_map["vb"]]
         elif naming_map["vd"] in raw:
-            val = ubinascii.a2b_base64(raw[naming_map["vb"]])
+            val = binascii.a2b_base64(raw[naming_map["vb"]])
         else:
             val = None
         self.value = val

From c8603192d1d142fdeb7f9578e000c9834669a082 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 3 Mar 2023 09:09:23 +0100
Subject: [PATCH 153/343] senml: Fix data record encoding to use binascii
 instead of base64.

---
 micropython/senml/senml/senml_record.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/micropython/senml/senml/senml_record.py b/micropython/senml/senml/senml_record.py
index 5c99a4474..fe7c56c46 100644
--- a/micropython/senml/senml/senml_record.py
+++ b/micropython/senml/senml/senml_record.py
@@ -190,7 +190,9 @@ def _build_rec_dict(self, naming_map, appendTo):
             if (
                 naming_map["vd"] == "vd"
             ):  # neeed to make a distinction between json (needs base64) and cbor (needs binary)
-                result[naming_map["vd"]] = base64.b64encode(self._value)
+                result[naming_map["vd"]] = binascii.b2a_base64(self._value, newline=False).decode(
+                    "utf8"
+                )
             else:
                 result[naming_map["vd"]] = self._value
         else:

From ea21cb3fdcc8633bdaae11c41ad4255c5be7a793 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Mar 2023 16:01:01 +1100
Subject: [PATCH 154/343] iperf3: Support devices without os.urandom().

Also add a version to the manifest.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-ecosys/iperf3/iperf3.py   | 18 ++++++++++++++----
 python-ecosys/iperf3/manifest.py |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/python-ecosys/iperf3/iperf3.py b/python-ecosys/iperf3/iperf3.py
index 59a4d6902..614bc6193 100644
--- a/python-ecosys/iperf3/iperf3.py
+++ b/python-ecosys/iperf3/iperf3.py
@@ -12,10 +12,20 @@
     iperf3.client('192.168.1.5', udp=True, reverse=True)
 """
 
-import sys, os, struct
+import sys, struct
 import time, select, socket
 import json
 
+# Provide a urandom() function, supporting devices without os.urandom().
+try:
+    from os import urandom
+except ImportError:
+    from random import randint
+
+    def urandom(n):
+        return bytes(randint(0, 255) for _ in range(n))
+
+
 DEBUG = False
 
 # iperf3 cookie size, last byte is null byte
@@ -177,7 +187,7 @@ def recvninto(s, buf):
 def make_cookie():
     cookie_chars = b"abcdefghijklmnopqrstuvwxyz234567"
     cookie = bytearray(COOKIE_SIZE)
-    for i, x in enumerate(os.urandom(COOKIE_SIZE - 1)):
+    for i, x in enumerate(urandom(COOKIE_SIZE - 1)):
         cookie[i] = cookie_chars[x & 31]
     return cookie
 
@@ -243,7 +253,7 @@ def server_once():
     stats = Stats(param)
     stats.start()
     running = True
-    data_buf = bytearray(os.urandom(param["len"]))
+    data_buf = bytearray(urandom(param["len"]))
     while running:
         for pollable in poll.poll(stats.max_dt_ms()):
             if pollable_is_sock(pollable, s_ctrl):
@@ -445,7 +455,7 @@ def client(host, udp=False, reverse=False, bandwidth=10 * 1024 * 1024):
                         s_data = socket.socket(ai[0], socket.SOCK_STREAM)
                         s_data.connect(ai[-1])
                         s_data.sendall(cookie)
-                    buf = bytearray(os.urandom(param["len"]))
+                    buf = bytearray(urandom(param["len"]))
                 elif cmd == EXCHANGE_RESULTS:
                     # Close data socket now that server knows we are finished, to prevent it flooding us
                     poll.unregister(s_data)
diff --git a/python-ecosys/iperf3/manifest.py b/python-ecosys/iperf3/manifest.py
index dafba2e12..231136927 100644
--- a/python-ecosys/iperf3/manifest.py
+++ b/python-ecosys/iperf3/manifest.py
@@ -1 +1,3 @@
+metadata(version="0.1.3")
+
 module("iperf3.py")

From f6723531802661e5a1fd3d63d3b7b68c38f40cd2 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 16 Mar 2023 11:00:22 +1100
Subject: [PATCH 155/343] unittest-discover: Print results when no tests are
 found/run.

Prior to this commit, if no tests were found when running unittest discover
then nothing at all was written to stdout, leading one to think it's not
working at all.  CPython unittest does display a "0 tests run" sort of
output in such a case, and this commit ensures this package does the same.
---
 python-stdlib/unittest-discover/manifest.py      |  2 +-
 .../unittest-discover/unittest/__main__.py       | 16 ++++++++++------
 python-stdlib/unittest/manifest.py               |  2 +-
 python-stdlib/unittest/unittest/__init__.py      |  7 ++++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/python-stdlib/unittest-discover/manifest.py b/python-stdlib/unittest-discover/manifest.py
index 87bd94ae0..14bec5201 100644
--- a/python-stdlib/unittest-discover/manifest.py
+++ b/python-stdlib/unittest-discover/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1.1")
+metadata(version="0.1.2")
 
 require("argparse")
 require("fnmatch")
diff --git a/python-stdlib/unittest-discover/unittest/__main__.py b/python-stdlib/unittest-discover/unittest/__main__.py
index e64c18c1b..8eb173a22 100644
--- a/python-stdlib/unittest-discover/unittest/__main__.py
+++ b/python-stdlib/unittest-discover/unittest/__main__.py
@@ -111,7 +111,6 @@ def _dirname_filename_no_ext(path):
 
 
 def discover_main():
-    failures = 0
     runner = TestRunner()
 
     if len(sys.argv) == 1 or (
@@ -121,22 +120,27 @@ def discover_main():
     ):
         # No args, or `python -m unittest discover ...`.
         result = _discover(runner)
-        failures += result.failuresNum or result.errorsNum
     else:
+        result = TestResult()
         for test_spec in sys.argv[1:]:
             try:
                 os.stat(test_spec)
                 # File exists, strip extension and import with its parent directory in sys.path.
                 dirname, module_name = _dirname_filename_no_ext(test_spec)
-                result = _run_test_module(runner, module_name, dirname)
+                res = _run_test_module(runner, module_name, dirname)
             except OSError:
                 # Not a file, treat as named module to import.
-                result = _run_test_module(runner, test_spec)
+                res = _run_test_module(runner, test_spec)
 
-            failures += result.failuresNum or result.errorsNum
+            result += res
+
+    if not result.testsRun:
+        # If tests are run their results are already printed.
+        # Ensure an appropriate output is printed if no tests are found.
+        runner.run(TestSuite())
 
     # Terminate with non zero return code in case of failures.
-    sys.exit(failures)
+    sys.exit(result.failuresNum + result.errorsNum)
 
 
 discover_main()
diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
index 8e419b63c..101e3e833 100644
--- a/python-stdlib/unittest/manifest.py
+++ b/python-stdlib/unittest/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.10.2")
+metadata(version="0.10.3")
 
 package("unittest")
diff --git a/python-stdlib/unittest/unittest/__init__.py b/python-stdlib/unittest/unittest/__init__.py
index ac24e7535..f15f30448 100644
--- a/python-stdlib/unittest/unittest/__init__.py
+++ b/python-stdlib/unittest/unittest/__init__.py
@@ -300,9 +300,10 @@ def wasSuccessful(self):
         return self.errorsNum == 0 and self.failuresNum == 0
 
     def printErrors(self):
-        print()
-        self.printErrorList(self.errors)
-        self.printErrorList(self.failures)
+        if self.errors or self.failures:
+            print()
+            self.printErrorList(self.errors)
+            self.printErrorList(self.failures)
 
     def printErrorList(self, lst):
         sep = "----------------------------------------------------------------------"

From 386ab99d7fd1c480de9084fe45b6359789f478c0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 6 Apr 2023 12:05:04 +1000
Subject: [PATCH 156/343] python-ecosys: Add pypi= to metadata.

This is so the package knows the "upstream" name of the corresponding PyPI
package that it's based on.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-ecosys/cbor2/manifest.py     | 2 +-
 python-ecosys/iperf3/manifest.py    | 2 +-
 python-ecosys/pyjwt/manifest.py     | 2 +-
 python-ecosys/urequests/manifest.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python-ecosys/cbor2/manifest.py b/python-ecosys/cbor2/manifest.py
index 5a7ff9dc9..b94ecc886 100644
--- a/python-ecosys/cbor2/manifest.py
+++ b/python-ecosys/cbor2/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.0", pypi="cbor2")
 
 package("cbor2")
diff --git a/python-ecosys/iperf3/manifest.py b/python-ecosys/iperf3/manifest.py
index 231136927..3f2e26237 100644
--- a/python-ecosys/iperf3/manifest.py
+++ b/python-ecosys/iperf3/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.3")
+metadata(version="0.1.3", pypi="iperf3", pypi_publish="uiperf3")
 
 module("iperf3.py")
diff --git a/python-ecosys/pyjwt/manifest.py b/python-ecosys/pyjwt/manifest.py
index 8e9b22c18..e04433280 100644
--- a/python-ecosys/pyjwt/manifest.py
+++ b/python-ecosys/pyjwt/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1")
+metadata(version="0.1", pypi="pyjwt")
 
 require("hmac")
 
diff --git a/python-ecosys/urequests/manifest.py b/python-ecosys/urequests/manifest.py
index 5fd2e8a28..4c134081c 100644
--- a/python-ecosys/urequests/manifest.py
+++ b/python-ecosys/urequests/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.7.0")
+metadata(version="0.7.0", pypi="requests")
 
 module("urequests.py")

From afc9d0a541c2d12adfcf04aa1dfb7aed58a39ff7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 6 Apr 2023 12:05:44 +1000
Subject: [PATCH 157/343] micropython: Add missing metadata for packages.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/bus/onewire/manifest.py      | 2 ++
 micropython/drivers/codec/wm8960/manifest.py     | 2 ++
 micropython/drivers/display/lcd160cr/manifest.py | 2 ++
 micropython/drivers/display/ssd1306/manifest.py  | 2 ++
 micropython/drivers/led/neopixel/manifest.py     | 2 ++
 micropython/drivers/radio/nrf24l01/manifest.py   | 2 ++
 micropython/drivers/sensor/dht/manifest.py       | 2 ++
 micropython/drivers/sensor/ds18x20/manifest.py   | 2 ++
 micropython/drivers/sensor/hts221/manifest.py    | 2 ++
 micropython/drivers/sensor/lps22h/manifest.py    | 2 ++
 micropython/drivers/storage/sdcard/manifest.py   | 2 ++
 micropython/net/ntptime/manifest.py              | 2 ++
 micropython/net/webrepl/manifest.py              | 2 ++
 13 files changed, 26 insertions(+)

diff --git a/micropython/drivers/bus/onewire/manifest.py b/micropython/drivers/bus/onewire/manifest.py
index 44edcac69..32e2b57d6 100644
--- a/micropython/drivers/bus/onewire/manifest.py
+++ b/micropython/drivers/bus/onewire/manifest.py
@@ -1 +1,3 @@
+metadata(description="Onewire driver.", version="0.1.0")
+
 module("onewire.py", opt=3)
diff --git a/micropython/drivers/codec/wm8960/manifest.py b/micropython/drivers/codec/wm8960/manifest.py
index 4ff5d9fc4..2184ba547 100644
--- a/micropython/drivers/codec/wm8960/manifest.py
+++ b/micropython/drivers/codec/wm8960/manifest.py
@@ -1 +1,3 @@
+metadata(description="WM8960 codec.", version="0.1.0")
+
 module("wm8960.py", opt=3)
diff --git a/micropython/drivers/display/lcd160cr/manifest.py b/micropython/drivers/display/lcd160cr/manifest.py
index 62a19eb2b..5ce055717 100644
--- a/micropython/drivers/display/lcd160cr/manifest.py
+++ b/micropython/drivers/display/lcd160cr/manifest.py
@@ -1,3 +1,5 @@
+metadata(description="LCD160CR driver.", version="0.1.0")
+
 options.defaults(test=False)
 
 module("lcd160cr.py", opt=3)
diff --git a/micropython/drivers/display/ssd1306/manifest.py b/micropython/drivers/display/ssd1306/manifest.py
index 51580080e..80253be44 100644
--- a/micropython/drivers/display/ssd1306/manifest.py
+++ b/micropython/drivers/display/ssd1306/manifest.py
@@ -1 +1,3 @@
+metadata(description="SSD1306 OLED driver.", version="0.1.0")
+
 module("ssd1306.py", opt=3)
diff --git a/micropython/drivers/led/neopixel/manifest.py b/micropython/drivers/led/neopixel/manifest.py
index 561d19574..02a319002 100644
--- a/micropython/drivers/led/neopixel/manifest.py
+++ b/micropython/drivers/led/neopixel/manifest.py
@@ -1 +1,3 @@
+metadata(description="WS2812/NeoPixel driver.", version="0.1.0")
+
 module("neopixel.py", opt=3)
diff --git a/micropython/drivers/radio/nrf24l01/manifest.py b/micropython/drivers/radio/nrf24l01/manifest.py
index babdb7a52..474d422f9 100644
--- a/micropython/drivers/radio/nrf24l01/manifest.py
+++ b/micropython/drivers/radio/nrf24l01/manifest.py
@@ -1 +1,3 @@
+metadata(description="nrf24l01 2.4GHz radio driver.", version="0.1.0")
+
 module("nrf24l01.py", opt=3)
diff --git a/micropython/drivers/sensor/dht/manifest.py b/micropython/drivers/sensor/dht/manifest.py
index 72a4e0d24..964e8e252 100644
--- a/micropython/drivers/sensor/dht/manifest.py
+++ b/micropython/drivers/sensor/dht/manifest.py
@@ -1 +1,3 @@
+metadata(description="DHT11 & DHT22 temperature/humidity sensor driver.", version="0.1.0")
+
 module("dht.py", opt=3)
diff --git a/micropython/drivers/sensor/ds18x20/manifest.py b/micropython/drivers/sensor/ds18x20/manifest.py
index 01f7ae035..6ced882f7 100644
--- a/micropython/drivers/sensor/ds18x20/manifest.py
+++ b/micropython/drivers/sensor/ds18x20/manifest.py
@@ -1,2 +1,4 @@
+metadata(description="DS18x20 temperature sensor driver.", version="0.1.0")
+
 require("onewire")
 module("ds18x20.py", opt=3)
diff --git a/micropython/drivers/sensor/hts221/manifest.py b/micropython/drivers/sensor/hts221/manifest.py
index 5f1792665..d85edaac8 100644
--- a/micropython/drivers/sensor/hts221/manifest.py
+++ b/micropython/drivers/sensor/hts221/manifest.py
@@ -1 +1,3 @@
+metadata(description="HTS221 temperature/humidity sensor driver.", version="0.1.0")
+
 module("hts221.py", opt=3)
diff --git a/micropython/drivers/sensor/lps22h/manifest.py b/micropython/drivers/sensor/lps22h/manifest.py
index d30108d93..971cbfdcb 100644
--- a/micropython/drivers/sensor/lps22h/manifest.py
+++ b/micropython/drivers/sensor/lps22h/manifest.py
@@ -1 +1,3 @@
+metadata(description="LPS22H temperature/pressure sensor driver.", version="0.1.0")
+
 module("lps22h.py", opt=3)
diff --git a/micropython/drivers/storage/sdcard/manifest.py b/micropython/drivers/storage/sdcard/manifest.py
index e584b97d9..cb4647eeb 100644
--- a/micropython/drivers/storage/sdcard/manifest.py
+++ b/micropython/drivers/storage/sdcard/manifest.py
@@ -1 +1,3 @@
+metadata(description="SDCard block device driver.", version="0.1.0")
+
 module("sdcard.py", opt=3)
diff --git a/micropython/net/ntptime/manifest.py b/micropython/net/ntptime/manifest.py
index fa444ec75..97e3c14a3 100644
--- a/micropython/net/ntptime/manifest.py
+++ b/micropython/net/ntptime/manifest.py
@@ -1 +1,3 @@
+metadata(description="NTP client.", version="0.1.0")
+
 module("ntptime.py", opt=3)
diff --git a/micropython/net/webrepl/manifest.py b/micropython/net/webrepl/manifest.py
index 6d1a31421..20527db4f 100644
--- a/micropython/net/webrepl/manifest.py
+++ b/micropython/net/webrepl/manifest.py
@@ -1,2 +1,4 @@
+metadata(description="WebREPL server.", version="0.1.0")
+
 module("webrepl.py", opt=3)
 module("webrepl_setup.py", opt=3)

From 9b5f4d73b00b921f1a540d517b176dbfee916be8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 31 Mar 2023 14:18:36 +1100
Subject: [PATCH 158/343] tools/makepyproject.py: Add tool to generate PyPI
 package.

This tool makes a buildable package (including pyproject.toml) from
supported micropython-lib packages, suitable for publishing to PyPI and
using from CPython.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/build.py         |  18 ++--
 tools/makepyproject.py | 215 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 224 insertions(+), 9 deletions(-)
 create mode 100755 tools/makepyproject.py

diff --git a/tools/build.py b/tools/build.py
index 305870be7..ca664175f 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -112,7 +112,6 @@
 
 # mip (or other tools) should request /package/{mpy_version}/{package_name}/{version}.json.
 
-import argparse
 import glob
 import hashlib
 import json
@@ -132,7 +131,7 @@
 
 
 # Create all directories in the path (such that the file can be created).
-def _ensure_path_exists(file_path):
+def ensure_path_exists(file_path):
     path = os.path.dirname(file_path)
     if not os.path.isdir(path):
         os.makedirs(path)
@@ -155,7 +154,7 @@ def _identical_files(path_a, path_b):
 # Helper to write the object as json to the specified path, creating any
 # directories as required.
 def _write_json(obj, path, minify=False):
-    _ensure_path_exists(path)
+    ensure_path_exists(path)
     with open(path, "w") as f:
         json.dump(
             obj, f, indent=(None if minify else 2), separators=((",", ":") if minify else None)
@@ -173,7 +172,7 @@ def _write_package_json(
 
 
 # Format s with bold red.
-def _error_color(s):
+def error_color(s):
     return _COLOR_ERROR_ON + s + _COLOR_ERROR_OFF
 
 
@@ -191,7 +190,7 @@ def _write_hashed_file(package_name, src, target_path, out_file_dir, hash_prefix
         # that it's actually the same file.
         if not _identical_files(src.name, output_file_path):
             print(
-                _error_color("Hash collision processing:"),
+                error_color("Hash collision processing:"),
                 package_name,
                 file=sys.stderr,
             )
@@ -204,7 +203,7 @@ def _write_hashed_file(package_name, src, target_path, out_file_dir, hash_prefix
             sys.exit(1)
     else:
         # Create new file.
-        _ensure_path_exists(output_file_path)
+        ensure_path_exists(output_file_path)
         shutil.copyfile(src.name, output_file_path)
 
     return short_file_hash
@@ -235,7 +234,7 @@ def _compile_as_mpy(
             )
         except mpy_cross.CrossCompileError as e:
             print(
-                _error_color("Error:"),
+                error_color("Error:"),
                 "Unable to compile",
                 target_path,
                 "in package",
@@ -329,7 +328,7 @@ def build(output_path, hash_prefix_len, mpy_cross_path):
 
             # Append this package to the index.
             if not manifest.metadata().version:
-                print(_error_color("Warning:"), package_name, "doesn't have a version.")
+                print(error_color("Warning:"), package_name, "doesn't have a version.")
 
             # Try to find this package in the previous index.json.
             for p in index_json["packages"]:
@@ -360,11 +359,12 @@ def build(output_path, hash_prefix_len, mpy_cross_path):
             for result in manifest.files():
                 # This isn't allowed in micropython-lib anyway.
                 if result.file_type != manifestfile.FILE_TYPE_LOCAL:
-                    print("Non-local file not supported.", file=sys.stderr)
+                    print(error_color("Error:"), "Non-local file not supported.", file=sys.stderr)
                     sys.exit(1)
 
                 if not result.target_path.endswith(".py"):
                     print(
+                        error_color("Error:"),
                         "Target path isn't a .py file:",
                         result.target_path,
                         file=sys.stderr,
diff --git a/tools/makepyproject.py b/tools/makepyproject.py
new file mode 100755
index 000000000..eaaef01b3
--- /dev/null
+++ b/tools/makepyproject.py
@@ -0,0 +1,215 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2023 Jim Mussared
+#
+# 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.
+
+# This script makes a CPython-compatible package from a micropython-lib package
+# with a pyproject.toml that can be built (via hatch) and deployed to PyPI.
+# Requires that the project sets the pypi_publish= kwarg in its metadata().
+
+# Usage:
+# ./tools/makepyproject.py --output /tmp/foo micropython/foo
+# python -m build /tmp/foo
+# python -m twine upload /tmp/foo/dist/*.whl
+
+from email.utils import parseaddr
+import os
+import re
+import shutil
+import sys
+
+from build import error_color, ensure_path_exists
+
+
+DEFAULT_AUTHOR = "micropython-lib <contact@micropython.org>"
+DEFAULT_LICENSE = "MIT"
+
+
+def quoted_escape(s):
+    return s.replace('"', '\\"')
+
+
+def build(manifest_path, output_path):
+    import manifestfile
+
+    if not manifest_path.endswith(".py"):
+        # Allow specifying either the directory or the manifest file explicitly.
+        manifest_path = os.path.join(manifest_path, "manifest.py")
+
+    print("Generating pyproject for {} in {}...".format(manifest_path, output_path))
+
+    toml_path = os.path.join(output_path, "pyproject.toml")
+    ensure_path_exists(toml_path)
+
+    path_vars = {
+        "MPY_LIB_DIR": os.path.abspath(os.path.join(os.path.dirname(__file__), "..")),
+    }
+
+    # .../foo/manifest.py -> foo
+    package_name = os.path.basename(os.path.dirname(manifest_path))
+
+    # Compile the manifest.
+    manifest = manifestfile.ManifestFile(manifestfile.MODE_PYPROJECT, path_vars)
+    manifest.execute(manifest_path)
+
+    # If a package doesn't have a pypi name, then assume it isn't intended to
+    # be publishable.
+    if not manifest.metadata().pypi_publish:
+        print(error_color("Error:"), package_name, "doesn't have a pypi_publish name.")
+        sys.exit(1)
+
+    # These should be in all packages eventually.
+    if not manifest.metadata().version:
+        print(error_color("Error:"), package_name, "doesn't have a version.")
+        sys.exit(1)
+    if not manifest.metadata().description:
+        print(error_color("Error:"), package_name, "doesn't have a description.")
+        sys.exit(1)
+
+    # This is the root path of all .py files that are copied. We ensure that
+    # they all match.
+    top_level_package = None
+
+    for result in manifest.files():
+        # This isn't allowed in micropython-lib anyway.
+        if result.file_type != manifestfile.FILE_TYPE_LOCAL:
+            print(error_color("Error:"), "Non-local file not supported.", file=sys.stderr)
+            sys.exit(1)
+
+        # "foo/bar/baz.py" --> "foo"
+        # "baz.py" --> ""
+        result_package = os.path.split(result.target_path)[0]
+
+        if not result_package:
+            # This is a standalone .py file.
+            print(
+                error_color("Error:"),
+                "Unsupported single-file module: {}".format(result.target_path),
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        if top_level_package and result_package != top_level_package:
+            # This likely suggests that something needs to use require(..., pypi="...").
+            print(
+                error_color("Error:"),
+                "More than one top-level package: {}, {}.".format(
+                    result_package, top_level_package
+                ),
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        top_level_package = result_package
+
+        # Tag each file with the package metadata and copy the .py directly.
+        with manifestfile.tagged_py_file(result.full_path, result.metadata) as tagged_path:
+            dest_path = os.path.join(output_path, result.target_path)
+            ensure_path_exists(dest_path)
+            shutil.copyfile(tagged_path, dest_path)
+
+    # Copy README.md if it exists
+    readme_path = os.path.join(os.path.dirname(manifest_path), "README.md")
+    readme_toml = ""
+    if os.path.exists(readme_path):
+        shutil.copyfile(readme_path, os.path.join(output_path, "README.md"))
+        readme_toml = 'readme = "README.md"'
+
+    # Apply default author and license, otherwise use the package metadata.
+    license_toml = 'license = {{ text = "{}" }}'.format(
+        quoted_escape(manifest.metadata().license or DEFAULT_LICENSE)
+    )
+    author_name, author_email = parseaddr(manifest.metadata().author or DEFAULT_AUTHOR)
+    author_toml = 'authors = [ {{ name = "{}", email = "{}"}} ]'.format(
+        quoted_escape(author_name), quoted_escape(author_email)
+    )
+
+    # Write pyproject.toml.
+    with open(toml_path, "w") as toml_file:
+        print("# Generated by makepyproject.py", file=toml_file)
+
+        print(
+            """
+[build-system]
+requires = [
+    "hatchling"
+]
+build-backend = "hatchling.build"
+""",
+            file=toml_file,
+        )
+
+        print(
+            """
+[project]
+name = "{}"
+description = "{}"
+{}
+{}
+version = "{}"
+dependencies = [{}]
+urls = {{ Homepage = "https://github.com/micropython/micropython-lib" }}
+{}
+""".format(
+                quoted_escape(manifest.metadata().pypi_publish),
+                quoted_escape(manifest.metadata().description),
+                author_toml,
+                license_toml,
+                quoted_escape(manifest.metadata().version),
+                ", ".join('"{}"'.format(quoted_escape(r)) for r in manifest.pypi_dependencies()),
+                readme_toml,
+            ),
+            file=toml_file,
+        )
+
+        print(
+            """
+[tool.hatch.build]
+packages = ["{}"]
+""".format(
+                top_level_package
+            ),
+            file=toml_file,
+        )
+
+    print("Done.")
+
+
+def main():
+    import argparse
+
+    cmd_parser = argparse.ArgumentParser(
+        description="Generate a project that can be pushed to PyPI."
+    )
+    cmd_parser.add_argument("--output", required=True, help="output directory")
+    cmd_parser.add_argument("--micropython", default=None, help="path to micropython repo")
+    cmd_parser.add_argument("manifest", help="input package path")
+    args = cmd_parser.parse_args()
+
+    if args.micropython:
+        sys.path.append(os.path.join(args.micropython, "tools"))  # for manifestfile
+
+    build(args.manifest, args.output)
+
+
+if __name__ == "__main__":
+    main()

From 01db3da37e916bb76b09255ce3a852f4864e9fe6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 31 Mar 2023 14:21:37 +1100
Subject: [PATCH 159/343] senml: Allow publishing to PyPI as micropython-senml.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/senml/manifest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/micropython/senml/manifest.py b/micropython/senml/manifest.py
index e09f1ab79..216717caf 100644
--- a/micropython/senml/manifest.py
+++ b/micropython/senml/manifest.py
@@ -1,4 +1,8 @@
-metadata(version="0.1.0")
+metadata(
+    description="SenML serialisation for MicroPython.",
+    version="0.1.0",
+    pypi_publish="micropython-senml",
+)
 
 require("cbor2")
 

From c113611765278b2fc8dcf8b2f2c3513b35a69b39 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 12 Apr 2023 00:48:31 +1000
Subject: [PATCH 160/343] aioble: Fix descriptor flag handling.

Removes the workaround for micropython/issues/6864.

Sets the default flags for discovered descriptors to be WRITE,
so that d.write() will implicitly set response=True.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/bluetooth/aioble-client/manifest.py | 2 +-
 micropython/bluetooth/aioble-server/manifest.py | 2 +-
 micropython/bluetooth/aioble/aioble/client.py   | 2 +-
 micropython/bluetooth/aioble/aioble/server.py   | 8 ++------
 micropython/bluetooth/aioble/manifest.py        | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/micropython/bluetooth/aioble-client/manifest.py b/micropython/bluetooth/aioble-client/manifest.py
index eb79c6d33..163cbe23d 100644
--- a/micropython/bluetooth/aioble-client/manifest.py
+++ b/micropython/bluetooth/aioble-client/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.3.0")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble-server/manifest.py b/micropython/bluetooth/aioble-server/manifest.py
index a9676204d..fc51154f8 100644
--- a/micropython/bluetooth/aioble-server/manifest.py
+++ b/micropython/bluetooth/aioble-server/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.3.0")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/aioble/client.py b/micropython/bluetooth/aioble/aioble/client.py
index a205e0a3b..ccde03527 100644
--- a/micropython/bluetooth/aioble/aioble/client.py
+++ b/micropython/bluetooth/aioble/aioble/client.py
@@ -439,7 +439,7 @@ class ClientDescriptor(BaseClientCharacteristic):
     def __init__(self, characteristic, dsc_handle, uuid):
         self.characteristic = characteristic
 
-        super().__init__(dsc_handle, _FLAG_READ | _FLAG_WRITE_NO_RESPONSE, uuid)
+        super().__init__(dsc_handle, _FLAG_READ | _FLAG_WRITE, uuid)
 
     def __str__(self):
         return "Descriptor: {} {} {}".format(self._value_handle, self.properties, self.uuid)
diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index 76374a36d..b6cc4a3c2 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -38,9 +38,6 @@
 
 _FLAG_WRITE_CAPTURE = const(0x10000)
 
-_FLAG_DESC_READ = const(1)
-_FLAG_DESC_WRITE = const(2)
-
 
 _WRITE_CAPTURE_QUEUE_LIMIT = const(10)
 
@@ -307,14 +304,13 @@ class Descriptor(BaseCharacteristic):
     def __init__(self, characteristic, uuid, read=False, write=False, initial=None):
         characteristic.descriptors.append(self)
 
-        # Workaround for https://github.com/micropython/micropython/issues/6864
         flags = 0
         if read:
-            flags |= _FLAG_DESC_READ
+            flags |= _FLAG_READ
         if write:
+            flags |= _FLAG_WRITE
             self._write_event = asyncio.ThreadSafeFlag()
             self._write_data = None
-            flags |= _FLAG_DESC_WRITE
 
         self.uuid = uuid
         self.flags = flags
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 071e81814..4c0edbb57 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.2.1")
+metadata(version="0.3.1")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From a1b9aa934c306a45849faa19d12cffe6bfd89d4c Mon Sep 17 00:00:00 2001
From: glenn20 <glenn.moloney@gmail.com>
Date: Fri, 7 Apr 2023 22:32:16 +1000
Subject: [PATCH 161/343] aioespnow: Add library providing asyncio support for
 espnow module.

This module provides asyncio support for the espnow module on ESP32 and
ESP8266 ports.
---
 micropython/aioespnow/README.md    | 91 ++++++++++++++++++++++++++++++
 micropython/aioespnow/aioespnow.py | 31 ++++++++++
 micropython/aioespnow/manifest.py  |  6 ++
 3 files changed, 128 insertions(+)
 create mode 100644 micropython/aioespnow/README.md
 create mode 100644 micropython/aioespnow/aioespnow.py
 create mode 100644 micropython/aioespnow/manifest.py

diff --git a/micropython/aioespnow/README.md b/micropython/aioespnow/README.md
new file mode 100644
index 000000000..a68e765af
--- /dev/null
+++ b/micropython/aioespnow/README.md
@@ -0,0 +1,91 @@
+# `aioespnow`
+
+A supplementary module which extends the micropython `espnow` module to provide
+`asyncio` support.
+
+- Asyncio support is available on all ESP32 targets as well as those ESP8266
+boards which include the `uasyncio` module (ie. ESP8266 devices with at least
+2MB flash storage).
+
+## API reference
+
+- class `AIOESPNow()`: inherits all the methods of the `ESPNow` class and
+  extends the interface with the following async methods:
+
+  - `async AIOESPNow.arecv()`
+
+      Asyncio support for ESPNow.recv(). Note that this method does not take a
+      timeout value as argument.
+
+  - `async AIOESPNow.airecv()`
+
+      Asyncio support for ESPNow.irecv(). Use this method to reduce memory
+      fragmentation, as it will reuse common storage for each new message
+      received, whereas the `arecv()` method will allocate new memory for every
+      message received.
+
+  - `async AIOESPNow.asend(mac, msg, sync=True)`
+  - `async AIOESPNow.asend(msg)`
+
+      Asyncio support for ESPNow.send().
+
+  - `__aiter__()/async __anext__()`
+
+      AIOESPNow also supports reading incoming messages by asynchronous
+      iteration using `async for`, eg:
+
+    ```python
+      e = AIOESPNow()
+      e.active(True)
+      async def recv_till_halt(e):
+          async for mac, msg in e:
+              print(mac, msg)
+              if msg == b'halt':
+                  break
+      asyncio.run(recv_till_halt(e))
+    ```
+
+## Example Usage
+
+A small async server example::
+
+```python
+    import network
+    import aioespnow
+    import uasyncio as asyncio
+
+    # A WLAN interface must be active to send()/recv()
+    network.WLAN(network.STA_IF).active(True)
+
+    e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
+    e.active(True)
+    peer = b'\xbb\xbb\xbb\xbb\xbb\xbb'
+    e.add_peer(peer)
+
+    # Send a periodic ping to a peer
+    async def heartbeat(e, peer, period=30):
+        while True:
+            if not await e.asend(peer, b'ping'):
+                print("Heartbeat: peer not responding:", peer)
+            else:
+                print("Heartbeat: ping", peer)
+            await asyncio.sleep(period)
+
+    # Echo any received messages back to the sender
+    async def echo_server(e):
+        async for mac, msg in e:
+            print("Echo:", msg)
+            try:
+                await e.asend(mac, msg)
+            except OSError as err:
+                if len(err.args) > 1 and err.args[1] == 'ESP_ERR_ESPNOW_NOT_FOUND':
+                    e.add_peer(mac)
+                    await e.asend(mac, msg)
+
+    async def main(e, peer, timeout, period):
+        asyncio.create_task(heartbeat(e, peer, period))
+        asyncio.create_task(echo_server(e))
+        await asyncio.sleep(timeout)
+
+    asyncio.run(main(e, peer, 120, 10))
+```
diff --git a/micropython/aioespnow/aioespnow.py b/micropython/aioespnow/aioespnow.py
new file mode 100644
index 000000000..fb27ad7ad
--- /dev/null
+++ b/micropython/aioespnow/aioespnow.py
@@ -0,0 +1,31 @@
+# aioespnow module for MicroPython on ESP32 and ESP8266
+# MIT license; Copyright (c) 2022 Glenn Moloney @glenn20
+
+import uasyncio as asyncio
+import espnow
+
+
+# Modelled on the uasyncio.Stream class (extmod/stream/stream.py)
+# NOTE: Relies on internal implementation of uasyncio.core (_io_queue)
+class AIOESPNow(espnow.ESPNow):
+    # Read one ESPNow message
+    async def arecv(self):
+        yield asyncio.core._io_queue.queue_read(self)
+        return self.recv(0)  # type: ignore
+
+    async def airecv(self):
+        yield asyncio.core._io_queue.queue_read(self)
+        return self.irecv(0)  # type: ignore
+
+    async def asend(self, mac, msg=None, sync=None):
+        if msg is None:
+            msg, mac = mac, None  # If msg is None: swap mac and msg
+        yield asyncio.core._io_queue.queue_write(self)
+        return self.send(mac, msg, sync)  # type: ignore
+
+    # "async for" support
+    def __aiter__(self):
+        return self
+
+    async def __anext__(self):
+        return await self.airecv()
diff --git a/micropython/aioespnow/manifest.py b/micropython/aioespnow/manifest.py
new file mode 100644
index 000000000..bfacc9e96
--- /dev/null
+++ b/micropython/aioespnow/manifest.py
@@ -0,0 +1,6 @@
+metadata(
+    description="Extends the micropython espnow module with methods to support asyncio.",
+    version="0.1",
+)
+
+module("aioespnow.py")

From 7128d423c2e7c0309ac17a1e6ba873b909b24fcc Mon Sep 17 00:00:00 2001
From: Dan Ellis <dpwe@ee.columbia.edu>
Date: Sun, 14 May 2023 15:16:21 -0400
Subject: [PATCH 162/343] utarfile: Support creating/appending tar files.

This adds a utarfile-write extension package that adds the ability to
create and append to tar files.

Work done by Doug Ellis <dpwe@ee.columbia.edu>.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/utarfile-write/example-append.py |  15 ++
 micropython/utarfile-write/example-create.py |  14 ++
 micropython/utarfile-write/manifest.py       |   4 +
 micropython/utarfile-write/utarfile/write.py | 126 ++++++++++++++++
 micropython/utarfile/example-extract.py      |  11 +-
 micropython/utarfile/manifest.py             |   4 +-
 micropython/utarfile/utarfile.py             |  95 ------------
 micropython/utarfile/utarfile/__init__.py    | 147 +++++++++++++++++++
 8 files changed, 315 insertions(+), 101 deletions(-)
 create mode 100644 micropython/utarfile-write/example-append.py
 create mode 100644 micropython/utarfile-write/example-create.py
 create mode 100644 micropython/utarfile-write/manifest.py
 create mode 100644 micropython/utarfile-write/utarfile/write.py
 delete mode 100644 micropython/utarfile/utarfile.py
 create mode 100644 micropython/utarfile/utarfile/__init__.py

diff --git a/micropython/utarfile-write/example-append.py b/micropython/utarfile-write/example-append.py
new file mode 100644
index 000000000..9adf34d13
--- /dev/null
+++ b/micropython/utarfile-write/example-append.py
@@ -0,0 +1,15 @@
+""" tar append writes additional files to the end of an existing tar file."""
+import os
+import sys
+import utarfile
+
+if len(sys.argv) < 2:
+    raise ValueError("Usage: %s appendfile.tar newinputfile1 ..." % sys.argv[0])
+
+tarfile = sys.argv[1]
+if not tarfile.endswith(".tar"):
+    raise ValueError("Filename %s does not end with .tar" % tarfile)
+
+with utarfile.TarFile(sys.argv[1], "a") as t:
+    for filename in sys.argv[2:]:
+        t.add(filename)
diff --git a/micropython/utarfile-write/example-create.py b/micropython/utarfile-write/example-create.py
new file mode 100644
index 000000000..f0c9b206a
--- /dev/null
+++ b/micropython/utarfile-write/example-create.py
@@ -0,0 +1,14 @@
+""" tar create writes a new tar file containing the specified files."""
+import sys
+import utarfile
+
+if len(sys.argv) < 2:
+    raise ValueError("Usage: %s outputfile.tar inputfile1 ..." % sys.argv[0])
+
+tarfile = sys.argv[1]
+if not tarfile.endswith(".tar"):
+    raise ValueError("Filename %s does not end with .tar" % tarfile)
+
+with utarfile.TarFile(sys.argv[1], "w") as t:
+    for filename in sys.argv[2:]:
+        t.add(filename)
diff --git a/micropython/utarfile-write/manifest.py b/micropython/utarfile-write/manifest.py
new file mode 100644
index 000000000..a0c95a46f
--- /dev/null
+++ b/micropython/utarfile-write/manifest.py
@@ -0,0 +1,4 @@
+metadata(description="Adds write (create/append) support to utarfile.", version="0.1")
+
+require("utarfile")
+package("utarfile")
diff --git a/micropython/utarfile-write/utarfile/write.py b/micropython/utarfile-write/utarfile/write.py
new file mode 100644
index 000000000..8999bd913
--- /dev/null
+++ b/micropython/utarfile-write/utarfile/write.py
@@ -0,0 +1,126 @@
+"""Additions to the TarFile class to support creating and appending tar files.
+
+The methods defined below in are injected into the TarFile class in the
+utarfile package.
+"""
+
+import uctypes
+import os
+
+# Extended subset of tar header fields including the ones we'll write.
+# http://www.gnu.org/software/tar/manual/html_node/Standard.html
+_TAR_HEADER = {
+    "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
+    "mode": (uctypes.ARRAY | 100, uctypes.UINT8 | 7),
+    "uid": (uctypes.ARRAY | 108, uctypes.UINT8 | 7),
+    "gid": (uctypes.ARRAY | 116, uctypes.UINT8 | 7),
+    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 12),
+    "mtime": (uctypes.ARRAY | 136, uctypes.UINT8 | 12),
+    "chksum": (uctypes.ARRAY | 148, uctypes.UINT8 | 8),
+    "typeflag": (uctypes.ARRAY | 156, uctypes.UINT8 | 1),
+}
+
+
+_NUL = const(b"\0")  # the null character
+_BLOCKSIZE = const(512)  # length of processing blocks
+_RECORDSIZE = const(_BLOCKSIZE * 20)  # length of records
+
+
+# Write a string into a bytearray by copying each byte.
+def _setstring(b, s, maxlen):
+    for i, c in enumerate(s.encode("utf-8")[:maxlen]):
+        b[i] = c
+
+
+def _open_write(self, name, mode, fileobj):
+    if mode == "w":
+        if not fileobj:
+            self.f = open(name, "wb")
+        else:
+            self.f = fileobj
+    elif mode == "a":
+        if not fileobj:
+            self.f = open(name, "r+b")
+        else:
+            self.f = fileobj
+        # Read through the existing file.
+        while self.next():
+            pass
+        # Position at start of end block.
+        self.f.seek(self.offset)
+    else:
+        raise ValueError("mode " + mode + " not supported.")
+
+
+def _close_write(self):
+    # Must be called to complete writing a tar file.
+    if self.mode == "w":
+        self.f.write(_NUL * (_BLOCKSIZE * 2))
+        self.offset += _BLOCKSIZE * 2
+        remainder = self.offset % _RECORDSIZE
+        if remainder:
+            self.f.write(_NUL * (_RECORDSIZE - remainder))
+
+
+def addfile(self, tarinfo, fileobj=None):
+    # Write the header: 100 bytes of name, 8 bytes of mode in octal...
+    buf = bytearray(_BLOCKSIZE)
+    name = tarinfo.name
+    size = tarinfo.size
+    if tarinfo.isdir():
+        size = 0
+        if not name.endswith("/"):
+            name += "/"
+    hdr = uctypes.struct(uctypes.addressof(buf), _TAR_HEADER, uctypes.LITTLE_ENDIAN)
+    _setstring(hdr.name, name, 100)
+    _setstring(hdr.mode, "%06o " % (tarinfo.mode & 0o7777), 7)
+    _setstring(hdr.uid, "%06o " % tarinfo.uid, 7)
+    _setstring(hdr.gid, "%06o " % tarinfo.gid, 7)
+    _setstring(hdr.size, "%011o " % size, 12)
+    _setstring(hdr.mtime, "%011o " % tarinfo.mtime, 12)
+    _setstring(hdr.typeflag, "5" if tarinfo.isdir() else "0", 1)
+    # Checksum is calculated with checksum field all blanks.
+    _setstring(hdr.chksum, " " * 8, 8)
+    # Calculate and insert the actual checksum.
+    chksum = sum(buf)
+    _setstring(hdr.chksum, "%06o\0" % chksum, 7)
+    # Emit the header.
+    self.f.write(buf)
+    self.offset += len(buf)
+
+    # Copy the file contents, if any.
+    if fileobj:
+        n_bytes = self.f.write(fileobj.read())
+        self.offset += n_bytes
+        remains = -n_bytes & (_BLOCKSIZE - 1)  # == 0b111111111
+        if remains:
+            buf = bytearray(remains)
+            self.f.write(buf)
+            self.offset += len(buf)
+
+
+def add(self, name, recursive=True):
+    from . import TarInfo
+
+    tarinfo = TarInfo(name)
+    try:
+        stat = os.stat(name)
+        tarinfo.mode = stat[0]
+        tarinfo.uid = stat[4]
+        tarinfo.gid = stat[5]
+        tarinfo.size = stat[6]
+        tarinfo.mtime = stat[8]
+    except OSError:
+        print("Cannot stat", name, " - skipping.")
+        return
+    if not (tarinfo.isdir() or tarinfo.isreg()):
+        # We only accept directories or regular files.
+        print(name, "is not a directory or regular file - skipping.")
+        return
+    if tarinfo.isdir():
+        self.addfile(tarinfo)
+        if recursive:
+            for f in os.ilistdir(name):
+                self.add(name + "/" + f[0], recursive)
+    else:  # type == REGTYPE
+        self.addfile(tarinfo, open(name, "rb"))
diff --git a/micropython/utarfile/example-extract.py b/micropython/utarfile/example-extract.py
index a8f828cc9..a8a05d5bc 100644
--- a/micropython/utarfile/example-extract.py
+++ b/micropython/utarfile/example-extract.py
@@ -1,13 +1,16 @@
 import sys
 import os
-import shutil
 import utarfile
 
+if len(sys.argv) < 2:
+    raise ValueError("Usage: %s inputfile.tar" % sys.argv[0])
+
 t = utarfile.TarFile(sys.argv[1])
 for i in t:
-    print(i)
+    print(i.name)
     if i.type == utarfile.DIRTYPE:
-        os.makedirs(i.name)
+        os.mkdir(i.name)
     else:
         f = t.extractfile(i)
-        shutil.copyfileobj(f, open(i.name, "wb"))
+        with open(i.name, "wb") as of:
+            of.write(f.read())
diff --git a/micropython/utarfile/manifest.py b/micropython/utarfile/manifest.py
index 65bd68b9a..3e6ac576f 100644
--- a/micropython/utarfile/manifest.py
+++ b/micropython/utarfile/manifest.py
@@ -1,5 +1,5 @@
-metadata(description="Lightweight tarfile module subset", version="0.3.2")
+metadata(description="Read-only implementation of Python's tarfile.", version="0.4.0")
 
 # Originally written by Paul Sokolovsky.
 
-module("utarfile.py")
+package("utarfile")
diff --git a/micropython/utarfile/utarfile.py b/micropython/utarfile/utarfile.py
deleted file mode 100644
index 21b899f02..000000000
--- a/micropython/utarfile/utarfile.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import uctypes
-
-# http://www.gnu.org/software/tar/manual/html_node/Standard.html
-TAR_HEADER = {
-    "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
-    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 11),
-}
-
-DIRTYPE = "dir"
-REGTYPE = "file"
-
-
-def roundup(val, align):
-    return (val + align - 1) & ~(align - 1)
-
-
-class FileSection:
-    def __init__(self, f, content_len, aligned_len):
-        self.f = f
-        self.content_len = content_len
-        self.align = aligned_len - content_len
-
-    def read(self, sz=65536):
-        if self.content_len == 0:
-            return b""
-        if sz > self.content_len:
-            sz = self.content_len
-        data = self.f.read(sz)
-        sz = len(data)
-        self.content_len -= sz
-        return data
-
-    def readinto(self, buf):
-        if self.content_len == 0:
-            return 0
-        if len(buf) > self.content_len:
-            buf = memoryview(buf)[: self.content_len]
-        sz = self.f.readinto(buf)
-        self.content_len -= sz
-        return sz
-
-    def skip(self):
-        sz = self.content_len + self.align
-        if sz:
-            buf = bytearray(16)
-            while sz:
-                s = min(sz, 16)
-                self.f.readinto(buf, s)
-                sz -= s
-
-
-class TarInfo:
-    def __str__(self):
-        return "TarInfo(%r, %s, %d)" % (self.name, self.type, self.size)
-
-
-class TarFile:
-    def __init__(self, name=None, fileobj=None):
-        if fileobj:
-            self.f = fileobj
-        else:
-            self.f = open(name, "rb")
-        self.subf = None
-
-    def next(self):
-        if self.subf:
-            self.subf.skip()
-        buf = self.f.read(512)
-        if not buf:
-            return None
-
-        h = uctypes.struct(uctypes.addressof(buf), TAR_HEADER, uctypes.LITTLE_ENDIAN)
-
-        # Empty block means end of archive
-        if h.name[0] == 0:
-            return None
-
-        d = TarInfo()
-        d.name = str(h.name, "utf-8").rstrip("\0")
-        d.size = int(bytes(h.size), 8)
-        d.type = [REGTYPE, DIRTYPE][d.name[-1] == "/"]
-        self.subf = d.subf = FileSection(self.f, d.size, roundup(d.size, 512))
-        return d
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        v = self.next()
-        if v is None:
-            raise StopIteration
-        return v
-
-    def extractfile(self, tarinfo):
-        return tarinfo.subf
diff --git a/micropython/utarfile/utarfile/__init__.py b/micropython/utarfile/utarfile/__init__.py
new file mode 100644
index 000000000..524207aa0
--- /dev/null
+++ b/micropython/utarfile/utarfile/__init__.py
@@ -0,0 +1,147 @@
+"""Subset of cpython tarfile class methods needed to decode tar files."""
+
+import uctypes
+
+# Minimal set of tar header fields for reading.
+# http://www.gnu.org/software/tar/manual/html_node/Standard.html
+_TAR_HEADER = {
+    "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
+    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 12),
+}
+
+DIRTYPE = const("dir")
+REGTYPE = const("file")
+
+# Constants for TarInfo.isdir, isreg.
+_S_IFMT = const(0o170000)
+_S_IFREG = const(0o100000)
+_S_IFDIR = const(0o040000)
+
+_BLOCKSIZE = const(512)  # length of processing blocks
+
+
+def _roundup(val, align):
+    return (val + align - 1) & ~(align - 1)
+
+
+class FileSection:
+    def __init__(self, f, content_len, aligned_len):
+        self.f = f
+        self.content_len = content_len
+        self.align = aligned_len - content_len
+
+    def read(self, sz=65536):
+        if self.content_len == 0:
+            return b""
+        if sz > self.content_len:
+            sz = self.content_len
+        data = self.f.read(sz)
+        sz = len(data)
+        self.content_len -= sz
+        return data
+
+    def readinto(self, buf):
+        if self.content_len == 0:
+            return 0
+        if len(buf) > self.content_len:
+            buf = memoryview(buf)[: self.content_len]
+        sz = self.f.readinto(buf)
+        self.content_len -= sz
+        return sz
+
+    def skip(self):
+        sz = self.content_len + self.align
+        if sz:
+            buf = bytearray(16)
+            while sz:
+                s = min(sz, 16)
+                self.f.readinto(buf, s)
+                sz -= s
+
+
+class TarInfo:
+    def __init__(self, name=""):
+        self.name = name
+        self.mode = _S_IFDIR if self.name[-1] == "/" else _S_IFREG
+
+    @property
+    def type(self):
+        return DIRTYPE if self.isdir() else REGTYPE
+
+    def __str__(self):
+        return "TarInfo(%r, %s, %d)" % (self.name, self.type, self.size)
+
+    def isdir(self):
+        return (self.mode & _S_IFMT) == _S_IFDIR
+
+    def isreg(self):
+        return (self.mode & _S_IFMT) == _S_IFREG
+
+
+class TarFile:
+    def __init__(self, name=None, mode="r", fileobj=None):
+        self.subf = None
+        self.mode = mode
+        self.offset = 0
+        if mode == "r":
+            if fileobj:
+                self.f = fileobj
+            else:
+                self.f = open(name, "rb")
+        else:
+            try:
+                self._open_write(name=name, mode=mode, fileobj=fileobj)
+            except AttributeError:
+                raise NotImplementedError("Install utarfile-write")
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, unused_type, unused_value, unused_traceback):
+        self.close()
+
+    def next(self):
+        if self.subf:
+            self.subf.skip()
+        buf = self.f.read(_BLOCKSIZE)
+        if not buf:
+            return None
+
+        h = uctypes.struct(uctypes.addressof(buf), _TAR_HEADER, uctypes.LITTLE_ENDIAN)
+
+        # Empty block means end of archive
+        if h.name[0] == 0:
+            return None
+
+        # Update the offset once we're sure it's not the run-out.
+        self.offset += len(buf)
+        d = TarInfo(str(h.name, "utf-8").rstrip("\0"))
+        d.size = int(bytes(h.size), 8)
+        self.subf = d.subf = FileSection(self.f, d.size, _roundup(d.size, _BLOCKSIZE))
+        self.offset += _roundup(d.size, _BLOCKSIZE)
+        return d
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        v = self.next()
+        if v is None:
+            raise StopIteration
+        return v
+
+    def extractfile(self, tarinfo):
+        return tarinfo.subf
+
+    def close(self):
+        try:
+            self._close_write()
+        except AttributeError:
+            pass
+        self.f.close()
+
+    # Add additional methods to support write/append from the utarfile-write package.
+    try:
+        from .write import _open_write, _close_write, addfile, add
+    except ImportError:
+        pass

From 1957f240206e4379023be2109f9ccc8cce0e9a20 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Wed, 29 Jun 2022 09:50:15 +1000
Subject: [PATCH 163/343] lora: Add lora modem drivers for SX127x and SX126x.

Includes:
- component oriented driver, to only install the parts that are needed
- synchronous operation
- async wrapper class for asynchronous operation
- two examples with async & synchronous versions
- documentation

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/README.md                    | 1156 +++++++++++++++++
 .../lora/examples/reliable_delivery/README.md |   93 ++
 .../reliable_delivery/lora_rd_settings.py     |   38 +
 .../examples/reliable_delivery/receiver.py    |  163 +++
 .../reliable_delivery/receiver_async.py       |  121 ++
 .../lora/examples/reliable_delivery/sender.py |  213 +++
 .../reliable_delivery/sender_async.py         |  205 +++
 .../lora/examples/simple_rxtx/README.md       |   26 +
 .../lora/examples/simple_rxtx/simple_rxtx.py  |   51 +
 .../examples/simple_rxtx/simple_rxtx_async.py |   60 +
 .../lora/lora-async/lora/async_modem.py       |  144 ++
 micropython/lora/lora-async/manifest.py       |    3 +
 micropython/lora/lora-sx126x/lora/sx126x.py   |  877 +++++++++++++
 micropython/lora/lora-sx126x/manifest.py      |    3 +
 micropython/lora/lora-sx127x/lora/sx127x.py   |  886 +++++++++++++
 micropython/lora/lora-sx127x/manifest.py      |    3 +
 micropython/lora/lora-sync/lora/sync_modem.py |   86 ++
 micropython/lora/lora-sync/manifest.py        |    3 +
 micropython/lora/lora/lora/__init__.py        |   29 +
 micropython/lora/lora/lora/modem.py           |  483 +++++++
 micropython/lora/lora/manifest.py             |    2 +
 micropython/lora/tests/test_time_on_air.py    |  310 +++++
 22 files changed, 4955 insertions(+)
 create mode 100644 micropython/lora/README.md
 create mode 100644 micropython/lora/examples/reliable_delivery/README.md
 create mode 100644 micropython/lora/examples/reliable_delivery/lora_rd_settings.py
 create mode 100644 micropython/lora/examples/reliable_delivery/receiver.py
 create mode 100644 micropython/lora/examples/reliable_delivery/receiver_async.py
 create mode 100644 micropython/lora/examples/reliable_delivery/sender.py
 create mode 100644 micropython/lora/examples/reliable_delivery/sender_async.py
 create mode 100644 micropython/lora/examples/simple_rxtx/README.md
 create mode 100644 micropython/lora/examples/simple_rxtx/simple_rxtx.py
 create mode 100644 micropython/lora/examples/simple_rxtx/simple_rxtx_async.py
 create mode 100644 micropython/lora/lora-async/lora/async_modem.py
 create mode 100644 micropython/lora/lora-async/manifest.py
 create mode 100644 micropython/lora/lora-sx126x/lora/sx126x.py
 create mode 100644 micropython/lora/lora-sx126x/manifest.py
 create mode 100644 micropython/lora/lora-sx127x/lora/sx127x.py
 create mode 100644 micropython/lora/lora-sx127x/manifest.py
 create mode 100644 micropython/lora/lora-sync/lora/sync_modem.py
 create mode 100644 micropython/lora/lora-sync/manifest.py
 create mode 100644 micropython/lora/lora/lora/__init__.py
 create mode 100644 micropython/lora/lora/lora/modem.py
 create mode 100644 micropython/lora/lora/manifest.py
 create mode 100644 micropython/lora/tests/test_time_on_air.py

diff --git a/micropython/lora/README.md b/micropython/lora/README.md
new file mode 100644
index 000000000..f4786afd4
--- /dev/null
+++ b/micropython/lora/README.md
@@ -0,0 +1,1156 @@
+# LoRa driver
+
+This MicroPython library provides synchronous and asynchronous wireless drivers
+for Semtech's LoRa (Long Range Radio) modem devices.
+
+(LoRa is a registered trademark or service mark of Semtech Corporation or its
+affiliates.)
+
+## Support
+
+Currently these radio modem chipsets are supported:
+
+* SX1261
+* SX1262
+* SX1276
+* SX1277
+* SX1278
+* SX1279
+
+Most radio configuration features are supported, as well as transmitting or
+receiving packets.
+
+This library can be used on any MicroPython port which supports the `machine.SPI`
+interface.
+
+## Installation
+
+First, install at least one of the following "base" LoRa packages:
+
+- `lora-sync` to use the synchronous LoRa modem API.
+- `lora-async` to use the asynchronous LoRa modem API with
+  [asyncio](https://docs.micropython.org/en/latest/library/asyncio.html). Support
+  for `asyncio` must be included in your MicroPython build to use `lora-async`.
+
+Second, install at least one of the following modem chipset drivers for the
+modem model that matches your hardware:
+
+- `lora-sx126x` for SX1261 & SX1262 support.
+- `lora-sx127x` for SX1276-SX1279 support.
+
+It's recommended to install only the packages that you need, to save firmware
+size.
+
+Installing any of these packages will automatically also install a common
+base package, `lora`.
+
+For more information about how to install packages, or "freeze" them into a
+firmware image, consult the [MicroPython documentation on "Package
+management"](https://docs.micropython.org/en/latest/reference/packages.html).
+
+## Initializing Driver
+
+### Creating SX1262 or SX1261
+
+This is the synchronous modem class, and requires `lora-sync` to be installed:
+
+```py
+from machine import SPI, Pin
+import lora import SX1262  # or SX1261, depending on which you have
+
+def get_modem():
+    # The LoRa configuration will depend on your board and location, see
+    # below under "Modem Configuration" for some possible examples.
+    lora_cfg = { 'freq_khz': SEE_BELOW_FOR_CORRECT_VALUE }
+
+    # To instantiate SPI correctly, see
+    # https://docs.micropython.org/en/latest/library/machine.SPI.html
+    spi = SPI(0, baudrate=2000_000)
+    cs = Pin(9)
+
+    # or SX1261(), depending on which you have
+    return SX1262(spi, cs,
+                 busy=Pin(2),  # Required
+                 dio1=Pin(20),   # Optional, recommended
+                 reset=Pin(15),  # Optional, recommended
+                 lora_cfg=lora_cfg)
+
+modem = get_modem()
+```
+
+### Creating SX127x
+
+This is the synchronous modem class, and requires `lora-sync` to be installed:
+
+```py
+from machine import SPI, Pin
+# or SX1277, SX1278, SX1279, depending on which you have
+from lora import SX1276
+
+def get_modem():
+    # The LoRa configuration will depend on your board and location, see
+    # below under "Modem Configuration" for some possible examples.
+    lora_cfg = { 'freq_khz': SEE_BELOW_FOR_CORRECT_VALUE }
+
+    # To instantiate SPI correctly, see
+    # https://docs.micropython.org/en/latest/library/machine.SPI.html
+    spi = SPI(0, baudrate=2000_000)
+    cs = Pin(9)
+
+    # or SX1277, SX1278, SX1279, depending on which you have
+    return SX1276(spi, cs,
+                  dio0=Pin(10),  # Optional, recommended
+                  dio1=Pin(11),  # Optional, recommended
+                  reset=Pin(13),  # Optional, recommended
+                  lora_cfg=lora_cfg)
+
+modem = get_modem()
+```
+
+*Note*: Because SX1276, SX1277, SX1278 and SX1279 are very similar, currently
+the driver uses the same code for any. Dealing with per-part limitations (for
+example: lower max frequency, lower maximum SF value) is responsibility of the
+calling code. When possible please use the correct class anyhow, as per-part
+code may be added in the future.
+
+### Notes about initialisation
+
+* See below for details about the `lora_cfg` structure that configures the modem's
+  LoRa registers.
+* Connecting radio "dio" pins as shown above is optional but recommended so the
+  driver can use pin interrupts for radio events. If not, the driver needs to
+  poll the chip instead. Interrupts allow reduced power consumption and may also
+  improve receive sensitivity (by removing SPI bus noise during receive
+  operations.)
+
+### All constructor parameters
+
+Here is a full list of parameters that can be passed to both constructors:
+
+#### S1261/SX1262
+
+(Note: It's important to instantiate the correct object as these two modems have small differences in their command protocols.)
+
+| Parameter                 | Required               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|---------------------------|------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `spi`                     | Yes                    | Instance of a `machine.SPI` object or compatible, for the modem's SPI interface (modem MISO, MOSI, SCK pins).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `cs`                      | Yes                    | Instance of a `machine.Pin` input, as connected to the modem's NSS pin.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| `busy`                    | Yes                    | Instance of a `machine.Pin` input, as connected to the modem's BUSY pin.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `dio1`                    | No                     | Instance of a `machine.Pin` input, as connected to the modem's DIO1 pin. If not provided then interrupts cannot be used to detect radio events.                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `dio2_rf_sw`              | No, defaults to `True` | By default, configures the modem's DIO2 pin as an RF switch. The modem will drive this pin high when transmitting and low otherwise. Set this parameter to False if DIO2 is connected elsewhere on your LoRa board/module and you don't want it toggling on transmit.                                                                                                                                                                                                                                                                                                                                                 |
+| `dio3_tcxo_millivolts`    | No                     | If set to an integer value, DIO3 will be used as a variable voltage source for the modem's main TCXO clock source. DIO3 will automatically disable the TCXO to save power when the 32MHz clock source is not needed. The value is units of millivolts and should be one of the voltages listed in the SX1261 datasheet section 13.3.6 "SetDIO3AsTCXOCtrl". Any value between `1600` and `3300` can be specified and the driver will round down to a lower supported voltage step if necessary. The manufacturer of the LoRa board or module you are using should be able to tell you what value to pass here, if any. |
+| `dio3_tcxo_start_time_us` | No                     | This value is ignored unless `dio3_tcxo_millivolts` is set, and is the startup delay in microseconds for the TCXO connected to DIO3. Each time the modem needs to enable the TCXO, it will wait this long. The default value is `1000` (1ms). Values can be set in multiples of `15.625`us and range from 0us to 262 seconds (settings this high will make the modem unusable).                                                                                                                                                                                                                                           |
+| reset               | No                     | If set to a `machine.Pin` output attached to the modem's NRESET pin , then it will be used to hard reset the modem before initializing it. If unset, the programmer is responsible for ensuring the modem is in an idle state when the constructor is called.                                                                                                                                                                                                                                                                                                                                                         |
+| `lora_cfg`                | No                     | If set to an initial LoRa configuration then the modem is set up with this configuration. If not set here, can be set by calling `configure()` later on.                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| `ant_sw`                  | No                     | Optional antenna switch object instance, see below for description.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+
+
+#### SX1276/SX1277/SX1278/SX1279
+
+| Parameter   | Required | Description                                                                                                                                                                                                                                                      |   |
+|-------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---|
+| `spi`         | Yes      | Instance of a `machine.SPI` object or compatible, for the modem's SPI interface (modem MISO, MOSI, SCK pins).                                                                                                                                                    |   |
+| `cs`          | Yes      | Instance of a `machine.Pin` input, as connected to the modem's NSS pin.                                                                                                                                                                                          |   |
+| `dio0`        | No       | Instance of a `machine.Pin` input, as connected to the modem's DIO0 pin. If set, allows the driver to use interrupts to detect "RX done" and "TX done" events.                                                                                                   |   |
+| `dio1`        | No       | Instance of a `machine.Pin` input, as connected to the modem's DIO1/DCLK pin. If set, allows the driver to use interrupts to detect "RX timeout" events. Setting this pin requires dio0 to also be set.                                                          |   |
+| `reset` | No       | If set to a `machine.Pin` output attached the modem's NRESET pin , it will be used to hard reset the modem before initializing it. If unset, the programmer is responsible for ensuring the modem should be is in an idle state when the object is instantiated. |   |
+| `lora_cfg`    | No       | If set to an initial LoRa configuration then the modem is set up with this configuration. If not set here, can be set by calling `configure()` later on.                                                                                                         |   |
+| `ant`_sw      | No       | Optional antenna switch object instance, see below for description.                                                                                                                                                                                              |   |
+
+## Modem Configuration
+
+It is necessary to correctly configure the modem before use. At minimum, the
+correct RF frequency must be set. There are many additional LoRa modem radio
+configuration settings that may be important. For two LoRa modem modems to
+communicate, their radio configurations must be compatible.
+
+**Different regions in the world also have RF regulations which you must abide
+by. Check RF communications regulations for the location you are in, to
+determine which configurations are legal for you to use.**
+
+Modem configuration can be set in two ways:
+
+- Pass `lora_cfg` keyword parameter to the modem class constructor (see examples
+  above).
+- Call `modem.configure(lora_cfg)` at any time
+
+Where `lora_cfg` is a `dict` containing configuration keys and values. If a key
+is missing, the value set in the modem is unchanged.
+
+### Basic Configuration
+
+The minimal configuration is the modem frequency:
+
+```py
+lora_cfg = { 'freq_khz': 916000 }
+modem.configure(lora_cfg)
+```
+
+The example above sets the main frequency to 916.0MHz (916,000kHz), and leaves
+the rest of the modem settings at their defaults. If you have two of the same
+module using this driver, setting the same frequency on both like this may be
+enough for them to communicate. However, the other default settings are a
+compromise that may not give the best range, bandwidth, reliability, etc. for
+your application. The defaults may not even be legal to transmit with in your
+region!
+
+Other parameters, particularly Bandwidth (`lora_cfg["bw"]`), Spreading Factor
+(`lora_cfg["sf"]`), and transmit power (`lora_cfg["output_power"]`) may be
+limited in your region. You should find this out as well and ensure the
+configuration you are using is allowed. **This is your responsibility!**
+
+#### Defaults
+
+If you don't configure anything, the default settings are equivalent to:
+
+```py
+lora_cfg = { 'freq_khz': None, # Must set this
+             'sf': 7,
+             'coding_rate': 5,  # 4/5 Coding
+             'bw': '125',
+             }
+```
+
+With the default `output_power` level depending on the radio in use.
+
+#### Choosing Other Parameters
+
+Valid choices are determined by two things:
+
+- Regulatory rules in your region. This information is provided by regional
+  authorities, but it may also be useful to consult the [LoRaWAN Regional
+  Parameters document
+  (official)](https://resources.lora-alliance.org/technical-specifications/rp002-1-0-4-regional-parameters)
+  and the ([Things Network
+  (unofficial)](https://www.thethingsnetwork.org/docs/lorawan/regional-parameters/)
+  for LoRaWAN frequency plans.
+
+  Even if you're not connecting to a LoRaWAN network, if you choose frequency
+  and bandwidth settings from the LoRaWAN recommendations for your region then
+  they should be legal to use.
+- Design of the radio module/modem/board you are using. RF antenna components
+  are usually tailored for particular frequency ranges. One some boards only
+  particular antenna ports or other features may be connected.
+
+#### Longer Range Configuration
+
+Here is an example aiming for higher range and lower data rate with the main
+frequency set again to 916Mhz (for the "AU915" Australian region):
+
+```py
+lora_cfg = { 'freq_khz': 916000,
+             'sf': 12,
+             'bw': '62.5',  # kHz
+             'coding_rate': 8,
+             'output_power': 20,  # dBm
+             'rx_boost': True,
+         }
+```
+
+Quick explanation of these settings, for more detailed explanations see the next
+section below:
+
+* Setting `sf` to maximum (higher "Spreading Factor") means each LoRa "chirp"
+  takes longer, for more range but lower data rate.
+* Setting `bw` bandwidth setting lower makes the signal less susceptible to
+  noise, but again slower. 62.5kHz is the lowest setting recommended by Semtech
+  unless the modem uses a TCXO for high frequency stability, rather than a
+  cheaper crystal.
+* Setting `coding_rate` higher to 4/8 means that more Forward Error Correction
+  information is sent, slowing the data rate but increasing the chance of a
+  packet being received correctly.
+* Setting `output_power` to 20dBm will select the maximum (or close to it) for
+  the radio, which may be less than 20dBm.
+* Enabling `rx_boost` will increase the receive sensitivity of the radio, if
+  it supports this.
+
+<details>
+<summary>Additional Australia-specific regulatory explanation</summary>
+
+The LoRaWAN AU915 specifications suggest 125kHz bandwidth. To tell that it's OK
+to set `bw` lower, consult the Australian [Low Interference Potential Devices
+class license](https://www.legislation.gov.au/Series/F2015L01438). This class
+license allows Digital Modulation Transmitters in the 915-928MHz band to
+transmit up to 1W Maximum EIRP provided "*The radiated peak power spectral
+density in any 3 kHz must not exceed 25 mW per 3 kHz*".
+
+`output_power` set to 20dBm is 100mW, over 62.5kHz bandwidth gives
+1.6mW/kHz. This leaves significant headroom for antenna gain that might increase
+radiated power in some directions.)
+</details>
+
+### Configuration Keys
+
+These keys can be set in the `lora_cfg` dict argument to `configure()`,
+and correspond to the parameters documented in this section.
+
+Consult the datasheet for the LoRa modem you are using for an in-depth
+description of each of these parameters.
+
+Values which are unset when `configure()` is called will keep their existing
+values.
+
+#### `freq_khz` - RF Frequency
+Type: `int` (recommended) or `float` (if supported by port)
+
+LoRa RF frequency in kHz. See above for notes about regulatory limits on this
+value.
+
+The antenna and RF matching components on a particular LoRa device may only
+support a particular frequency range. Consult the manufacturer's documentation.
+
+#### `sf` - Spreading Factor
+Type: `int`
+
+Spreading Factor, numeric value only. Higher spreading factors allow reception
+of weaker signals but have slower data rate.
+
+The supported range of SF values varies depending on the modem chipset:
+
+| Spreading Factor | Supported SX126x | Supported SX127x      |
+|------------------|------------------|-----------------------|
+| 5                | Yes              | **No**                |
+| 6                | **Yes** [*]      | **Yes** [*]           |
+| 7                | Yes              | Yes                   |
+| 8                | Yes              | Yes                   |
+| 9                | Yes              | Yes                   |
+| 10               | Yes              | Yes, except SX1277[^] |
+| 11               | Yes              | Yes, except SX1277[^] |
+| 12               | Yes              | Yes, except SX2177[^] |
+
+[*] SF6 is not compatible between SX126x and SX127x chipsets.
+
+[^] SX1276, SX1278 and SX1279 all support SF6-SF12. SX1277 only supports
+SF6-SF9. This limitation is not checked by the driver.
+
+#### `bw` - Bandwidth
+Type: `int` or `str`
+
+Default: 125
+
+Bandwidth value in kHz. Must be exactly one of these LoRa bandwidth values:
+
+* 7.8
+* 10.4
+* 15.6
+* 20.8
+* 31.25
+* 41.7
+* 62.5
+* 125
+* 250
+* 500
+
+Higher bandwidth transmits data faster and reduces peak spectral density when
+transmitting, but is more susceptible to interference.
+
+IF setting bandwidth below 62.5kHz then Semtech recommends using a hardware TCXO
+as the modem clock source, not a cheaper crystal. Consult the modem datasheet
+and your hardware maker's reference for more information and to determine which
+clock source your LoRa modem hardware is using.
+
+For non-integer bandwidth values, it's recommended to always set this parameter
+as a `str` (i.e. `"15.6"`) not a numeric `float`.
+
+#### `coding_rate` - FEC Coding Rate
+Type: `int`
+
+Default: 5
+
+Forward Error Correction (FEC) coding rate is expressed as a ratio, `4/N`. The
+value passed in the configuration is `N`:
+
+| Value | Error coding rate |
+|-------|-------------------|
+| 5     | 4/5               |
+| 6     | 4/6               |
+| 7     | 4/7               |
+| 8     | 4/8               |
+
+Setting a higher value makes transmission slower but increases the chance of
+receiving successfully in a noisy environment
+
+In explicit header mode (the default), `coding_rate` only needs to be set by the
+transmitter and the receiver will automatically choose the correct rate when
+receiving based on the received header. In implicit header mode (see
+`implicit_header`), this value must be set the same on both transmitter and
+receiver.
+
+#### `tx_ant` - TX Antenna
+Supported: *SX127x only*.
+
+Type: `str`, not case sensitive
+
+Default: RFO_HF or RFO_LF (low power)
+
+SX127x modems have multiple antenna pins for different power levels and
+frequency ranges. The board/module that the LoRa modem chip is on may have
+particular antenna connections, or even an RF switch that needs to be set via a
+GPIO to connect an antenna pin to a particular output (see `ant_sw`, below).
+
+The driver must configure the modem to use the correct pin for a particular
+hardware antenna connection before transmitting. When receiving, the modem
+chooses the correct pin based on the selected frequency.
+
+A common symptom of incorrect `tx_ant` setting is an extremely weak RF signal.
+
+Consult modem datasheet for more details.
+
+SX127x values:
+
+| Value           | RF Transmit Pin                  |
+|-----------------|----------------------------------|
+| `"PA_BOOST"`    | PA_BOOST pin (high power)        |
+| Any other value | RFO_HF or RFO_LF pin (low power) |
+
+Pin "RFO_HF" is automatically used for frequencies above 862MHz, and is not
+supported on SX1278. "RFO_LF" is used for frequencies below 862MHz. Consult
+datasheet Table 32 "Frequency Bands" for more details.
+
+**Important**: If changing `tx_ant` value, configure `output_power` at the same
+time or again before transmitting.
+
+#### `output_power` - Transmit output power level
+Type: `int`
+
+Default: Depends on modem
+
+Nominal TX output power in dBm. The possible range depends on the modem and (for
+SX127x only) the `tx_ant` configuration.
+
+| Modem  | `tx_ant` value   | Range             | "Optimal"              |
+|--------|------------------|-------------------|------------------------|
+| SX1261 | N/A              | -17 to +15        | +10, +14 or +15 [*][^] |
+| SX1262 | N/A              | -9 to +22         | +14, +17, +20, +22 [*] |
+| SX127x | "PA_BOOST"       | +2 to +17, or +20 | Any                    |
+| SX127x | RFO_HF or RFO_LF | -4 to +15         | Any                    |
+
+Values which are out of range for the modem will be clamped at the
+minimum/maximum values shown above.
+
+Actual radiated TX power for RF regulatory purposes depends on the RF hardware,
+antenna, and the rest of the modem configuration. It should be measured and
+tuned empirically not determined from this configuration information alone.
+
+[*] For SX1261 and SX1262 the datasheet shows "Optimal" Power Amplifier
+configuration values for these output power levels. If setting one of these
+levels, the optimal settings from the datasheet are applied automatically by the
+driver. Therefore it is recommended to use one of these power levels if
+possible.
+
+[^] For SX1261 +15dBm is only possible with frequency above 400MHz, will be +14dBm
+otherwise.
+
+#### `implicit_header` - Implicit/Explicit Header Mode
+Type: `bool`
+
+Default: `False`
+
+LoRa supports both implicit and explicit header modes. Explicit header mode
+(`implicit_header` set to False) is the default.
+
+`implicit_header` must be set the same on both sender and receiver.
+
+* In explicit header mode (default), each transmitted LoRa packet has a header
+  which contains information about the payload length, `coding_rate` value in
+  use, and whether the payload has a CRC attached (`crc_en`). The receiving
+  modem decodes and verifies the header and uses the values to receive the
+  correct length payload and verify the CRC if enabled.
+* In implicit header mode (`implicit_header` set to True), this header is not
+  sent and this information must be already be known and configured by both
+  sender and receiver. Specifically:
+  - `crc_en` setting should be set the same on both sender and receiver.
+  - `coding_rate` setting must match between the sender and receiver.
+  - Receiver must provide the `rx_length` argument when calling either
+    `recv()` or `start_recv()`. This length must match the length in bytes
+    of the payload sent by the sender.
+
+### `crc_en` - Enable CRCs
+Type: `bool`
+
+Default: `True`
+
+LoRa packets can have a 16-bit CRC attached to determine if a packet is
+received correctly without corruption.
+
+* In explicit header mode (default), the sender will attach a CRC if
+  `crc_en` is True. `crc_en` parameter is ignored by the receiver, which
+  determines if there is a CRC based on the received header and will check it if
+  so.
+* In implicit header mode, the sender will only include a CRC if `crc_en`
+  is True and the receiver will only check the CRC if `crc_en` is True.
+
+By default, if CRC checking is enabled on the receiver then the LoRa modem driver
+silently drops packets with invalid CRCs. Setting `modem.rx_crc_error = True`
+will change this so that packets with failed CRCs are returned to the caller,
+with the `crc_error` field set to True (see `RxPacket`, below).
+
+#### `auto_image_cal` - Automatic Image Calibration
+Supported: *SX127x only*.
+
+Type: `bool`
+
+Default: `False`
+
+If set True, enable automatic image re-calibration in the modem if the
+temperature changes significantly. This may avoid RF performance issues caused
+by frequency drift, etc. Setting this value may lead to dropped packets received
+when an automatic calibration event is in progress.
+
+Consult SX127x datasheet for more information.
+
+#### `syncword` - Sync Word
+Type: `int`
+
+Default: `0x12`
+
+LoRa Sync Words are used to differentiate LoRa packets as being for Public or
+Private networks. Sync Word must match between sender and receiver.
+
+For SX127x this value is an 8-bit integer. Supported values 0x12 for Private
+Networks (default, most users) and 0x34 for Public Networks (LoRaWAN only).
+
+For SX126x this value is a 16-bit integer. Supported values 0x1424 for Private
+
+Networks (default, most users) and 0x3444 for Public Networks. However the
+driver will automatically [translate values configured using the 8-bit SX127x
+format](https://www.thethingsnetwork.org/forum/t/should-private-lorawan-networks-use-a-different-sync-word/34496/15)
+for software compatibility, so setting an 8-bit value is supported on all modems.
+
+You probably shouldn't change this value from the default, unless connecting to
+a LoRaWAN network.
+
+#### `pa_ramp_us` - PA Ramp Time
+Type: `int`
+
+Default: `40`us
+
+Power Amplifier ramp up/down time, as expressed in microseconds.
+
+The exact values supported on each radio are different. Configuring an
+unsupported value will cause the driver to choose the next highest value that is
+supported for that radio.
+
+| Value (us) | Supported SX126x | Supported SX127x |
+|------------|------------------|------------------|
+| 10         | Yes              | Yes              |
+| 12         | No               | Yes              |
+| 15         | No               | Yes              |
+| 20         | Yes              | Yes              |
+| 25         | No               | Yes              |
+| 31         | No               | Yes              |
+| 40         | Yes              | Yes              |
+| 50         | No               | Yes              |
+| 62         | No               | Yes              |
+| 80         | Yes              | No               |
+| 100        | No               | Yes              |
+| 125        | No               | Yes              |
+| 200        | Yes              | No               |
+| 250        | No               | Yes              |
+| 500        | No               | Yes              |
+| 800        | Yes              | No               |
+| 1000       | No               | Yes              |
+| 1700       | Yes              | No               |
+| 2000       | No               | Yes              |
+| 3400       | Yes              | Yes              |
+
+#### `preamble_len` - Preamble Length
+Type: `int`
+Default: `12`
+
+Length of the preamble sequence, in units of symbols.
+
+#### `invert_iq_tx`/`invert_iq_rx` - Invert I/Q
+Type: `bool`
+
+Default: Both `False`
+
+If `invert_iq_tx` or `invert_iq_rx` is set then IQ polarity is inverted in the
+radio for either TX or RX, respectively. The receiver's `invert_iq_rx` setting
+must match the sender's `invert_iq_tx` setting.
+
+This is necessary for LoRaWAN where end-devices transmit with inverted IQ
+relative to gateways.
+
+Note: The current SX127x datasheet incorrectly documents the modem register
+setting corresponding to `invert_iq_tx`. This driver configures TX polarity
+correctly for compatibility with other LoRa modems, most other SX127x drivers,
+and LoRaWAN. However, there are some SX127x drivers that follow the datasheet
+description, and they will set `invert_iq_tx` opposite to this.
+
+#### `rx_boost` - Boost receive sensitivity
+Type: `bool`
+
+Default: `False`
+
+Enable additional receive sensitivity if available.
+
+* On SX126x, this makes use of the "Rx Boosted gain" option.
+* On SX127x, this option is available for HF bands only and sets the LNA boost
+  register field.
+
+#### `lna_gain` - Receiver LNA gain
+Supported: *SX127x only*.
+
+Type: `int` or `None`
+
+Default: `1`
+
+Adjust the LNA gain level for receiving. Valid values are `None` to enable
+Automatic Gain Control, or integer gain levels 1 to 6 where 1 is maximum gain
+(default).
+
+## Sending & Receiving
+
+### Simple API
+
+The driver has a "simple" API to easily send and receive LoRa packets. The
+API is fully synchronous, meaning the caller is blocked until the LoRa operation
+(send or receive) is done. The Simple API doesn't support starting a
+send while a receive in progress (or vice versa). It is suitable for simple
+applications only.
+
+For an example that uses the simple API, see `examples/reliable_delivery/sender.py`.
+
+#### send
+
+To send (transmit) a LoRa packet using the configured modulation settings:
+
+```py
+def send(self, packet, tx_at_ms=None)
+```
+
+Example:
+
+```py
+modem.send(b'Hello world')
+```
+
+* `send()` transmits a LoRa packet with the provided payload bytes, and returns
+  once transmission is complete.
+* The return value is the timestamp when transmission completed, as a
+  `time.ticks_ms()` result. It will be more accurate if the modem was
+  initialized to use interrupts.
+
+For precise timing of sent packets, there is an optional `tx_at_ms` argument
+which is a timestamp (as a `time.ticks_ms()` value). If set, the packet will be
+sent as close as possible to this timestamp and the function will block until
+that time arrives:
+
+```py
+modem.send(b'Hello world', time.ticks_add(time.ticks_ms(), 250))
+```
+
+(This allows more precise timing of sent packets, without needing to account for
+the length of the packet to be copied to the modem.)
+
+### receive
+
+```py
+def recv(self, timeout_ms=None, rx_length=0xFF, rx_packet=None)
+```
+
+Examples:
+
+```py
+with_timeout = modem.recv(2000)
+
+print(repr(with_timeout))
+
+wait_forever = modem.recv()
+
+print(repr(wait_forever))
+```
+
+* `recv()` receives a LoRa packet from the modem.
+* Returns None on timeout, or an `RxPacket` instance with the packet on
+  success.
+* Optional arguments:
+   - `timeout_ms`. Optional, sets a receive timeout in milliseconds. If None
+   (default value), then the function will block indefinitely until a packet is
+   received.
+   - `rx_length`. Necessary to set if `implicit_header` is set to `True` (see
+     above). This is the length of the packet to receive. Ignored in the default
+     LoRa explicit header mode, where the received radio header includes the
+     length.
+   - `rx_packet`. Optional, this can be an `RxPacket` object previously
+     received from the modem. If the newly received packet has the same length,
+     this object is reused and returned to save an allocation. If the newly
+     received packet has a different length, a new `RxPacket` object is
+     allocated and returned instead.
+
+### RxPacket
+
+`RxPacket` is a class that wraps a `bytearray` holding the LoRa packet payload,
+meaning it can be passed anywhere that accepts a buffer object (like `bytes`,
+`bytearray`).
+
+However it also has the following metadata object variables:
+
+* `ticks_ms` - is a timestamp of `time.ticks_ms()` called at the time the
+    packet was received. Timestamp will be more accurate if the modem was
+    initialized to use interrupts.
+* `snr` - is the Signal to Noise ratio of the received packet, in units of `dB *
+    4`. Higher values indicate better signal.
+* `rssi` - is the Received Signal Strength indicator value in units of
+    dBm. Higher (less negative) values indicate more signal strength.
+* `crc_error` - In the default configuration, this value will always be False as
+  packets with invalid CRCs are dropped. If the `modem.rx_crc_error` flag is set
+  to True, then a packet with an invalid CRC will be returned with this flag set
+  to True.
+
+  Note that CRC is only ever checked on receive in particular configurations,
+  see the `crc_en` configuration item above for an explanation. If CRC is not
+  checked on receive, and `crc_error` will always be False.
+
+Example:
+
+```py
+rx = modem.recv(1000)
+
+if rx:
+    print(f'Received {len(rx)} byte packet at '
+          f'{rx.ticks_ms}ms, with SNR {rx.snr} '
+          f'RSSI {rx.rssi} valid_crc {rx.valid_crc}')
+```
+
+### Asynchronous API
+
+Not being able to do anything else while waiting for the modem is very
+limiting. Async Python is an excellent match for this kind of application!
+
+To use async Python, first install `lora-async` and then instantiate the async
+version of the LoRA modem class. The async versions have the prefix `Async` at
+the beginning of the class name. For example:
+
+```py
+import asyncio
+from lora import AsyncSX1276
+
+def get_async_modem():
+    # The LoRa configuration will depend on your board and location, see
+    # below under "Modem Configuration" for some possible examples.
+    lora_cfg = { 'freq_khz': SEE_BELOW_FOR_CORRECT_VALUE }
+
+    # To instantiate SPI correctly, see
+    # https://docs.micropython.org/en/latest/library/machine.SPI.html
+    spi = SPI(0, baudrate=2000_000)
+    cs = Pin(9)
+
+    # or AsyncSX1261, AsyncSX1262, AsyncSX1277, AsyncSX1278, SX1279, etc.
+    return AsyncSX1276(spi, cs,
+                       dio0=Pin(10),  # Optional, recommended
+                       dio1=Pin(11),  # Optional, recommended
+                       reset=Pin(13),  # Optional, recommended
+                       lora_cfg=lora_cfg)
+
+modem = get_async_modem()
+
+async def recv_coro():
+    rx = await modem.recv(2000)
+    if rx:
+        print(f'Received: {rx}')
+    else:
+        print('Timeout!')
+
+
+async def send_coro():
+    counter = 0
+    while True:
+        await modem.send(f'Hello world #{counter}'.encode())
+        print('Sent!')
+        await asyncio.sleep(5)
+        counter += 1
+
+async def init():
+    await asyncio.gather(
+        asyncio.create_task(send_coro()),
+        asyncio.create_task(recv_coro())
+    )
+
+asyncio.run(init())
+```
+
+For a more complete example, see `examples/reliable_delivery/sender_async.py`.
+
+* The `modem.recv()` and `modem.send()` coroutines take the same
+  arguments as the synchronous class' functions `recv()` and `send()`,
+  as documented above.
+* However, because these are async coroutines it's possible for other async
+  tasks to execute while they are blocked waiting for modem operations.
+* It is possible to await the `send()` coroutine while a `recv()`
+  is in progress. The receive will automatically resume once the modem finishes
+  sending. Send always has priority over receive.
+* However, at most one task should be awaiting each of receive and send. For
+  example, it's not possible for two tasks to `await modem.send()` at the
+  same time.
+
+#### Async Continuous Receive
+
+An additional API provides a Python async iterator that will continuously
+receive packets from the modem:
+
+```py
+async def keep_receiving():
+    async for packet in am.recv_continuous():
+        print(f'Received: {packet}')
+```
+
+For a more complete example, see `examples/reliable_delivery/receiver_async.py`.
+
+Receiving will continue and the iterator will yield packets unless another task
+calls `modem.stop()` or `modem.standby()` (see below for a description of these
+functions).
+
+Same as the async `recv()` API, it's possible for another task to send while
+this iterator is in use.
+
+## Low-Level API
+
+This API allows other code to execute while waiting for LoRa operations, without
+using asyncio coroutines.
+
+This is a traditional asynchronous-style API that requires manual management of
+modem timing, interrupts, packet timeouts, etc. It's very easy to write
+spaghetti code with this API. If asyncio is available on your board, the async
+Python API is probably an easier choice to get the same functionality with less
+complicated code.
+
+However, if you absolutely need maximum control over the modem and the rest of
+your board then this may be the API for you!
+
+### Receiving
+
+```py
+will_irq =  modem.start_recv(timeout_ms=1000, continuous=False)
+
+rx = True
+while rx is True:
+    if will_irq:
+        # Add code to sleep and wait for an IRQ,
+        # if necessary call modem.irq_triggered() to verify
+        # that the modem IRQ was actually triggered.
+        pass
+    rx = modem.poll_recv()
+
+    # Do anything else you need the application to do
+
+if rx:  # isinstance(rx, lora.RxPacket)
+    print(f'Received: {rx}')
+else:  # rx is False
+    print('Timed out')
+```
+
+For an example that uses the low-level receive API for continuous receive, see
+`examples/reliable_delivery/receiver.py`.
+
+The steps to receive packet(s) with the low-level API are:
+
+1. Call `modem.start_recv(timeout_ms=None, continuous=False, rx_length=0xFF)`.
+
+   - `timeout_ms` is an optional timeout in milliseconds, same as the Simple API
+     recv().
+   - Set `continuous=True` for the modem to continuously receive and not go into
+     standby after the first packet is received. If setting `continuous` to
+     `True`, `timeout_ms` must be `None`.
+   - `rx_length` is an optional argument, only used when LoRa implicit headers
+     are configured.  See the Simple API description above for details.
+
+   The return value of this function is truthy if interrupts will be used for
+   the receive, falsey otherwise.
+2. If interrupts are being used, wait for an interrupt to occur. Steps may include
+   configuring the modem interrupt pins as wake sources and putting the host
+   into a light sleep mode. See the general description of "Interrupts", below.
+
+   Alternatively, if `timeout_ms` was set then caller can wait for at least the
+   timeout period before checking if the modem received anything or timed out.
+
+    It is also possible to simply call `poll_recv()` in a loop, but doing
+    this too frequently may significantly degrade the RF receive performance
+    depending on the hardware.
+
+3. Call `modem.poll_recv()`. This function checks the receive state and
+   returns a value indicating the current state:
+
+   - `True` if the modem is still receiving and the caller should call this
+     function again in the future. This can be caused by any of:
+
+     * Modem is still waiting in 'single' mode (`continuous=False`) to receive a
+       packet or time out.
+     * Modem is in continuous receive mode so will always be receiving.
+     * The modem is actually sending right now, but the driver will resume
+       receiving after the send completes.
+     * The modem received a packet with an invalid CRC (and `modem.rx_crc_error
+       = False`). The driver has just now discarded it and resumed the modem
+       receive operation.
+
+   - `False` if the modem is not currently receiving. This can be caused by any
+     of:
+
+     * No receive has been started.
+     * A single receive has timed out.
+     * The receive was aborted. See the `standby()` and `sleep()` functions
+       below.
+
+   - An instance of the `RxPacket` class. This means the modem has received this
+     packet since the last call to `poll_recv()`. Whether or not the modem is
+     still receiving after this depends on whether the receive was started in
+     `continuous` mode or not.)
+
+4. If `poll_recv()` returned `True`, go back to step 2 and wait for the next
+   opportunity to call `poll_recv()`. (Note that it's necessary to test using
+   `is True` to distinguish between `True` and a new packet.)
+
+It is possible to also send packets while receiving and looping between
+steps 2 and 4. The driver will automatically suspend receiving and resume it
+again once sending is done. It's OK to call either the Simple API
+`send()` function or the low-level send API (see below) in order to do
+this.
+
+The purpose of the low-level API is to allow code to perform other unrelated
+functions during steps 2 and 3. It's still recommended to call
+`modem.poll_recv()` as soon as possible after a modem interrupt has
+occurred, especially in continuous receive mode when multiple packets may be
+received rapidly.
+
+To cancel a receive in progress, call `modem.standby()` or `modem.sleep()`, see
+below for descriptions of these functions.
+
+*Important*: None of the MicroPython lora driver is thread-safe. It's OK for
+different MicroPython threads to manage send and receive, but the caller is
+responsible for adding locking so that different threads are not calling any
+modem APIs concurrently. Async MicroPython may provide a cleaner and simpler
+choice for this kind of firmware architecture.
+
+### Sending
+
+The low-level API for sending is similar to the low-level API for receiving:
+
+1. Call `modem.prepare_send(payload)` with the packet payload. This will put
+   the modem into standby (pausing receive if necessary), configure the modem
+   registers, and copy the payload into the modem FIFO buffer.
+2. Call `modem.start_send(packet)` to actually start sending.
+
+   Sending is split into these two steps to allow accurate send
+   timing. `prepare_send()` may take a variable amount of time to copy data
+   to the modem, configure registers, etc. Then `start_send()` only performs
+   the minimum fixed duration operation to start sending, so transmit
+   should start very soon after this function is called.
+
+   The return value of `start_send()` function is truthy if an interrupt is
+   enabled to signal the send completing, falsey otherwise.
+
+   Not calling both `prepare_send()` or `start_send()` in order, or
+   calling any other modem functions between `prepare_send()` and
+   `start_send()`, is not supported and will result in incorrect behaviour.
+
+3. Wait for the send to complete. This is possible in any of three
+   different ways:
+   -  If interrupts are enabled, wait for an interrupt to occur. Steps may include
+      configuring the modem interrupt pins as wake sources and putting the host
+      into a light sleep mode. See the general description of "Interrupts", below.
+   - Calculate the packet "time on air" by calling
+     `modem.get_time_on_air_us(len(packet))` and wait at least this long.
+   - Call `modem.poll_send()` in a loop (see next step) until it confirms
+     the send has completed.
+4. Call `modem.poll_send()` to check transmission state, and to
+   automatically resume a receive operation if one was suspended by
+   `prepare_send()`. The result of this function is one of:
+
+    - `True` if a send is in progress and the caller
+      should call again.
+
+    - `False` if no send is in progress.
+
+    - An `int` value. This is returned the first time `poll_send()` is
+      called after a send ended. The value is the `time.ticks_ms()`
+      timestamp of the time that the send completed. If interrupts are
+      enabled, this is the time the "send done" ISR executed. Otherwise, it
+      will be the time that `poll_send()` was just called.
+
+   Note that `modem.poll_send()` returns an `int` only one time per
+   successful transmission. Any subsequent calls will return `False` as there is
+   no longer a send in progress.
+
+   To abort a send in progress, call `modem.standby()` or `modem.sleep()`,
+   see the descriptions of these functions below. Subsequent calls to
+   `poll_send()` will return `False`.
+5. If `poll_send()` returned `True`, repeat steps 3 through 5.
+
+*Important*: Unless a transmission is aborted, `poll_send()` **MUST be
+called** at least once after `start_send()` and should be repeatedly called
+until it returns a value other than `True`. `poll_send()` can also be called
+after a send is aborted, but this is optional. If `poll_send()` is not
+called correctly then the driver's internal state will not correctly update and
+no subsequent receive will be able to start.
+
+It's also possible to mix the simple `send()` API with the low-level receive
+API, if this is more convenient for your application.
+
+### Interrupts
+
+If interrupt pins are in use then it's important for a programmer using the
+low-level API to handle interrupts correctly.
+
+It's only possible to rely on interrupts if the correct hardware interrupt lines
+are configured. Consult the modem reference datasheet, or check if the value of
+`start_recv()` or `start_send()` is truthy, in order to know if hardware
+interrupts can be used. Otherwise, the modem must be polled to know when an
+operation has completed.
+
+There are two kinds of interrupts:
+
+* A hardware interrupt (set in the driver by `Pin.irq()`) will be triggered on
+  the rising edge of a modem interrupt line (DIO0, DIO1, etc). The driver will
+  attempt to configure these for `RX Done`, `RX Timeout` and `TX Done` events if
+  possible and applicable for the modem operation, and will handle them.
+
+  It's possible for the programmer to configure these pins as hardware wake sources
+  and put the board into a low-power sleep mode, to be woken when the modem
+  finishes its operation.
+* A "soft" interrupt is triggered by the driver if an operation is aborted (see
+  `standby()` and `sleep()`, below), or if a receive operation "soft times
+  out". A receive "soft times out" if a receive is paused by a send
+  operation and after the send operation completes then the timeout period
+  for the receive has already elapsed. In these cases, the driver's radio ISR
+  routine is called but no hardware interrupt occurs.
+
+To detect if a modem interrupt has occurred, the programmer can use any of the
+following different approaches:
+
+* Port-specific functions to determine a hardware wakeup cause. Note that this
+  can only detect hardware interrupts.
+* Call the `modem.irq_triggered()` function. This is a lightweight function that
+  returns True if the modem ISR has been executed since the last time a send
+  or receive started. It is cleared when `poll_recv()` or `poll_send()`
+  is called after an interrupt, or when a new operation is started. The idea is
+  to use this as a lightweight "should I call `poll_recv()` or
+  `poll_send()` now?" check function if there's no easy way to determine
+  which interrupt has woken the board up.
+* Implement a custom interrupt callback function and call
+  `modem.set_irq_callback()` to install it. The function will be called with a
+  single argument, which is either the `Pin` that triggered a hardware interrupt
+  or `None` for a soft interrupt. Refer to the documentation about [writing interrupt
+  handlers](https://docs.micropython.org/en/latest/reference/isr_rules.html) for
+  more information. The `lora-async` modem classes install their own callback here,
+  so it's not possible to mix this approach with the provided asynchronous API.
+* Call `modem.poll_recv()` or `modem.poll_send()`. This takes more time
+  and uses more power as it reads the modem IRQ status directly from the modem
+  via SPI, but it also give the most definite result.
+
+As a "belts and braces" protection against unknown driver bugs or modem bugs,
+it's best practice to not rely on an interrupt occurring and to also include
+some logic that periodically times out and polls the modem state "just in case".
+
+## Other Functions
+
+### CRC Error Counter
+
+Modem objects have a variable `modem.crc_errors` which starts at `0` and
+is incremented by one each time a received CRC error or packet header error is
+detected by the modem. The programmer can read this value to know the current CRC
+error count, and also write it (for example, to clear it periodically by setting
+to `0`).
+
+For an alternative method to know about CRC errors when they occur, set
+`modem.rx_crc_error = True` (see `crc_en`, above, for more details.)
+
+### Modem Standby
+
+Calling `modem.standby()` puts the modem immediately into standby mode. In the
+case of SX1261 and SX1262, the 32MHz oscillator is started.
+
+Any current send or receive operations are immediately aborted.  The
+implications of this depends on the API in use:
+
+* The simple API does not support calling `standby()` while a receive or
+  send is in progress.
+* The async API handles this situation automatically. Any blocked `send()`
+  or `recv()` async coroutine will return None. The `recv_continuous()`
+  iterator will stop iterating.
+* The low-level API relies on the programmer to handle this case. When the modem
+  goes to standby, a "soft interrupt" occurs that will trigger the radio ISR and
+  any related callback, but this is not a hardware interrupt so may not wake the
+  CPU if the programmer has put it back to sleep. Any subsequent calls to
+  `poll_recv()` or `poll_send()` will both return `(False, None)` as no
+  operation is in progress. The programmer needs to ensure that any code that is
+  blocking waiting for an interrupt has the chance to wake up and call
+  `poll_recv()` and/or `poll_send()` to detect that the operation(s) have
+  been aborted.
+
+### Modem Sleep
+
+Calling `modem.sleep()` puts the modem into a low power sleep mode with
+configuration retention. The modem will automatically wake the next time an
+operation is started, or can be woken manually by calling
+`modem.standby()`. Waking the modem may take some time, consult the modem
+datasheet for details.
+
+As with `standby()`, any current send or receive operations are immediately
+aborted. The implications of this are the same as listed for standby, above.
+
+### Check if modem is idle
+
+The `modem.is_idle()` function will return True unless the modem is currently
+sending or receiving.
+
+### Packet length calculations
+
+Calling `modem.get_time_on_air_us(plen)` will return the "on air time" in
+microseconds for a packet of length `plen`, according to the current modem
+configuration. This can be used to synchronise modem operations, choose
+timeouts, or predict when a send will complete.
+
+Unlike the other modem API functions, this function doesn't interact with
+hardware at all so it can be safely called concurrently with other modem APIs.
+
+## Antenna switch object
+
+The modem constructors have an optional `ant_sw` parameter which allows passing
+in an antenna switch object to be called by the driver. This allows
+automatically configuring some GPIOs or other hardware settings each time the
+modem changes between TX and RX modes, and goes idle.
+
+The argument should be an object which implements three functions: `tx(tx_arg)`,
+`rx()`, and `idle()`. For example:
+
+```py
+class MyAntennaSwitch:
+    def tx(self, tx_arg):
+        ant_sw_gpio(1)  # Set GPIO high
+
+    def rx(self):
+        ant_sw_gpio(0)  # Set GPIO low
+
+    def idle(self):
+        pass
+```
+
+* `tx()` is called a short time before the modem starts sending.
+* `rx()` is called a short time before the modem starts receiving.
+* `idle()` is called at some point after each send or receive completes, and
+  may be called multiple times.
+
+The meaning of `tx_arg` depends on the modem:
+
+* For SX127x it is `True` if the `PA_BOOST` `tx_ant` setting is in use (see
+  above), and `False` otherwise.
+* For SX1262 it is `True` (indicating High Power mode).
+* For SX1261 it is `False` (indicating Low Power mode).
+
+This parameter can be ignored if it's already known what modem and antenna is being used.
+
+## Troubleshooting
+
+Some common errors and their causes:
+
+### RuntimeError: BUSY timeout
+
+The SX1261/2 drivers will raise this exception if the modem's TCXO fails to
+provide the necessary clock signal when starting a transmit or receive
+operation, or moving into "standby" mode.
+
+Usually, this means the constructor parameter `dio3_tcxo_millivolts` (see above)
+must be set as the SX126x chip DIO3 output pin is the power source for the TCXO
+connected to the modem.  Often this parameter should be set to `3300` (3.3V) but
+it may be another value, consult the documentation for your LoRa modem module.
diff --git a/micropython/lora/examples/reliable_delivery/README.md b/micropython/lora/examples/reliable_delivery/README.md
new file mode 100644
index 000000000..878b0f8a5
--- /dev/null
+++ b/micropython/lora/examples/reliable_delivery/README.md
@@ -0,0 +1,93 @@
+# LoRa Reliable Delivery Example
+
+This example shows a basic custom protocol for reliable one way communication
+from low-power remote devices to a central base device:
+
+- A single "receiver" device, running on mains power, listens continuously for
+  messages from one or more "sender" devices. Messages are payloads inside LoRa packets,
+  with some additional framing and address in the LoRa packet payload.
+- "Sender" devices are remote sensor nodes, possibly battery powered. These wake
+  up periodically, read some data from a sensor, and send it in a message to the receiver.
+- Messages are transmitted "reliably" with some custom header information,
+  meaning the receiver will acknowledge it received each message and the sender
+  will retry sending if it doesn't receive the acknowledgement.
+
+## Source Files
+
+* `lora_rd_settings.py` contains some common settings that are imported by
+  sender and receiver. These settings will need to be modified for the correct
+  frequency and other settings, before running the examples.
+* `receiver.py` and `receiver_async.py` contain a synchronous (low-level API)
+  and asynchronous (iterator API) implementation of the same receiver program,
+  respectively. These two programs should work the same, they are intended show
+  different ways the driver can be used.
+* `sender.py` and `sender_async.py` contain a synchronous (simple API) and
+  asynchronous (async API) implementation of the same sender program,
+  respectively. Because the standard async API resembles the Simple API, these
+  implementations are *very* similar. The two programs should work the same,
+  they are intended to show different ways the driver can be used.
+
+## Running the examples
+
+One way to run this example interactively:
+
+1. Install or "freeze in" the necessary lora modem driver package (`lora-sx127x`
+   or `lora-sx126x`) and optionally the `lora-async` package if using the async
+   examples (see main lora `README.md` in the above directory for details).
+2. Edit the `lora_rd_settings.py` file to set the frequency and other protocol
+   settings for your region and hardware (see main lora `README.md`).
+3. Edit the program you plan to run and fill in the `get_modem()` function with
+   the correct modem type, pin assignments, etc. for your board (see top-level
+   README). Note the `get_modem()` function should use the existing `lora_cfg`
+   variable, which holds the settings imported from `lora_rd_settings.py`.
+4. Change to this directory in a terminal.
+5. Run `mpremote mount . exec receiver.py` on one board and `mpremote mount
+   . exec sender.py` on another (or swap in `receiver_async.py` and/or
+   `sender_async.py` as desired).
+
+Consult the [mpremote
+documentation](https://docs.micropython.org/en/latest/reference/mpremote.html)
+for an explanation of these commands and the options needed to run two copies of
+`mpremote` on different serial ports at the same time.
+
+## Automatic Performance Tuning
+
+- When sending an ACK, the receiver includes the RSSI of the received
+  packet. Senders will automatically modify their output_power to minimize the
+  power consumption required to reach the receiver. Similarly, if no ACK is
+  received then they will increase their output power and also re-run Image
+  calibration in order to maximize RX performance.
+
+## Message payloads
+
+Messages are LoRa packets, set up as follows:
+
+LoRA implicit header mode, CRCs enabled.
+
+* Each remote device has a unique sixteen-bit ID (range 00x0000 to 0xFFFE). ID
+  0xFFFF is reserved for the single receiver device.
+* An eight-bit message counter is used to identify duplicate messages
+
+* Data message format is:
+  - Sender ID (two bytes, little endian)
+  - Counter byte (incremented on each new message, not incremented on retry).
+  - Message length (1 byte)
+  - Message (variable length)
+  - Checksum byte (sum of all proceeding bytes in message, modulo 256). The LoRa
+    packet has its own 16-bit CRC, this is included as an additional way to
+    disambiguate other LoRa packets that might appear the same.
+
+* After receiving a valid data message, the receiver device should send
+  an acknowledgement message 25ms after the modem receive completed.
+
+  Acknowledgement message format:
+  - 0xFFFF (receiver station ID as two bytes)
+  - Sender's Device ID from received message (two bytes, little endian)
+  - Counter byte from received message
+  - Checksum byte from received message
+  - RSSI value as received by radio (one signed byte)
+
+* If the remote device doesn't receive a packet with the acknowledgement
+  message, it retries up to a configurable number of times (default 4) with a
+  basic exponential backoff formula.
+
diff --git a/micropython/lora/examples/reliable_delivery/lora_rd_settings.py b/micropython/lora/examples/reliable_delivery/lora_rd_settings.py
new file mode 100644
index 000000000..bbf03da5d
--- /dev/null
+++ b/micropython/lora/examples/reliable_delivery/lora_rd_settings.py
@@ -0,0 +1,38 @@
+# MicroPython lora reliable_delivery example - common protocol settings
+# MIT license; Copyright (c) 2023 Angus Gratton
+
+#
+######
+# To be able to be able to communicate, most of these settings need to match on both radios.
+# Consult the example README for more information about how to use the example.
+######
+
+# LoRa protocol configuration
+#
+# Currently configured for relatively slow & low bandwidth settings, which
+# gives more link budget and possible range.
+#
+# These settings should match on receiver.
+#
+# Check the README and local regulations to know what configuration settings
+# are available.
+lora_cfg = {
+    "freq_khz": 916000,
+    "sf": 10,
+    "bw": "62.5",  # kHz
+    "coding_rate": 8,
+    "preamble_len": 12,
+    "output_power": 10,  # dBm
+}
+
+# Single receiver has a fixed 16-bit ID value (senders each have a unique value).
+RECEIVER_ID = 0xFFFF
+
+# Length of an ACK message in bytes.
+ACK_LENGTH = 7
+
+# Send the ACK this many milliseconds after receiving a valid message
+#
+# This can be quite a bit lower (25ms or so) if wakeup times are short
+# and _DEBUG is turned off on the modems (logging to UART delays everything).
+ACK_DELAY_MS = 100
diff --git a/micropython/lora/examples/reliable_delivery/receiver.py b/micropython/lora/examples/reliable_delivery/receiver.py
new file mode 100644
index 000000000..2ab4231db
--- /dev/null
+++ b/micropython/lora/examples/reliable_delivery/receiver.py
@@ -0,0 +1,163 @@
+# MicroPython lora reliable_delivery example - synchronous receiver program
+# MIT license; Copyright (c) 2023 Angus Gratton
+import struct
+import time
+import machine
+from machine import SPI, Pin
+from micropython import const
+from lora import RxPacket
+
+from lora_rd_settings import RECEIVER_ID, ACK_LENGTH, ACK_DELAY_MS, lora_cfg
+
+# Change _DEBUG to const(True) to get some additional debugging output
+# about timing, RSSI, etc.
+#
+# For a lot more debugging detail, go to the modem driver and set _DEBUG there to const(True)
+_DEBUG = const(False)
+
+# Keep track of the last counter value we got from each known sender
+# this allows us to tell if packets are being lost
+last_counters = {}
+
+
+def get_modem():
+    # from lora import SX1276
+    # return SX1276(
+    #     spi=SPI(1, baudrate=2000_000, polarity=0, phase=0,
+    #             miso=Pin(19), mosi=Pin(27), sck=Pin(5)),
+    #     cs=Pin(18),
+    #     dio0=Pin(26),
+    #     dio1=Pin(35),
+    #     reset=Pin(14),
+    #     lora_cfg=lora_cfg,
+    # )
+    raise NotImplementedError("Replace this function with one that returns a lora modem instance")
+
+
+def main():
+    print("Initializing...")
+    modem = get_modem()
+
+    print("Main loop started")
+    receiver = Receiver(modem)
+
+    while True:
+        # With wait=True, this function blocks until something is received and always
+        # returns non-None
+        sender_id, data = receiver.recv(wait=True)
+
+        # Do something with the data!
+        print(f"Received {data} from {sender_id:#x}")
+
+
+class Receiver:
+    def __init__(self, modem):
+        self.modem = modem
+        self.last_counters = {}  # Track the last counter value we got from each sender ID
+        self.rx_packet = None  # Reuse RxPacket object when possible, save allocation
+        self.ack_buffer = bytearray(ACK_LENGTH)  # reuse the same buffer for ACK packets
+        self.skipped_packets = 0  # Counter of skipped packets
+
+        modem.calibrate()
+
+        # Start receiving immediately. We expect the modem to receive continuously
+        self.will_irq = modem.start_recv(continuous=True)
+        print("Modem initialized and started receive...")
+
+    def recv(self, wait=True):
+        # Receive a packet from the sender, including sending an ACK.
+        #
+        # Returns a tuple of the 16-bit sender id and the sensor data payload.
+        #
+        # This function should be called very frequently from the main loop (at
+        # least every ACK_DELAY_MS milliseconds), to avoid not sending ACKs in time.
+        #
+        # If 'wait' argument is True (default), the function blocks indefinitely
+        # until a packet is received. If False then it will return None
+        # if no packet is available.
+        #
+        # Note that because we called start_recv(continuous=True), the modem
+        # will keep receiving on its own - even if when we call send() to
+        # send an ACK.
+        while True:
+            rx = self.modem.poll_recv(rx_packet=self.rx_packet)
+
+            if isinstance(rx, RxPacket):  # value will be True or an RxPacket instance
+                decoded = self._handle_rx(rx)
+                if decoded:
+                    return decoded  # valid LoRa packet and valid for this application
+
+            if not wait:
+                return None
+
+            # Otherwise, wait for an IRQ (or have a short sleep) and then poll recv again
+            # (receiver is not a low power node, so don't bother with sleep modes.)
+            if self.will_irq:
+                while not self.modem.irq_triggered():
+                    machine.idle()
+            else:
+                time.sleep_ms(1)
+
+    def _handle_rx(self, rx):
+        # Internal function to handle a received packet and either send an ACK
+        # and return the sender and the payload, or return None if packet
+        # payload is invalid or a duplicate.
+
+        if len(rx) < 5:  # 4 byte header plus 1 byte checksum
+            print("Invalid packet length")
+            return None
+
+        sender_id, counter, data_len = struct.unpack("<HBB", rx)
+        csum = rx[-1]
+
+        if len(rx) != data_len + 5:
+            print("Invalid length in payload header")
+            return None
+
+        calc_csum = sum(b for b in rx[:-1]) & 0xFF
+        if csum != calc_csum:
+            print(f"Invalid checksum. calc={calc_csum:#x} received={csum:#x}")
+            return None
+
+        # Packet is valid!
+
+        if _DEBUG:
+            print(f"RX {data_len} byte message RSSI {rx.rssi} at timestamp {rx.ticks_ms}")
+
+        # Send the ACK
+        struct.pack_into(
+            "<HHBBb", self.ack_buffer, 0, RECEIVER_ID, sender_id, counter, csum, rx.rssi
+        )
+
+        # Time send to start as close to ACK_DELAY_MS after message was received as possible
+        tx_at_ms = time.ticks_add(rx.ticks_ms, ACK_DELAY_MS)
+        tx_done = self.modem.send(self.ack_buffer, tx_at_ms=tx_at_ms)
+
+        if _DEBUG:
+            tx_time = time.ticks_diff(tx_done, tx_at_ms)
+            expected = self.modem.get_time_on_air_us(ACK_LENGTH) / 1000
+            print(f"ACK TX {tx_at_ms}ms -> {tx_done}ms took {tx_time}ms expected {expected}")
+
+        # Check if the data we received is fresh or stale
+        if sender_id not in self.last_counters:
+            print(f"New device id {sender_id:#x}")
+        elif self.last_counters[sender_id] == counter:
+            print(f"Duplicate packet received from {sender_id:#x}")
+            return None
+        elif counter != 1:
+            # If the counter from this sender has gone up by more than 1 since
+            # last time we got a packet, we know there is some packet loss.
+            #
+            # (ignore the case where the new counter is 1, as this probably
+            # means a reset.)
+            delta = (counter - 1 - self.last_counters[sender_id]) & 0xFF
+            if delta:
+                print(f"Skipped/lost {delta} packets from {sender_id:#x}")
+                self.skipped_packets += delta
+
+        self.last_counters[sender_id] = counter
+        return sender_id, rx[4:-1]
+
+
+if __name__ == "__main__":
+    main()
diff --git a/micropython/lora/examples/reliable_delivery/receiver_async.py b/micropython/lora/examples/reliable_delivery/receiver_async.py
new file mode 100644
index 000000000..72a456db8
--- /dev/null
+++ b/micropython/lora/examples/reliable_delivery/receiver_async.py
@@ -0,0 +1,121 @@
+# MicroPython lora reliable_delivery example - asynchronous receiver program
+# MIT license; Copyright (c) 2023 Angus Gratton
+import struct
+import time
+import asyncio
+from machine import SPI, Pin
+from micropython import const
+
+from lora_rd_settings import RECEIVER_ID, ACK_LENGTH, ACK_DELAY_MS, lora_cfg
+
+# Change _DEBUG to const(True) to get some additional debugging output
+# about timing, RSSI, etc.
+#
+# For a lot more debugging detail, go to the modem driver and set _DEBUG there to const(True)
+_DEBUG = const(False)
+
+# Keep track of the last counter value we got from each known sender
+# this allows us to tell if packets are being lost
+last_counters = {}
+
+
+def get_async_modem():
+    # from lora import AsyncSX1276
+    # return AsyncSX1276(
+    #     spi=SPI(1, baudrate=2000_000, polarity=0, phase=0,
+    #             miso=Pin(19), mosi=Pin(27), sck=Pin(5)),
+    #     cs=Pin(18),
+    #     dio0=Pin(26),
+    #     dio1=Pin(35),
+    #     reset=Pin(14),
+    #     lora_cfg=lora_cfg,
+    # )
+    raise NotImplementedError("Replace this function with one that returns a lora modem instance")
+
+
+def main():
+    # Initializing the modem.
+    #
+
+    print("Initializing...")
+    modem = get_async_modem()
+    asyncio.run(recv_continuous(modem, rx_callback))
+
+
+async def rx_callback(sender_id, data):
+    # Do something with the data!
+    print(f"Received {data} from {sender_id:#x}")
+
+
+async def recv_continuous(modem, callback):
+    # Async task which receives packets from the AsyncModem recv_continuous()
+    # iterator, checks if they are valid, and send back an ACK if needed.
+    #
+    # On each successful message, we await callback() to allow the application
+    # to do something with the data. Callback args are sender_id (as int) and the bytes
+    # of the message payload.
+
+    last_counters = {}  # Track the last counter value we got from each sender ID
+    ack_buffer = bytearray(ACK_LENGTH)  # reuse the same buffer for ACK packets
+    skipped_packets = 0  # Counter of skipped packets
+
+    modem.calibrate()
+
+    async for rx in modem.recv_continuous():
+        # Filter 'rx' packet to determine if it's valid for our application
+        if len(rx) < 5:  # 4 byte header plus 1 byte checksum
+            print("Invalid packet length")
+            continue
+
+        sender_id, counter, data_len = struct.unpack("<HBB", rx)
+        csum = rx[-1]
+
+        if len(rx) != data_len + 5:
+            print("Invalid length in payload header")
+            continue
+
+        calc_csum = sum(b for b in rx[:-1]) & 0xFF
+        if csum != calc_csum:
+            print(f"Invalid checksum. calc={calc_csum:#x} received={csum:#x}")
+            continue
+
+        # Packet is valid!
+
+        if _DEBUG:
+            print(f"RX {data_len} byte message RSSI {rx.rssi} at timestamp {rx.ticks_ms}")
+
+        # Send the ACK
+        struct.pack_into("<HHBBb", ack_buffer, 0, RECEIVER_ID, sender_id, counter, csum, rx.rssi)
+
+        # Time send to start as close to ACK_DELAY_MS after message was received as possible
+        tx_at_ms = time.ticks_add(rx.ticks_ms, ACK_DELAY_MS)
+        tx_done = await modem.send(ack_buffer, tx_at_ms=tx_at_ms)
+
+        if _DEBUG:
+            tx_time = time.ticks_diff(tx_done, tx_at_ms)
+            expected = modem.get_time_on_air_us(ACK_LENGTH) / 1000
+            print(f"ACK TX {tx_at_ms}ms -> {tx_done}ms took {tx_time}ms expected {expected}")
+
+        # Check if the data we received is fresh or stale
+        if sender_id not in last_counters:
+            print(f"New device id {sender_id:#x}")
+        elif last_counters[sender_id] == counter:
+            print(f"Duplicate packet received from {sender_id:#x}")
+            continue
+        elif counter != 1:
+            # If the counter from this sender has gone up by more than 1 since
+            # last time we got a packet, we know there is some packet loss.
+            #
+            # (ignore the case where the new counter is 1, as this probably
+            # means a reset.)
+            delta = (counter - 1 - last_counters[sender_id]) & 0xFF
+            if delta:
+                print(f"Skipped/lost {delta} packets from {sender_id:#x}")
+                skipped_packets += delta
+
+        last_counters[sender_id] = counter
+        await callback(sender_id, rx[4:-1])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/micropython/lora/examples/reliable_delivery/sender.py b/micropython/lora/examples/reliable_delivery/sender.py
new file mode 100644
index 000000000..2fba0d4d7
--- /dev/null
+++ b/micropython/lora/examples/reliable_delivery/sender.py
@@ -0,0 +1,213 @@
+# MicroPython lora reliable_delivery example - synchronous sender program
+# MIT license; Copyright (c) 2023 Angus Gratton
+import machine
+from machine import SPI, Pin
+import random
+import struct
+import time
+
+from lora_rd_settings import RECEIVER_ID, ACK_LENGTH, ACK_DELAY_MS, lora_cfg
+
+SLEEP_BETWEEN_MS = 5000  # Main loop should sleep this long between sending data to the receiver
+
+MAX_RETRIES = 4  # Retry each message this often if no ACK is received
+
+# Initial retry is after this long. Increases by 1.25x each subsequent retry.
+BASE_RETRY_TIMEOUT_MS = 1000
+
+# Add random jitter to each retry period, up to this long. Useful to prevent two
+# devices ending up in sync.
+RETRY_JITTER_MS = 1500
+
+# If reported RSSI value is lower than this, increase
+# output power 1dBm
+RSSI_WEAK_THRESH = -110
+
+# If reported RSSI value is higher than this, decrease
+# output power 1dBm
+RSSI_STRONG_THRESH = -70
+
+# IMPORTANT: Set this to the maximum output power in dBm that is permitted in
+# your regulatory environment.
+OUTPUT_MAX_DBM = 15
+OUTPUT_MIN_DBM = -20
+
+
+def get_modem():
+    # from lora import SX1276
+    # return SX1276(
+    #     spi=SPI(1, baudrate=2000_000, polarity=0, phase=0,
+    #             miso=Pin(19), mosi=Pin(27), sck=Pin(5)),
+    #     cs=Pin(18),
+    #     dio0=Pin(26),
+    #     dio1=Pin(35),
+    #     reset=Pin(14),
+    #     lora_cfg=lora_cfg,
+    # )
+    raise NotImplementedError("Replace this function with one that returns a lora modem instance")
+
+
+def main():
+    modem = get_modem()
+
+    # Unique ID of this sender, 16-bit number. This method of generating an ID is pretty crummy,
+    # if using this in a real application then probably better to store these in the filesystem or
+    # something like that
+    DEVICE_ID = sum(b for b in machine.unique_id()) & 0xFFFF
+
+    sender = Sender(modem, DEVICE_ID)
+    while True:
+        sensor_data = get_sensor_data()
+        sender.send(sensor_data)
+
+        # Sleep until the next time we should read the sensor data and send it to
+        # the receiver.
+        #
+        # The goal for the device firmware is to spend most of its time in the lowest
+        # available sleep state, to save power.
+        #
+        # Note that if the sensor(s) in a real program generates events, these can be
+        # hooked to interrupts and used to wake Micropython up to send data,
+        # instead.
+        modem.sleep()
+        time.sleep_ms(SLEEP_BETWEEN_MS)  # TODO see if this can be machine.lightsleep()
+
+
+def get_sensor_data():
+    # Return a bytes object with the latest sensor data to send to the receiver.
+    #
+    # As this is just an example, we send a dummy payload which is just a string
+    # containing our ticks_ms() timestamp.
+    #
+    # In a real application the sensor data should usually be binary data and
+    # not a string, to save transmission size.
+    return f"Hello, ticks_ms={time.ticks_ms()}".encode()
+
+
+class Sender:
+    def __init__(self, modem, device_id):
+        self.modem = modem
+        self.device_id = device_id
+        self.counter = 0
+        self.output_power = lora_cfg["output_power"]  # start with common settings power level
+        self.rx_ack = None  # reuse the ack message object when we can
+
+        print(f"Sender initialized with ID {device_id:#x}")
+        random.seed(device_id)
+        self.adjust_output_power(0)  # set the initial value within MIN/MAX
+
+        modem.calibrate()
+
+    def send(self, sensor_data, adjust_output_power=True):
+        # Send a packet of sensor data to the receiver reliably.
+        #
+        # Returns True if data was successfully sent and ACKed, False otherwise.
+        #
+        # If adjust_output_power==True then increase or decrease output power
+        # according to the RSSI reported in the ACK packet.
+        self.counter = (self.counter + 1) & 0xFF
+
+        # Prepare the simple payload with header and checksum
+        # See README for a summary of the simple data message format
+        payload = bytearray(len(sensor_data) + 5)
+        struct.pack_into("<HBB", payload, 0, self.device_id, self.counter, len(sensor_data))
+        payload[4:-1] = sensor_data
+        payload[-1] = sum(b for b in payload) & 0xFF
+
+        # Calculate the time on air (in milliseconds) for an ACK packet
+        ack_packet_ms = self.modem.get_time_on_air_us(ACK_LENGTH) // 1000 + 1
+        timeout = BASE_RETRY_TIMEOUT_MS
+
+        print(f"Sending {len(payload)} bytes")
+
+        # Send the payload, until we receive an acknowledgement or run out of retries
+        for _ in range(MAX_RETRIES):
+            # Using simple API here.
+            #
+            # We could reduce power consumption a little by going to sleep
+            # instead of waiting for the send/recv to complete, but doing
+            # this well involves setting port-specific wakeup settings. Provided
+            # "dio" pin is assigned then the MCU will mostly be in a lower power
+            # idle state while the radio sends, at least.
+            sent_at = self.modem.send(payload)
+
+            # We expect the receiver of a valid message to start sending the ACK
+            # approximately ACK_DELAY_MS after receiving the message (to allow
+            # the sender time to reconfigure the modem.)
+            #
+            # We start receiving as soon as we can, but allow up to
+            # ACK_DELAY_MS*2 of total timing leeway - plus the time on air for
+            # the message itself
+            maybe_ack = self.modem.recv(ack_packet_ms + ACK_DELAY_MS * 2, rx_packet=self.rx_ack)
+
+            # Check if the packet we received is a valid ACK
+            rssi = self._ack_is_valid(maybe_ack, payload[-1])
+
+            if rssi is not None:  # ACK is valid
+                self.rx_ack == maybe_ack
+
+                delta = time.ticks_diff(maybe_ack.ticks_ms, sent_at)
+                print(
+                    f"ACKed with RSSI {rssi}, {delta}ms after sent "
+                    + f"(skew {delta-ACK_DELAY_MS-ack_packet_ms}ms)"
+                )
+
+                if adjust_output_power:
+                    if rssi > RSSI_STRONG_THRESH:
+                        self.adjust_output_power(-1)
+                    elif rssi < RSSI_WEAK_THRESH:
+                        self.adjust_output_power(1)
+
+                return True
+
+            # Otherwise, prepare to sleep briefly and then retry
+            next_try_at = time.ticks_add(sent_at, timeout)
+            sleep_time = time.ticks_diff(next_try_at, time.ticks_ms()) + random.randrange(
+                RETRY_JITTER_MS
+            )
+            if sleep_time > 0:
+                self.modem.sleep()
+                time.sleep_ms(sleep_time)  # TODO: see if this can be machine.lightsleep
+
+            # add 25% timeout for next iteration
+            timeout = (timeout * 5) // 4
+
+        print(f"Failed, no ACK after {MAX_RETRIES} retries.")
+        if adjust_output_power:
+            self.adjust_output_power(2)
+        self.modem.calibrate_image()  # try and improve the RX sensitivity for next time
+        return False
+
+    def _ack_is_valid(self, maybe_ack, csum):
+        # Private function to verify if the RxPacket held in 'maybe_ack' is a valid ACK for the
+        # current device_id and counter value, and provided csum value.
+        #
+        # If it is, returns the reported RSSI value from the packet.
+        # If not, returns None
+        if (not maybe_ack) or len(maybe_ack) != ACK_LENGTH:
+            return None
+
+        base_id, ack_id, ack_counter, ack_csum, rssi = struct.unpack("<HHBBb", maybe_ack)
+
+        if (
+            base_id != RECEIVER_ID
+            or ack_id != self.device_id
+            or ack_counter != self.counter
+            or ack_csum != csum
+        ):
+            return None
+
+        return rssi
+
+    def adjust_output_power(self, delta_dbm):
+        # Adjust the modem output power by +/-delta_dbm, max of OUTPUT_MAX_DBM
+        #
+        # (note: the radio may also apply its own power limit internally.)
+        new = max(min(self.output_power + delta_dbm, OUTPUT_MAX_DBM), OUTPUT_MIN_DBM)
+        self.output_power = new
+        print(f"New output_power {new}/{OUTPUT_MAX_DBM} (delta {delta_dbm})")
+        self.modem.configure({"output_power": self.output_power})
+
+
+if __name__ == "__main__":
+    main()
diff --git a/micropython/lora/examples/reliable_delivery/sender_async.py b/micropython/lora/examples/reliable_delivery/sender_async.py
new file mode 100644
index 000000000..a27420f6b
--- /dev/null
+++ b/micropython/lora/examples/reliable_delivery/sender_async.py
@@ -0,0 +1,205 @@
+# MicroPython lora reliable_delivery example - asynchronous sender program
+# MIT license; Copyright (c) 2023 Angus Gratton
+import machine
+from machine import SPI, Pin
+import random
+import struct
+import time
+import asyncio
+
+from lora_rd_settings import RECEIVER_ID, ACK_LENGTH, ACK_DELAY_MS, lora_cfg
+
+SLEEP_BETWEEN_MS = 5000  # Main loop should sleep this long between sending data to the receiver
+
+MAX_RETRIES = 4  # Retry each message this often if no ACK is received
+
+# Initial retry is after this long. Increases by 1.25x each subsequent retry.
+BASE_RETRY_TIMEOUT_MS = 1000
+
+# Add random jitter to each retry period, up to this long. Useful to prevent two
+# devices ending up in sync.
+RETRY_JITTER_MS = 1500
+
+# If reported RSSI value is lower than this, increase
+# output power 1dBm
+RSSI_WEAK_THRESH = -110
+
+# If reported RSSI value is higher than this, decrease
+# output power 1dBm
+RSSI_STRONG_THRESH = -70
+
+# IMPORTANT: Set this to the maximum output power in dBm that is permitted in
+# your regulatory environment.
+OUTPUT_MAX_DBM = 15
+OUTPUT_MIN_DBM = -20
+
+
+def get_async_modem():
+    # from lora import AsyncSX1276
+    # return AsyncSX1276(
+    #     spi=SPI(1, baudrate=2000_000, polarity=0, phase=0,
+    #             miso=Pin(19), mosi=Pin(27), sck=Pin(5)),
+    #     cs=Pin(18),
+    #     dio0=Pin(26),
+    #     dio1=Pin(35),
+    #     reset=Pin(14),
+    #     lora_cfg=lora_cfg,
+    # )
+    raise NotImplementedError("Replace this function with one that returns a lora modem instance")
+
+
+def main():
+    modem = get_async_modem()
+    asyncio.run(sender_task(modem))
+
+
+async def sender_task(modem):
+    # Unique ID of this sender, 16-bit number. This method of generating an ID is pretty crummy,
+    # if using this in a real application then probably better to store these in the filesystem or
+    # something like that
+    DEVICE_ID = sum(b for b in machine.unique_id()) & 0xFFFF
+
+    sender = AsyncSender(modem, DEVICE_ID)
+    while True:
+        sensor_data = await get_sensor_data()
+        await sender.send(sensor_data)
+
+        # Sleep until the next time we should read the sensor data and send it to
+        # the receiver. awaiting here means other tasks will run.
+        modem.sleep()
+        await asyncio.sleep_ms(SLEEP_BETWEEN_MS)
+
+
+async def get_sensor_data():
+    # Return a bytes object with the latest sensor data to send to the receiver.
+    #
+    # As this is just an example, we send a dummy payload which is just a string
+    # containing our ticks_ms() timestamp.
+    #
+    # In a real application the sensor data should usually be binary data and
+    # not a string, to save transmission size.
+    return f"Hello, ticks_ms={time.ticks_ms()}".encode()
+
+
+class AsyncSender:
+    def __init__(self, modem, device_id):
+        self.modem = modem
+        self.device_id = device_id
+        self.counter = 0
+        self.output_power = lora_cfg["output_power"]  # start with common settings power level
+        self.rx_ack = None  # reuse the ack message object when we can
+
+        print(f"Sender initialized with ID {device_id:#x}")
+        random.seed(device_id)
+        self.adjust_output_power(0)  # set the initial value within MIN/MAX
+
+        modem.calibrate()
+
+    async def send(self, sensor_data, adjust_output_power=True):
+        # Send a packet of sensor data to the receiver reliably.
+        #
+        # Returns True if data was successfully sent and ACKed, False otherwise.
+        #
+        # If adjust_output_power==True then increase or decrease output power
+        # according to the RSSI reported in the ACK packet.
+        self.counter = (self.counter + 1) & 0xFF
+
+        # Prepare the simple payload with header and checksum
+        # See README for a summary of the simple data message format
+        payload = bytearray(len(sensor_data) + 5)
+        struct.pack_into("<HBB", payload, 0, self.device_id, self.counter, len(sensor_data))
+        payload[4:-1] = sensor_data
+        payload[-1] = sum(b for b in payload) & 0xFF
+
+        # Calculate the time on air (in milliseconds) for an ACK packet
+        ack_packet_ms = self.modem.get_time_on_air_us(ACK_LENGTH) // 1000 + 1
+        timeout = BASE_RETRY_TIMEOUT_MS
+
+        print(f"Sending {len(payload)} bytes")
+
+        # Send the payload, until we receive an acknowledgement or run out of retries
+        for _ in range(MAX_RETRIES):
+            sent_at = await self.modem.send(payload)
+
+            # We expect the receiver of a valid message to start sending the ACK
+            # approximately ACK_DELAY_MS after receiving the message (to allow
+            # the sender time to reconfigure the modem.)
+            #
+            # We start receiving as soon as we can, but allow up to
+            # ACK_DELAY_MS*2 of total timing leeway - plus the time on air for
+            # the packet itself
+            maybe_ack = await self.modem.recv(
+                ack_packet_ms + ACK_DELAY_MS * 2, rx_packet=self.rx_ack
+            )
+
+            # Check if the packet we received is a valid ACK
+            rssi = self._ack_is_valid(maybe_ack, payload[-1])
+
+            if rssi is not None:  # ACK is valid
+                self.rx_ack == maybe_ack
+
+                delta = time.ticks_diff(maybe_ack.ticks_ms, sent_at)
+                print(
+                    f"ACKed with RSSI {rssi}, {delta}ms after sent "
+                    + f"(skew {delta-ACK_DELAY_MS-ack_packet_ms}ms)"
+                )
+
+                if adjust_output_power:
+                    if rssi > RSSI_STRONG_THRESH:
+                        self.adjust_output_power(-1)
+                    elif rssi < RSSI_WEAK_THRESH:
+                        self.adjust_output_power(1)
+
+                return True
+
+            # Otherwise, prepare to sleep briefly and then retry
+            next_try_at = time.ticks_add(sent_at, timeout)
+            sleep_time = time.ticks_diff(next_try_at, time.ticks_ms()) + random.randrange(
+                RETRY_JITTER_MS
+            )
+            if sleep_time > 0:
+                self.modem.sleep()
+                await asyncio.sleep_ms(sleep_time)
+
+            # add 25% timeout for next iteration
+            timeout = (timeout * 5) // 4
+
+        print(f"Failed, no ACK after {MAX_RETRIES} retries.")
+        if adjust_output_power:
+            self.adjust_output_power(2)
+        self.modem.calibrate_image()  # try and improve the RX sensitivity for next time
+        return False
+
+    def _ack_is_valid(self, maybe_ack, csum):
+        # Private function to verify if the RxPacket held in 'maybe_ack' is a valid ACK for the
+        # current device_id and counter value, and provided csum value.
+        #
+        # If it is, returns the reported RSSI value from the packet.
+        # If not, returns None
+        if (not maybe_ack) or len(maybe_ack) != ACK_LENGTH:
+            return None
+
+        base_id, ack_id, ack_counter, ack_csum, rssi = struct.unpack("<HHBBb", maybe_ack)
+
+        if (
+            base_id != RECEIVER_ID
+            or ack_id != self.device_id
+            or ack_counter != self.counter
+            or ack_csum != csum
+        ):
+            return None
+
+        return rssi
+
+    def adjust_output_power(self, delta_dbm):
+        # Adjust the modem output power by +/-delta_dbm, max of OUTPUT_MAX_DBM
+        #
+        # (note: the radio may also apply its own power limit internally.)
+        new = max(min(self.output_power + delta_dbm, OUTPUT_MAX_DBM), OUTPUT_MIN_DBM)
+        self.output_power = new
+        print(f"New output_power {new}/{OUTPUT_MAX_DBM} (delta {delta_dbm})")
+        self.modem.configure({"output_power": self.output_power})
+
+
+if __name__ == "__main__":
+    main()
diff --git a/micropython/lora/examples/simple_rxtx/README.md b/micropython/lora/examples/simple_rxtx/README.md
new file mode 100644
index 000000000..090d69eeb
--- /dev/null
+++ b/micropython/lora/examples/simple_rxtx/README.md
@@ -0,0 +1,26 @@
+# LoRa Simple RX/TX Example
+
+## Source Files
+
+* `simple_rxtx.py` is a very simple implementation of a program to alternately
+  receive and send LoRa packets.
+* `simple_rxtx_async.py` is the same program implemented using async Python.
+
+## Running the examples
+
+One way to run this example interactively:
+
+1. Install or "freeze in" the necessary lora modem driver package (`lora-sx127x`
+   or `lora-sx126x`) and optionally the `lora-async` package if using the async
+   examples (see main lora `README.md` in the above directory for details).
+3. Edit the program you plan to run and fill in the `get_modem()` function with
+   the correct modem type, pin assignments, etc. for your board (see top-level
+   README).
+4. Change to this directory in a terminal.
+5. Run `mpremote run simple_rxtx.py` or `mpremote run
+   simple_rxtx_async.py` as applicable.
+
+Consult the [mpremote
+documentation](https://docs.micropython.org/en/latest/reference/mpremote.html)
+for an explanation of these commands and the options needed to run two copies of
+`mpremote` on different serial ports at the same time.
diff --git a/micropython/lora/examples/simple_rxtx/simple_rxtx.py b/micropython/lora/examples/simple_rxtx/simple_rxtx.py
new file mode 100644
index 000000000..858570bc1
--- /dev/null
+++ b/micropython/lora/examples/simple_rxtx/simple_rxtx.py
@@ -0,0 +1,51 @@
+# MicroPython lora simple_rxtx example - synchronous API version
+# MIT license; Copyright (c) 2023 Angus Gratton
+import time
+from machine import Pin, SPI
+
+
+def get_modem():
+    # from lora import SX1276
+    #
+    # lora_cfg = {
+    #    "freq_khz": 916000,
+    #    "sf": 8,
+    #    "bw": "500",  # kHz
+    #    "coding_rate": 8,
+    #    "preamble_len": 12,
+    #    "output_power": 0,  # dBm
+    # }
+    #
+    # return SX1276(
+    #     spi=SPI(1, baudrate=2000_000, polarity=0, phase=0,
+    #             miso=Pin(19), mosi=Pin(27), sck=Pin(5)),
+    #     cs=Pin(18),
+    #     dio0=Pin(26),
+    #     dio1=Pin(35),
+    #     reset=Pin(14),
+    #     lora_cfg=lora_cfg,
+    # )
+    raise NotImplementedError("Replace this function with one that returns a lora modem instance")
+
+
+def main():
+    print("Initializing...")
+    modem = get_modem()
+
+    counter = 0
+    while True:
+        print("Sending...")
+        modem.send(f"Hello world from MicroPython #{counter}".encode())
+
+        print("Receiving...")
+        rx = modem.recv(timeout_ms=5000)
+        if rx:
+            print(f"Received: {repr(rx)}")
+        else:
+            print("Timeout!")
+        time.sleep(2)
+        counter += 1
+
+
+if __name__ == "__main__":
+    main()
diff --git a/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py b/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py
new file mode 100644
index 000000000..f297059a5
--- /dev/null
+++ b/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py
@@ -0,0 +1,60 @@
+# MicroPython lora simple_rxtx example - asynchronous API version
+# MIT license; Copyright (c) 2023 Angus Gratton
+import asyncio
+from machine import Pin, SPI
+
+
+def get_async_modem():
+    # from lora import AsyncSX1276
+    #
+    # lora_cfg = {
+    #    "freq_khz": 916000,
+    #    "sf": 8,
+    #    "bw": "500",  # kHz
+    #    "coding_rate": 8,
+    #    "preamble_len": 12,
+    #    "output_power": 0,  # dBm
+    # }
+    #
+    # return AsyncSX1276(
+    #     spi=SPI(1, baudrate=2000_000, polarity=0, phase=0,
+    #             miso=Pin(19), mosi=Pin(27), sck=Pin(5)),
+    #     cs=Pin(18),
+    #     dio0=Pin(26),
+    #     dio1=Pin(35),
+    #     reset=Pin(14),
+    #     lora_cfg=lora_cfg,
+    # )
+    raise NotImplementedError("Replace this function with one that returns a lora modem instance")
+
+
+async def main_task():
+    modem = get_async_modem()
+    await asyncio.gather(
+        asyncio.create_task(send_coro(modem)),
+        asyncio.create_task(recv_coro(modem)),
+    )
+
+
+async def recv_coro(modem):
+    while True:
+        print("Receiving...")
+        rx = await modem.recv(2000)
+        if rx:
+            print(f"Received: {repr(rx)}")
+        else:
+            print("Receive timeout!")
+
+
+async def send_coro(modem):
+    counter = 0
+    while True:
+        print("Sending...")
+        await modem.send(f"Hello world from async MicroPython #{counter}".encode())
+        print("Sent!")
+        await asyncio.sleep(5)
+        counter += 1
+
+
+if __name__ == "__main__":
+    asyncio.run(main_task())
diff --git a/micropython/lora/lora-async/lora/async_modem.py b/micropython/lora/lora-async/lora/async_modem.py
new file mode 100644
index 000000000..e21f2f522
--- /dev/null
+++ b/micropython/lora/lora-async/lora/async_modem.py
@@ -0,0 +1,144 @@
+# MicroPython LoRa async modem driver
+# MIT license; Copyright (c) 2023 Angus Gratton
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+
+import asyncio
+import time
+from micropython import const
+
+# Set to True to get some additional printed debug output.
+_DEBUG = const(False)
+
+# Some "belts and braces" timeouts when using IRQs, to wake up if an IRQ hasn't
+# fired as expected. Also a timeout for how rapidly to poll the modem during TX
+# if no IRQ is enabled.
+#
+# All in milliseconds
+_RX_POLL_WITH_IRQ = const(1000)
+_RX_POLL_NO_IRQ = const(50)
+_TX_POLL_LATE_IRQ = const(10)
+
+
+class AsyncModem:
+    # Mixin-like base class that provides coroutines for modem send, recv & recv_continuous.
+    #
+    # Don't instantiate this class directly, instantiate one of the 'AsyncXYZ'
+    # modem classes defined in the lora module.
+
+    def _after_init(self):
+        # Separate flags for (rx, tx) as only one task can block on a flag
+        self._flags = (asyncio.ThreadSafeFlag(), asyncio.ThreadSafeFlag())
+        self.set_irq_callback(self._callback)
+
+    async def recv(self, timeout_ms=None, rx_length=0xFF, rx_packet=None):
+        # Async function to receive a single LoRa packet, with an optional timeout
+        #
+        # Same API as the "Simple API" synchronous function
+        self._flags[0].clear()
+        will_irq = self.start_recv(timeout_ms, False, rx_length)
+        return await self._recv(will_irq, rx_packet)
+
+    def recv_continuous(self, rx_length=0xFF, rx_packet=None):
+        # Returns an Async Iterator that continuously yields LoRa packets, until
+        # the modem is told to sleep() or standby().
+        #
+        # Once MicroPython has PEP525 support (PR #6668) then this somewhat
+        # fiddly implementation can probably be merged with recv() into a much simpler
+        # single _recv() private coro that either yields or returns, depending on
+        # an argument. The public API can stay the same.
+        will_irq = self.start_recv(None, True, rx_length)
+        return AsyncContinuousReceiver(self, will_irq, rx_packet)
+
+    async def _recv(self, will_irq, rx_packet):
+        # Second half of receiving is implemented here to share code with AsyncContinuousReceiver,
+        # until future refactor is possible (see comment immediately above this one.)
+        rx = True
+        while rx is True:
+            await self._wait(will_irq, 0, _RX_POLL_WITH_IRQ if will_irq else _RX_POLL_NO_IRQ)
+            rx = self.poll_recv(rx_packet)
+        if rx:  # RxPacket instance
+            return rx
+
+    async def send(self, packet, tx_at_ms=None):
+        self._flags[1].clear()
+        self.prepare_send(packet)
+
+        timeout_ms = self.get_time_on_air_us(len(packet)) // 1000 + 50
+
+        if tx_at_ms is not None:
+            await asyncio.sleep_ms(max(0, time.ticks_diff(tx_at_ms, time.ticks_ms())))
+
+        if _DEBUG:
+            print("start_send")
+
+        will_irq = self.start_send()
+
+        tx = True
+        while tx is True:
+            await self._wait(will_irq, 1, timeout_ms)
+            tx = self.poll_send()
+
+            if _DEBUG:
+                print(f"poll_send returned tx={tx}")
+
+            # If we've already waited the estimated send time (plus 50ms) and the modem
+            # is not done, timeout and poll more rapidly from here on (unsure if
+            # this is necessary, outside of a serious bug, but doesn't hurt.)
+            timeout_ms = _TX_POLL_LATE_IRQ
+
+        return tx
+
+    async def _wait(self, will_irq, idx, timeout_ms):
+        # Common code path for blocking on an interrupt, if configured.
+        #
+        # idx is into _flags tuple and is 0 for rx and 1 for tx
+        #
+        # timeout_ms is the expected send time for sends, or a reasonable
+        # polling timeout for receives.
+        if _DEBUG:
+            print(f"wait will_irq={will_irq} timeout_ms={timeout_ms}")
+        if will_irq:
+            # In theory we don't need to ever timeout on the flag as the ISR will always
+            # fire, but this gives a workaround for possible race conditions or dropped interrupts.
+            try:
+                await asyncio.wait_for_ms(self._flags[idx].wait(), timeout_ms)
+            except asyncio.TimeoutError:
+                pass
+        else:
+            await asyncio.sleep_ms(timeout_ms)
+
+        if _DEBUG:
+            print(f"wait complete")
+
+    def _callback(self, _):
+        # IRQ callback from BaseModem._radio_isr. Hard IRQ context unless _DEBUG
+        # is on.
+        #
+        # Set both RX & TX flag. This isn't necessary for "real" interrupts, but may be necessary
+        # to wake both for the case of a "soft" interrupt triggered by sleep() or standby(), where
+        # both tasks need to unblock and return.
+        #
+        # The poll_recv() method is a no-op if _tx is set, so waking up both
+        # blocked tasks doesn't have much overhead (no second polling of modem
+        # IRQ flags, for example).
+        for f in self._flags:
+            f.set()
+
+
+class AsyncContinuousReceiver:
+    # Stop-gap async iterator implementation until PEP525 support comes in, see
+    # longer comment  on AsyncModem.recv_continuous() above.
+    def __init__(self, modem, will_irq, rx_packet):
+        self.modem = modem
+        self.will_irq = will_irq
+        self.rx_packet = rx_packet
+
+    def __aiter__(self):
+        return self
+
+    async def __anext__(self):
+        res = await self.modem._recv(self.will_irq, self.rx_packet)
+        if not res:
+            raise StopAsyncIteration
+        return res
diff --git a/micropython/lora/lora-async/manifest.py b/micropython/lora/lora-async/manifest.py
new file mode 100644
index 000000000..ebd665332
--- /dev/null
+++ b/micropython/lora/lora-async/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+require("lora")
+package("lora")
diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
new file mode 100644
index 000000000..e695f4a4d
--- /dev/null
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -0,0 +1,877 @@
+# MicroPython LoRa SX126x (SX1261, SX1262) driver
+# MIT license; Copyright (c) 2023 Angus Gratton
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+#
+# In comments, abbreviation "DS" = Semtech SX1261/62 Datasheet Rev 2.1 (December 2021)
+import struct
+import time
+from micropython import const
+from machine import Pin
+from .modem import BaseModem, ConfigError, RxPacket, _clamp, _flag
+
+# Set _DEBUG to const(True) to print all SPI commands sent to the device, and all responses,
+# plus a few additional pieces of information.
+_DEBUG = const(False)
+
+_REG_RXGAINCR = const(0x8AC)  # Reset value 0x94
+_REG_LSYNCRH = const(0x740)
+_REG_LSYNCRL = const(0x741)
+
+_CMD_CFG_DIO_IRQ = const(0x08)  # args: IrqMask, Irq1Mask, Irq2Mask,. Irq3Mask
+_CMD_CLR_ERRORS = const(0x07)
+_CMD_CLR_IRQ_STATUS = const(0x02)  # no args
+_CMD_GET_ERROR = const(0x17)
+_CMD_GET_IRQ_STATUS = const(0x12)  # args: (r) Status, IrqStatus
+_CMD_GET_RX_BUFFER_STATUS = const(0x13)  # args: (r) Status, RxPayloadLength, RxBufferPointer
+_CMD_GET_STATUS = const(0xC0)  # args: (r) Status
+_CMD_GET_PACKET_STATUS = const(0x14)
+_CMD_READ_REGISTER = const(0x1D)  # args: addr (2b), status, (r) Data0 ... DataN
+_CMD_READ_BUFFER = const(0x1E)  # args: Offset, (r) Status, Data0 ... DataN
+_CMD_SET_BUFFER_BASE_ADDRESS = const(0x8F)  # args: TxBaseAddr, RxBaseAddr
+_CMD_SET_MODULATION_PARAMS = const(0x8B)  # args (LoRa): Sf, Bw, Cr, Ldro
+_CMD_SET_PACKET_PARAMS = const(
+    0x8C
+)  # args (LoRa): PbLength, HeaderType, PayloadLength, CrcType, InvertIQ
+_CMD_SET_PACKET_TYPE = const(0x8A)  # args: PktType
+_CMD_SET_PA_CONFIG = const(0x95)  # args: PaDutyCycle, HpMax, HpSel, 0x01
+_CMD_SET_RF_FREQUENCY = const(0x86)  # args: RfFreg
+_CMD_SET_RX = const(0x82)  # args: Timeout
+_CMD_SET_SLEEP = const(0x84)  # args: SleepCfg
+_CMD_SET_STANDBY = const(0x80)  # args: StandbyCfg
+_CMD_SET_DIO3_AS_TCXO_CTRL = const(0x97)  # args: Trim, Timeout (3b)
+_CMD_SET_DIO2_AS_RF_SWITCH_CTRL = const(0x9D)
+_CMD_SET_TX = const(0x83)  # args: Timeout
+_CMD_SET_TX_PARAMS = const(0x8E)  # args: Power, RampTime
+_CMD_WRITE_BUFFER = const(0x0E)  # args: Offset, Data0 ... DataN
+_CMD_WRITE_REGISTER = const(0x0D)  # args: Addr, Data0 ... Data N
+
+_CMD_CALIBRATE = const(0x89)
+_CMD_CALIBRATE_IMAGE = const(0x98)
+
+_STATUS_MODE_MASK = const(0x7 << 4)
+_STATUS_MODE_SHIFT = const(4)
+_STATUS_MODE_STANDBY_RC = const(0x2)
+_STATUS_MODE_STANDBY_HSE32 = const(0x3)
+_STATUS_MODE_FS = const(0x4)
+_STATUS_MODE_RX = const(0x5)
+_STATUS_MODE_TX = const(0x6)
+
+_STATUS_CMD_MASK = const(0x6)  # bits 1-3, bit 0 is reserved
+_STATUS_CMD_SHIFT = const(1)
+_STATUS_CMD_DATA_AVAIL = const(0x2)
+_STATUS_CMD_TIMEOUT = const(0x3)
+_STATUS_CMD_ERROR = const(0x4)
+_STATUS_CMD_EXEC_FAIL = const(0x5)
+_STATUS_CMD_TX_COMPLETE = const(0x6)
+
+_CFG_SF_MIN = const(6)  # inclusive
+_CFG_SF_MAX = const(12)  # inclusive
+
+_IRQ_TX_DONE = const(1 << 0)
+_IRQ_RX_DONE = const(1 << 1)
+_IRQ_PREAMBLE_DETECTED = const(1 << 2)
+_IRQ_SYNC_DETECTED = const(1 << 3)
+_IRQ_HEADER_VALID = const(1 << 4)
+_IRQ_HEADER_ERR = const(1 << 5)
+_IRQ_CRC_ERR = const(1 << 6)
+_IRQ_CAD_DONE = const(1 << 7)
+_IRQ_CAD_DETECTED = const(1 << 8)
+_IRQ_TIMEOUT = const(1 << 9)
+
+# Register values
+_REG_IQ_POLARITY_SETUP = const(0x0736)
+_REG_RX_GAIN = const(0x08AC)
+_REG_RTC_CTRL = const(0x0902)  # DS 15.3 has a typo on this value! Confirmed from Semtech driver
+_REG_EVT_CLR = const(0x0944)
+_REG_EVT_CLR_MASK = const(0x02)
+
+# IRQs the driver cares about when receiving
+_IRQ_DRIVER_RX_MASK = const(_IRQ_RX_DONE | _IRQ_TIMEOUT | _IRQ_CRC_ERR | _IRQ_HEADER_ERR)
+
+
+# Except when entering/waking from sleep, typical busy period <105us (ref RM0453 Table 33)
+#
+# However, if dio3_tcxo_start_time_us is set then can take a longer
+# time to become valid, so a field is set on the modem object with the full timeout.
+#
+# In any case, timeouts here are to catch broken/bad hardware or massive driver
+# bugs rather than commonplace issues.
+#
+_CMD_BUSY_TIMEOUT_BASE_US = const(200)
+
+# Datasheet says 3.5ms needed to run a full Calibrate command (all blocks),
+# however testing shows it can be as much as as 18ms.
+_CALIBRATE_TYPICAL_TIME_US = const(3500)
+_CALIBRATE_TIMEOUT_US = const(30000)
+
+# Magic value used by SetRx command to indicate a continuous receive
+_CONTINUOUS_TIMEOUT_VAL = const(0xFFFFFF)
+
+
+class _SX126x(BaseModem):
+    # common IRQ masks used by the base class functions
+    _IRQ_RX_COMPLETE = _IRQ_RX_DONE | _IRQ_TIMEOUT
+    _IRQ_TX_COMPLETE = _IRQ_TX_DONE
+
+    # Common base class for SX1261, SX1262 and (pending) STM32WL55. These are all basically
+    # the same except for which PA ranges are supported
+    #
+    # Don't construct this directly, construct lora.SX1261, lora.SX1262, lora.AsyncSX1261
+    # or lora.AsyncSX1262
+    def __init__(
+        self,
+        spi,
+        cs,
+        busy,
+        dio1,
+        dio2_rf_sw,
+        dio3_tcxo_millivolts,
+        dio3_tcxo_start_time_us,
+        reset,
+        lora_cfg,
+        ant_sw,
+    ):
+        super().__init__(ant_sw)
+
+        self._spi = spi
+        self._cs = cs
+        self._busy = busy
+        self._sleep = True  # assume the radio is in sleep mode to start, will wake on _cmd
+        self._dio1 = dio1
+
+        busy.init(Pin.IN)
+        cs.init(Pin.OUT, value=1)
+        if dio1:
+            dio1.init(Pin.IN)
+
+        self._busy_timeout = _CMD_BUSY_TIMEOUT_BASE_US
+
+        self._buf = bytearray(9)  # shared buffer for commands
+
+        # These settings are kept in the object (as can't read them back from the modem)
+        self._output_power = 14
+        self._bw = 125
+        assert self._bw_hz == 125000  # This field is set in base class, must match self._bw
+
+        # RampTime register value
+        # 0x02 is 40us, default value appears undocumented but this is the SX1276 default
+        self._ramp_val = 0x02
+
+        if reset:
+            # If the caller supplies a reset pin argument, reset the radio
+            reset.init(Pin.OUT, value=0)
+            time.sleep_ms(1)
+            reset(1)
+            time.sleep_ms(5)
+        else:
+            self.standby()  # Otherwise, at least put the radio to a known state
+
+        status = self._get_status()
+        if (status[0] != _STATUS_MODE_STANDBY_RC and status[0] != _STATUS_MODE_STANDBY_HSE32) or (
+            status[1] > 1
+        ):
+            # This check exists to determine that the SPI settings and modem
+            # selection are correct. Otherwise it's possible for the driver to
+            # run for quite some time before it detects an invalid response.
+            raise RuntimeError("Invalid initial status {}.".format(status))
+
+        if dio2_rf_sw:
+            self._cmd("BB", _CMD_SET_DIO2_AS_RF_SWITCH_CTRL, 1)
+
+        if dio3_tcxo_millivolts:
+            # Enable TCXO power via DIO3, if enabled
+            #
+            # timeout register is set in units of 15.625us each, use integer math
+            # to calculate and round up:
+            self._busy_timeout = (_CMD_BUSY_TIMEOUT_BASE_US + dio3_tcxo_start_time_us) * 2
+            timeout = (dio3_tcxo_start_time_us * 1000 + 15624) // 15625
+            if timeout < 0 or timeout > 1 << 24:
+                raise ValueError("{} out of range".format("dio3_tcxo_start_time_us"))
+            if dio3_tcxo_millivolts < 1600 or dio3_tcxo_millivolts > 3300:
+                raise ValueError("{} out of range".format("dio3_tcxo_millivolts"))
+            dv = dio3_tcxo_millivolts // 100  # 16 to 33
+            tcxo_trim_lookup = (
+                16,
+                17,
+                18,
+                22,
+                24,
+                27,
+                30,
+                33,
+            )  # DS Table 13-35
+            while dv not in tcxo_trim_lookup:
+                dv -= 1
+            reg_tcxo_trim = tcxo_trim_lookup.index(dv)
+
+            self._cmd(">BI", _CMD_SET_DIO3_AS_TCXO_CTRL, (reg_tcxo_trim << 24) + timeout)
+            time.sleep_ms(15)
+            # As per DS 13.3.6 SetDIO3AsTCXOCtrl, should expect error
+            # value 0x20 "XOSC_START_ERR" to be flagged as XOSC has only just
+            # started now. So clear it.
+            self._clear_errors()
+
+            self._check_error()
+
+        # If DIO1 is set, mask in just the IRQs that the driver may need to be
+        # interrupted by. This is important because otherwise an unrelated IRQ
+        # can trigger the ISR and may not be reset by the driver, leaving DIO1 high.
+        #
+        # If DIO1 is not set, all IRQs can stay masked which is the power-on state.
+        if dio1:
+            # Note: we set both Irq mask and DIO1 mask to the same value, which is redundant
+            # (one could be 0xFFFF) but may save a few bytes of bytecode.
+            self._cmd(
+                ">BHHHH",
+                _CMD_CFG_DIO_IRQ,
+                (_IRQ_RX_DONE | _IRQ_TX_DONE | _IRQ_TIMEOUT),  # IRQ mask
+                (_IRQ_RX_DONE | _IRQ_TX_DONE | _IRQ_TIMEOUT),  # DIO1 mask
+                0x0,  # DIO2Mask, not used
+                0x0,  # DIO3Mask, not used
+            )
+            dio1.irq(self._radio_isr, trigger=Pin.IRQ_RISING)
+
+        self._clear_irq()
+
+        self._cmd("BB", _CMD_SET_PACKET_TYPE, 1)  # LoRa
+
+        if lora_cfg:
+            self.configure(lora_cfg)
+
+    def sleep(self, warm_start=True):
+        # Put the modem into sleep mode. Driver will wake the modem automatically the next
+        # time an operation starts, or call standby() to wake it manually.
+        #
+        # If the warm_start parameter is False (non-default) then the modem will
+        # lose all settings on wake. The only way to use this parameter value is
+        # to destroy this modem object after calling it, and then instantiate a new
+        # modem object on wake.
+        #
+        self._check_error()  # check errors before going to sleep because we clear on wake
+        self.standby()  # save some code size, this clears the driver's rx/tx state
+        self._cmd("BB", _CMD_SET_SLEEP, _flag(1 << 2, warm_start))
+        self._sleep = True
+
+    def _standby(self):
+        # Send the command for standby mode.
+        #
+        # **Don't call this function directly, call standby() instead.**
+        #
+        # (This private version doesn't update the driver's internal state.)
+        self._cmd("BB", _CMD_SET_STANDBY, 1)  # STDBY_XOSC mode
+        self._clear_irq()  # clear IRQs in case we just cancelled a send or receive
+
+    def is_idle(self):
+        # Returns True if the modem is idle (either in standby or in sleep).
+        #
+        # Note this function can return True in the case where the modem has temporarily gone to
+        # standby but there's a receive configured in software that will resume receiving the next
+        # time poll_recv() or poll_send() is called.
+        if self._sleep:
+            return True  # getting status wakes from sleep
+        mode, _ = self._get_status()
+        return mode in (_STATUS_MODE_STANDBY_HSE32, _STATUS_MODE_STANDBY_RC)
+
+    def _wakeup(self):
+        # Wake the modem from sleep. This is called automatically the first
+        # time a modem command is sent after sleep() was called to put the modem to
+        # sleep.
+        #
+        # To manually wake the modem without initiating a new operation, call standby().
+        self._cs(0)
+        time.sleep_us(20)
+        self._cs(1)
+        self._sleep = False
+        self._clear_errors()  # Clear "XOSC failed to start" which will reappear at this time
+        self._check_error()  # raise an exception if any other error appears
+
+    def _decode_status(self, raw_status, check_errors=True):
+        # split the raw status, which often has reserved bits set, into the mode value
+        # and the command status value
+        mode = (raw_status & _STATUS_MODE_MASK) >> _STATUS_MODE_SHIFT
+        cmd = (raw_status & _STATUS_CMD_MASK) >> _STATUS_CMD_SHIFT
+        if check_errors and cmd in (_STATUS_CMD_EXEC_FAIL, _STATUS_CMD_ERROR):
+            raise RuntimeError("Status {},{} indicates command error".format(mode, cmd))
+        return (mode, cmd)
+
+    def _get_status(self):
+        # Issue the GetStatus command and return the decoded status of (mode value, command status)
+        res = self._cmd("B", _CMD_GET_STATUS, n_read=1)[0]
+        return self._decode_status(res)
+
+    def _check_error(self):
+        # Raise a RuntimeError if the radio has reported an error state.
+        #
+        # Return the decoded status, otherwise.
+        res = self._cmd("B", _CMD_GET_ERROR, n_read=3)
+        status = self._decode_status(res[0], False)
+        op_error = (res[1] << 8) + res[2]
+        if op_error != 0:
+            raise RuntimeError("Internal radio Status {} OpError {:#x}".format(status, op_error))
+        self._decode_status(res[0])  # raise an exception here if status shows an error
+        return status
+
+    def _clear_errors(self):
+        # Clear any errors flagged in the modem
+        self._cmd(">BH", _CMD_CLR_ERRORS, 0)
+
+    def _clear_irq(self, clear_bits=0xFFFF):
+        # Clear IRQs flagged in the modem
+        #
+        # By default, clears all IRQ bits. Otherwise, argument is the mask of bits to clear.
+        self._cmd(">BH", _CMD_CLR_IRQ_STATUS, clear_bits)
+        self._last_irq = None
+
+    def _set_tx_ant(self, tx_ant):
+        # Only STM32WL55 allows switching tx_ant from LP to HP
+        raise ConfigError("tx_ant")
+
+    def _symbol_offsets(self):
+        # Called from BaseModem.get_time_on_air_us().
+        #
+        # This function provides a way to implement the different SF5 and SF6 in SX126x,
+        # by returning two offsets: one for the overall number of symbols, and one for the
+        # number of bits used to calculate the symbol length of the payload.
+        return (2, -8) if self._sf in (5, 6) else (0, 0)
+
+    def configure(self, lora_cfg):
+        if self._rx is not False:
+            raise RuntimeError("Receiving")
+
+        if "preamble_len" in lora_cfg:
+            self._preamble_len = lora_cfg["preamble_len"]
+
+        self._invert_iq = (
+            lora_cfg.get("invert_iq_rx", self._invert_iq[0]),
+            lora_cfg.get("invert_iq_tx", self._invert_iq[1]),
+            self._invert_iq[2],
+        )
+
+        if "freq_khz" in lora_cfg:
+            self._rf_freq_hz = int(lora_cfg["freq_khz"] * 1000)
+            rffreq = (
+                self._rf_freq_hz << 25
+            ) // 32_000_000  # RF-PLL frequency = 32e^6 * RFFreq / 2^25
+            if not rffreq:
+                raise ConfigError("freq_khz")  # set to a value too low
+            self._cmd(">BI", _CMD_SET_RF_FREQUENCY, rffreq)
+
+        if "syncword" in lora_cfg:
+            syncword = lora_cfg["syncword"]
+            if syncword < 0x100:
+                # "Translation from SX127x to SX126x : 0xYZ -> 0xY4Z4 :
+                # if you do not set the two 4 you might lose sensitivity"
+                # see
+                # https://www.thethingsnetwork.org/forum/t/should-private-lorawan-networks-use-a-different-sync-word/34496/15
+                syncword = 0x0404 + ((syncword & 0x0F) << 4) + ((syncword & 0xF0) << 8)
+            self._cmd(">BBH", _CMD_WRITE_REGISTER, _REG_LSYNCRH, syncword)
+
+        if "output_power" in lora_cfg:
+            pa_config_args, self._output_power = self._get_pa_tx_params(lora_cfg["output_power"])
+            self._cmd("BBBBB", _CMD_SET_PA_CONFIG, *pa_config_args)
+
+        if "pa_ramp_us" in lora_cfg:
+            self._ramp_val = self._get_pa_ramp_val(
+                lora_cfg, [10, 20, 40, 80, 200, 800, 1700, 3400]
+            )
+
+        if "output_power" in lora_cfg or "pa_ramp_us" in lora_cfg:
+            # Only send the SetTxParams command if power level or PA ramp time have changed
+            self._cmd("BBB", _CMD_SET_TX_PARAMS, self._output_power, self._ramp_val)
+
+        if any(key in lora_cfg for key in ("sf", "bw", "coding_rate")):
+            if "sf" in lora_cfg:
+                self._sf = lora_cfg["sf"]
+                if self._sf < _CFG_SF_MIN or self._sf > _CFG_SF_MAX:
+                    raise ConfigError("sf")
+
+            if "bw" in lora_cfg:
+                self._bw = lora_cfg["bw"]
+
+            if "coding_rate" in lora_cfg:
+                self._coding_rate = lora_cfg["coding_rate"]
+                if self._coding_rate < 4 or self._coding_rate > 8:  # 4/4 through 4/8, linearly
+                    raise ConfigError("coding_rate")
+
+            bw_val, self._bw_hz = {
+                "7.8": (0x00, 7800),
+                "10.4": (0x08, 10400),
+                "15.6": (0x01, 15600),
+                "20.8": (0x09, 20800),
+                "31.25": (0x02, 31250),
+                "41.7": (0x0A, 41700),
+                "62.5": (0x03, 62500),
+                "125": (0x04, 125000),
+                "250": (0x05, 250000),
+                "500": (0x06, 500000),
+            }[str(self._bw)]
+
+            self._cmd(
+                "BBBBB",
+                _CMD_SET_MODULATION_PARAMS,
+                self._sf,
+                bw_val,
+                self._coding_rate - 4,  # 4/4=0, 4/5=1, etc
+                self._get_ldr_en(),  # Note: BaseModem.get_n_symbols_x4() depends on this logic
+            )
+
+        if "rx_boost" in lora_cfg:
+            # See DS Table 9-3 "Rx Gain Configuration"
+            self._reg_write(_REG_RX_GAIN, 0x96 if lora_cfg["rx_boost"] else 0x94)
+
+        self._check_error()
+
+    def _invert_workaround(self, enable):
+        # Apply workaround for DS 15.4 Optimizing the Inverted IQ Operation
+        if self._invert_iq[2] != enable:
+            val = self._read_read(_REG_IQ_POLARITY_SETUP)
+            val = (val & ~4) | _flag(4, enable)
+            self._reg_write(_REG_IQ_POLARITY_SETUP, val)
+            self._invert_iq[2] = enable
+
+    def _get_irq(self):
+        # Get currently set IRQ bits.
+        irq_status = self._cmd("B", _CMD_GET_IRQ_STATUS, n_read=3)
+        status = self._decode_status(irq_status[0])
+        flags = (irq_status[1] << 8) + irq_status[2]
+        if _DEBUG:
+            print("Status {} flags {:#x}".format(status, flags))
+        return flags
+
+    def calibrate(self):
+        # Send the Calibrate command to the radio to calibrate RC oscillators, PLL and ADC.
+        #
+        # See DS 13.1.12 Calibrate Function
+
+        # calibParam 0xFE means to calibrate all blocks.
+        self._cmd("<BB", _CMD_CALIBRATE, 0xFE)
+
+        time.sleep_us(_CALIBRATE_TYPICAL_TIME_US)
+
+        # a falling edge of BUSY indicates calibration is done
+        self._wait_not_busy(_CALIBRATE_TIMEOUT_US)
+
+    def calibrate_image(self):
+        # Send the CalibrateImage command to the modem to improve reception in
+        # the currently configured frequency band.
+        #
+        # See DS 9.2.1 Image Calibration for Specified Frequency Bands
+        # and 13.1.13 CalibrateImage
+
+        mhz = self._rf_freq_hz // 1_000_000
+        if 430 <= mhz <= 440:
+            args = 0x6B6F
+        elif 470 <= mhz <= 510:
+            args = 0x7581
+        elif 779 <= mhz <= 787:
+            args = 0xC1C5
+        elif 863 <= mhz <= 870:
+            args = 0xD7DB
+        elif 902 <= mhz <= 928:
+            args = 0xE1E9
+        else:
+            # DS says "Contact your Semtech representative for the other optimal
+            # calibration settings outside of the given frequency bands"
+            raise ValueError()
+
+        self._cmd(">BH", _CMD_CALIBRATE_IMAGE, args)
+
+        # Can't find anythign in Datasheet about how long image calibration
+        # takes or exactly how it signals completion. Assuming it will be
+        # similar to _CMD_CALIBRATE.
+        self._wait_not_busy(_CALIBRATE_TIMEOUT_US)
+
+    def start_recv(self, timeout_ms=None, continuous=False, rx_length=0xFF):
+        # Start receiving.
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        super().start_recv(timeout_ms, continuous, rx_length)  # sets _rx
+
+        if self._tx:
+            # Send is in progress and has priority, _check_recv() will start recv
+            # once send finishes (caller needs to call poll_send() for this to happen.)
+            if _DEBUG:
+                print("Delaying receive until send completes")
+            return self._dio1
+
+        # Put the modem in a known state. It's possible a different
+        # receive was in progress, this prevent anything changing while
+        # we set up the new receive
+        self._standby()  # calling private version to keep driver state as-is
+
+        # Allocate the full FIFO for RX
+        self._cmd("BBB", _CMD_SET_BUFFER_BASE_ADDRESS, 0xFF, 0x0)
+
+        self._cmd(
+            ">BHBBBB",
+            _CMD_SET_PACKET_PARAMS,
+            self._preamble_len,
+            self._implicit_header,
+            rx_length,  # PayloadLength, only used in implicit header mode
+            self._crc_en,  # CRCType, only used in implicit header mode
+            self._invert_iq[0],  # InvertIQ
+        )
+        self._invert_workaround(self._invert_iq[0])
+
+        if continuous:
+            timeout = _CONTINUOUS_TIMEOUT_VAL
+        elif timeout_ms is not None:
+            timeout = max(1, timeout_ms * 64)  # units of 15.625us
+        else:
+            timeout = 0  # Single receive mode, no timeout
+
+        self._cmd(">BBH", _CMD_SET_RX, timeout >> 16, timeout)
+
+        return self._dio1
+
+    def poll_recv(self, rx_packet=None):
+        old_rx = self._rx
+        rx = super().poll_recv(rx_packet)
+
+        if rx is not True and old_rx is not False and isinstance(old_rx, int):
+            # Receiving has just stopped, and a timeout was previously set.
+            #
+            # Workaround for errata DS 15.3 "Implicit Header Mode Timeout Behaviour",
+            # which recommends to add the following after "ANY Rx with Timeout active sequence"
+            self._reg_write(_REG_RTC_CTRL, 0x00)
+            self._reg_write(_REG_EVT_CLR, self._reg_read(_REG_EVT_CLR) | _REG_EVT_CLR_MASK)
+
+        return rx
+
+    def _rx_flags_success(self, flags):
+        # Returns True if IRQ flags indicate successful receive.
+        # Specifically, from the bits in _IRQ_DRIVER_RX_MASK:
+        # - _IRQ_RX_DONE must be set
+        # - _IRQ_TIMEOUT must not be set
+        # - _IRQ_CRC_ERR must not be set
+        # - _IRQ_HEADER_ERR must not be set
+        #
+        # (Note: this is a function because the result for SX1276 depends on
+        # current config, but the result is constant here.)
+        return flags & _IRQ_DRIVER_RX_MASK == _IRQ_RX_DONE
+
+    def _read_packet(self, rx_packet, flags):
+        # Private function to read received packet (RxPacket object) from the
+        # modem, if there is one.
+        #
+        # Called from poll_recv() function, which has already checked the IRQ flags
+        # and verified a valid receive happened.
+
+        ticks_ms = self._get_last_irq()
+
+        res = self._cmd("B", _CMD_GET_RX_BUFFER_STATUS, n_read=3)
+        rx_payload_len = res[1]
+        rx_buffer_ptr = res[2]  # should be 0
+
+        if rx_packet is None or len(rx_packet) != rx_payload_len:
+            rx_packet = RxPacket(rx_payload_len)
+
+        self._cmd("BB", _CMD_READ_BUFFER, rx_buffer_ptr, n_read=1, read_buf=rx_packet)
+
+        pkt_status = self._cmd("B", _CMD_GET_PACKET_STATUS, n_read=4)
+
+        rx_packet.ticks_ms = ticks_ms
+        rx_packet.snr = pkt_status[2]  # SNR, units: dB *4
+        rx_packet.rssi = 0 - pkt_status[1] // 2  # RSSI, units: dBm
+        rx_packet.crc_error = (flags & _IRQ_CRC_ERR) != 0
+
+        return rx_packet
+
+    def prepare_send(self, packet):
+        # Prepare modem to start sending. Should be followed by a call to start_send()
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        if len(packet) > 255:
+            raise ConfigError("packet too long")
+
+        # Put the modem in a known state. Any current receive is suspended at this point,
+        # but calling _check_recv() will resume it later.
+        self._standby()  # calling private version to keep driver state as-is
+
+        self._check_error()
+
+        # Set the board antenna for correct TX mode
+        if self._ant_sw:
+            self._ant_sw.tx(self._tx_hp())
+
+        self._last_irq = None
+
+        self._cmd(
+            ">BHBBBB",
+            _CMD_SET_PACKET_PARAMS,
+            self._preamble_len,
+            self._implicit_header,
+            len(packet),
+            self._crc_en,
+            self._invert_iq[1],  # _invert_iq_tx
+        )
+        self._invert_workaround(self._invert_iq[1])
+
+        # Allocate the full FIFO for TX
+        self._cmd("BBB", _CMD_SET_BUFFER_BASE_ADDRESS, 0x0, 0xFF)
+        self._cmd("BB", _CMD_WRITE_BUFFER, 0x0, write_buf=packet)
+
+        # Workaround for DS 15.1 Modulation Quality with 500 kHZ LoRa Bandwidth
+        # ... apparently this needs to be done "*before each packet transmission*"
+        if self._bw_hz == 500_000:
+            self._reg_write(0x0889, self._reg_read(0x0889) & 0xFB)
+        else:
+            self._reg_write(0x0889, self._reg_read(0x0889) | 0x04)
+
+    def start_send(self):
+        # Actually start a send that was loaded by calling prepare_send().
+        #
+        # This is split into a separate function to allow more precise timing.
+        #
+        # The driver doesn't verify the caller has done the right thing here, the
+        # modem will no doubt do something weird if prepare_send() was not called!
+        #
+        # Part of common low-level modem API, see README.md for usage.
+
+        # Currently we don't pass any TX timeout argument to the modem1,
+        # which the datasheet ominously offers as "security" for the Host MCU if
+        # the send doesn't start for some reason.
+
+        self._cmd("BBBB", _CMD_SET_TX, 0x0, 0x0, 0x0)
+
+        if _DEBUG:
+            print("status {}".format(self._get_status()))
+        self._check_error()
+
+        self._tx = True
+
+        return self._dio1
+
+    def _wait_not_busy(self, timeout_us):
+        # Wait until the radio de-asserts the busy line
+        start = time.ticks_us()
+        ticks_diff = 0
+        while self._busy():
+            ticks_diff = time.ticks_diff(time.ticks_us(), start)
+            if ticks_diff > timeout_us:
+                raise RuntimeError("BUSY timeout")
+            time.sleep_us(1)
+        if _DEBUG and ticks_diff > 105:
+            # By default, debug log any busy time that takes longer than the
+            # datasheet-promised Typical 105us (this happens when starting the 32MHz oscillator,
+            # if it's turned on and off by the modem, and maybe other times.)
+            print(f"BUSY {ticks_diff}us")
+
+    def _cmd(self, fmt, *write_args, n_read=0, write_buf=None, read_buf=None):
+        # Execute an SX1262 command
+        # fmt - Format string suitable for use with struct.pack. First item should be 'B' and
+        # corresponds to the command opcode.
+        # write_args - Arguments suitable for struct.pack using fmt. First argument should be a
+        # command opcode byte.
+        #
+        # Optional arguments:
+        # write_buf - Extra buffer to write from (for FIFO writes). Mutually exclusive with n_read
+        # or read_buf.
+        # n_read - Number of result bytes to read back at end
+        # read_buf - Extra buffer to read into (for FIFO reads)
+        #
+        # Returns None if n_read==0, otherwise a memoryview of length n_read which points into a
+        # shared buffer (buffer will be clobbered on next call to _cmd!)
+        if self._sleep:
+            self._wakeup()
+
+        # Ensure "busy" from previously issued command has de-asserted. Usually this will
+        # have happened well before _cmd() is called again.
+        self._wait_not_busy(self._busy_timeout)
+
+        # Pack write_args into _buf and wrap a memoryview of the correct length around it
+        wrlen = struct.calcsize(fmt)
+        assert n_read + wrlen <= len(self._buf)  # if this fails, make _buf bigger!
+        struct.pack_into(fmt, self._buf, 0, *write_args)
+        buf = memoryview(self._buf)[: (wrlen + n_read)]
+
+        if _DEBUG:
+            print(">>> {}".format(buf[:wrlen].hex()))
+            if write_buf:
+                print(">>> {}".format(write_buf.hex()))
+        self._cs(0)
+        self._spi.write_readinto(buf, buf)
+        if write_buf:
+            self._spi.write(write_buf)  # Used by _CMD_WRITE_BUFFER only
+        if read_buf:
+            self._spi.readinto(read_buf, 0xFF)  # Used by _CMD_READ_BUFFER only
+        self._cs(1)
+
+        if n_read > 0:
+            res = memoryview(buf)[wrlen : (wrlen + n_read)]  # noqa: E203
+            if _DEBUG:
+                print("<<< {}".format(res.hex()))
+            return res
+
+    def _reg_read(self, addr):
+        return self._cmd("BBBB", _CMD_READ_REGISTER, addr >> 8, addr & 0xFF, n_read=1)[0]
+
+    def _reg_write(self, addr, val):
+        return self._cmd("BBBB", _CMD_WRITE_REGISTER, addr >> 8, addr & 0xFF, val & 0xFF)
+
+
+class _SX1262(_SX126x):
+    # Don't construct this directly, construct lora.SX1262 or lora.AsyncSX1262
+    def __init__(
+        self,
+        spi,
+        cs,
+        busy,
+        dio1=None,
+        dio2_rf_sw=True,
+        dio3_tcxo_millivolts=None,
+        dio3_tcxo_start_time_us=1000,
+        reset=None,
+        lora_cfg=None,
+        ant_sw=None,
+    ):
+        super().__init__(
+            spi,
+            cs,
+            busy,
+            dio1,
+            dio2_rf_sw,
+            dio3_tcxo_millivolts,
+            dio3_tcxo_start_time_us,
+            reset,
+            lora_cfg,
+            ant_sw,
+        )
+
+        # Apply workaround for DS 15.2 "Better Resistance of the SX1262 Tx to Antenna Mismatch
+        self._reg_write(0x8D8, self._reg_read(0x8D8) | 0x1E)
+
+    def _tx_hp(self):
+        # SX1262 has High Power only (deviceSel==0)
+        return True
+
+    def _get_pa_tx_params(self, output_power):
+        # Given an output power level in dB, return a 2-tuple:
+        # - First item is the 3 arguments for SetPaConfig command
+        # - Second item is the power level argument value for SetTxParams command.
+        #
+        # DS 13.1.14.1 "PA Optimal Settings" gives optimally efficient
+        # values for output power +22, +20, +17, +14 dBm and "these changes make
+        # the use of nominal power either sub-optimal or unachievable" (hence it
+        # recommends setting +22dBm nominal TX Power for all these).
+        #
+        # However the modem supports output power as low as -9dBm, and there's
+        # no explanation in the datasheet of how to best set other output power
+        # levels.
+        #
+        # Semtech's own driver (sx126x.c in LoRaMac-node) only ever executes
+        # SetPaConfig with the values shown in the datasheet for +22dBm, and
+        # then executes SetTxParams with power set to the nominal value in
+        # dBm.
+        #
+        # Try for best of both worlds here: If the caller requests an "Optimal"
+        # value, use the datasheet values. Otherwise set nominal power only as
+        # per Semtech's driver.
+        output_power = int(_clamp(output_power, -9, 22))
+
+        DEFAULT = (0x4, 0x7, 0x0, 0x1)
+        OPTIMAL = {
+            22: (DEFAULT, 22),
+            20: ((0x3, 0x5, 0x0, 0x1), 22),
+            17: ((0x2, 0x3, 0x0, 0x1), 22),
+            14: ((0x2, 0x2, 0x0, 0x1), 22),
+        }
+        if output_power in OPTIMAL:
+            # Datasheet optimal values
+            return OPTIMAL[output_power]
+        else:
+            # Nominal values, as per Semtech driver
+            return (DEFAULT, output_power & 0xFF)
+
+
+class _SX1261(_SX126x):
+    # Don't construct this directly, construct lora.SX1261, or lora.AsyncSX1261
+    def __init__(
+        self,
+        spi,
+        cs,
+        busy,
+        dio1=None,
+        dio2_rf_sw=True,
+        dio3_tcxo_millivolts=None,
+        dio3_tcxo_start_time_us=1000,
+        reset=None,
+        lora_cfg=None,
+        ant_sw=None,
+    ):
+        super().__init__(
+            spi,
+            cs,
+            busy,
+            dio1,
+            dio2_rf_sw,
+            dio3_tcxo_millivolts,
+            dio3_tcxo_start_time_us,
+            reset,
+            lora_cfg,
+            ant_sw,
+        )
+
+    def _tx_hp(self):
+        # SX1261 has Low Power only (deviceSel==1)
+        return False
+
+    def _get_pa_tx_params(self, output_power):
+        # Given an output power level in dB, return a 2-tuple:
+        # - First item is the 3 arguments for SetPaConfig command
+        # - Second item is the power level argument value for SetTxParams command.
+        #
+        # As noted above for SX1262, DS 13.1.14.1 "PA Optimal Settings"
+        # gives optimally efficient values for output power +15, +14, +10 dBm
+        # but nothing specific to the other power levels (down to -17dBm).
+        #
+        # Therefore do the same as for SX1262 to set optimal values if known, nominal otherwise.
+        output_power = _clamp(int(output_power), -17, 15)
+
+        DEFAULT = (0x4, 0x0, 0x1, 0x1)
+        OPTIMAL = {
+            15: ((0x06, 0x0, 0x1, 0x1), 14),
+            14: (DEFAULT, 14),
+            10: ((0x1, 0x0, 0x1, 0x1), 13),
+        }
+
+        if output_power == 15 and self._rf_freq_hz < 400_000_000:
+            # DS 13.1.14.1 has Note that PaDutyCycle is limited to 0x4 below 400MHz,
+            # so disallow the 15dBm optimal setting.
+            output_power = 14
+
+        if output_power in OPTIMAL:
+            # Datasheet optimal values
+            return OPTIMAL[output_power]
+        else:
+            # Nominal values, as per Semtech driver
+            return (DEFAULT, output_power & 0xFF)
+
+
+# Define the actual modem classes that use the SyncModem & AsyncModem "mixin-like" classes
+# to create sync and async variants.
+
+try:
+    from .sync_modem import SyncModem
+
+    class SX1261(_SX1261, SyncModem):
+        pass
+
+    class SX1262(_SX1262, SyncModem):
+        pass
+
+except ImportError:
+    pass
+
+try:
+    from .async_modem import AsyncModem
+
+    class AsyncSX1261(_SX1261, AsyncModem):
+        pass
+
+    class AsyncSX1262(_SX1262, AsyncModem):
+        pass
+
+except ImportError:
+    pass
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
new file mode 100644
index 000000000..ebd665332
--- /dev/null
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+require("lora")
+package("lora")
diff --git a/micropython/lora/lora-sx127x/lora/sx127x.py b/micropython/lora/lora-sx127x/lora/sx127x.py
new file mode 100644
index 000000000..3f94aaf0c
--- /dev/null
+++ b/micropython/lora/lora-sx127x/lora/sx127x.py
@@ -0,0 +1,886 @@
+# MicroPython LoRa SX127x driver
+# MIT license; Copyright (c) 2023 Angus Gratton
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+#
+# In comments, abbreviation "DS" = Semtech SX1276/77/78/79 Datasheet rev 7 (May 2020)
+from micropython import const
+from .modem import BaseModem, ConfigError, RxPacket, _clamp, _flag
+from machine import Pin
+import struct
+import time
+
+# Set _DEBUG to const(True) to print all register reads and writes, and current register values
+# even when an update isn't needed. Plus a few additional pieces of information.
+_DEBUG = const(False)
+
+_WRITE_REG_BIT = const(1 << 7)
+
+# Registers and fields as bytecode-zerocost constants
+#
+# Where possible names are direct from DS section 4.4
+# (This means some names are slightly inconsistent, as per datasheet...)
+
+_REG_FIFO = const(0x00)
+
+_REG_OPMODE = const(0x01)
+
+_OPMODE_LONGRANGEMODE_LORA = const(1 << 7)
+_OPMODE_LONGRANGEMODE_FSK_OOK = const(0)
+_OPMODE_MODE_MASK = const(0x7)
+_OPMODE_MODE_SLEEP = const(0x0)
+_OPMODE_MODE_STDBY = const(0x1)
+_OPMODE_MODE_FSTX = const(0x2)  # Frequency synthesis (TX)
+_OPMODE_MODE_TX = const(0x3)
+_OPMODE_MODE_FSRX = const(0x4)  # Frequency synthesis (RX)
+_OPMODE_MODE_RX_CONTINUOUS = const(0x5)
+_OPMODE_MODE_RX_SINGLE = const(0x6)
+_OPMODE_MODE_CAD = const(0x7)  # Channel Activity Detection
+
+_REG_FR_MSB = const(0x06)
+_REG_FR_MID = const(0x07)
+_REG_FR_LSB = const(0x08)
+
+_REG_PA_CONFIG = const(0x09)
+
+_PA_CONFIG_PASELECT_PA_BOOST_PIN = const(1 << 7)
+_PA_CONFIG_PASELECT_RFO_PIN = const(0x0)
+_PA_CONFIG_MAXPOWER_SHIFT = const(0x4)
+_PA_CONFIG_MAXPOWER_MASK = const(0x7)
+_PA_CONFIG_OUTPUTPOWER_SHIFT = const(0)
+_PA_CONFIG_OUTPUTPOWER_MASK = const(0xF)
+
+_REG_PA_RAMP = const(0x0A)
+_PA_RAMP_MASK = const(0x0F)
+
+_REG_LNA = const(0x0C)
+
+_LNA_GAIN_MASK = const(0x7)
+_LNA_GAIN_SHIFT = const(5)
+
+_LNA_BOOST_HF_MASK = 0x3
+_LNA_BOOST_HF_SHIFT = 0x0
+
+_REG_FIFO_ADDR_PTR = const(0x0D)
+_REG_FIFO_TX_BASE_ADDR = const(0x0E)
+_REG_FIFO_RX_BASE_ADDR = const(0x0F)
+_REG_FIFO_RX_CURRENT_ADDR = const(0x10)
+
+_REG_IRQ_FLAGS_MASK = const(0x11)
+_REG_IRQ_FLAGS = const(0x12)
+
+# IRQ mask bits are the same as the IRQ flag bits
+_IRQ_RX_TIMEOUT = const(1 << 7)
+_IRQ_RX_DONE = const(1 << 6)
+_IRQ_PAYLOAD_CRC_ERROR = const(1 << 5)
+_IRQ_VALID_HEADER = const(1 << 4)
+_IRQ_TX_DONE = const(1 << 3)
+_IRQ_CAD_DONE = const(1 << 2)
+_IRQ_FHSS_CHANGE_CHANNEL = const(1 << 1)
+_IRQ_CAD_DETECTED = const(1 << 0)
+
+_REG_RX_NB_BYTES = const(0x13)
+_REG_RX_HEADER_CNT_VALUE_MSB = const(0x14)
+_REG_RX_HEADER_CNT_VALUE_LSB = const(0x13)
+_REG_RX_PACKET_CNT_VALUE_MSB = const(0x16)
+_REG_RX_PACKET_CNT_VALUE_LSB = const(0x17)
+
+_REG_MODEM_STAT = const(0x18)
+_MODEM_STAT_RX_CODING_RATE_MASK = const(0xE)
+_MODEM_STAT_RX_CODING_RATE_SHIFT = const(5)
+_MODEM_STAT_MODEM_CLEAR = const(1 << 4)
+_MODEM_STAT_HEADER_INFO_VALID = const(1 << 3)
+_MODEM_STAT_RX_ONGOING = const(1 << 2)
+_MODEM_STAT_SIGNAL_SYNC = const(1 << 1)  # Signal synchronized
+_MODEM_STAT_SIGNAL_DET = const(1 << 0)  # Signal detected
+
+_REG_PKT_SNR_VAL = const(0x19)
+_REG_PKT_RSSI_VAL = const(0x1A)
+_REG_RSSI_VAL = const(0x1B)
+
+_REG_HOP_CHANNEL = const(0x1C)
+_HOP_CHANNEL_PLL_TIMEOUT = const(1 << 7)
+_HOP_CHANNEL_CRC_ON_PAYLOAD = const(1 << 6)
+_HOP_CHANNEL_FHSS_PRESENT_CHANNEL_MASK = const(0x1F)
+
+_REG_MODEM_CONFIG1 = const(0x1D)
+_MODEM_CONFIG1_BW_MASK = const(0xF)
+_MODEM_CONFIG1_BW_SHIFT = const(4)
+_MODEM_CONFIG1_BW7_8 = const(0x0)
+_MODEM_CONFIG1_BW10_4 = const(0x1)
+_MODEM_CONFIG1_BW15_6 = const(0x2)
+_MODEM_CONFIG1_BW20_8 = const(0x3)
+_MODEM_CONFIG1_BW31_25 = const(0x4)
+_MODEM_CONFIG1_BW41_7 = const(0x5)
+_MODEM_CONFIG1_BW62_5 = const(0x6)
+_MODEM_CONFIG1_BW125 = const(0x7)
+_MODEM_CONFIG1_BW250 = const(0x8)  # not supported in lower band (169MHz)
+_MODEM_CONFIG1_BW500 = const(0x9)  # not supported in lower band (169MHz)
+_MODEM_CONFIG1_CODING_RATE_MASK = const(0x7)
+_MODEM_CONFIG1_CODING_RATE_SHIFT = const(1)
+_MODEM_CONFIG1_CODING_RATE_45 = const(0b001)
+_MODEM_CONFIG1_CODING_RATE_46 = const(0b010)
+_MODEM_CONFIG1_CODING_RATE_47 = const(0b011)
+_MODEM_CONFIG1_CODING_RATE_48 = const(0b100)
+_MODEM_CONFIG1_IMPLICIT_HEADER_MODE_ON = const(1 << 0)
+
+_REG_MODEM_CONFIG2 = const(0x1E)
+_MODEM_CONFIG2_SF_MASK = const(0xF)  # Spreading Factor
+_MODEM_CONFIG2_SF_SHIFT = const(4)
+# SF values are integers 6-12 for SF6-SF12, so skipping constants for these
+_MODEM_CONFIG2_SF_MIN = const(6)  # inclusive
+_MODEM_CONFIG2_SF_MAX = const(12)  # inclusive
+
+_MODEM_CONFIG2_TX_CONTINUOUS = const(1 << 3)
+_MODEM_CONFIG2_RX_PAYLOAD_CRC_ON = const(1 << 2)
+_MODEM_CONFIG2_SYMB_TIMEOUT_MSB_MASK = 0x3
+
+_REG_SYMB_TIMEOUT_LSB = const(0x1F)
+
+_REG_PREAMBLE_LEN_MSB = const(0x20)
+_REG_PREAMBLE_LEN_LSB = const(0x21)
+
+_REG_PAYLOAD_LEN = const(0x22)  # Only for implicit header mode & TX
+_REG_MAX_PAYLOAD_LEN = const(0x23)
+
+_REG_HOP_PERIOD = const(0x24)
+
+_REG_FIFO_TXBYTE_ADDR = const(0x25)
+
+_REG_MODEM_CONFIG3 = const(0x26)
+_MODEM_CONFIG3_AGC_ON = const(1 << 2)
+_MODEM_CONFIG3_LOW_DATA_RATE_OPTIMIZE = const(1 << 3)
+
+_REG_DETECT_OPTIMIZE = const(0x31)
+_DETECT_OPTIMIZE_AUTOMATIC_IF_ON = const(
+    1 << 7
+)  # Bit should be cleared after reset, as per errata
+_DETECT_OPTIMIZE_MASK = 0x7
+_DETECT_OPTIMIZE_SF6 = const(0x05)
+_DETECT_OPTIMIZE_OTHER = const(0x03)
+
+# RegInvertIQ is not correctly documented in DS Rev 7 (May 2020).
+#
+# The correct behaviour for interoperability with other LoRa devices is as
+# written here:
+# https://github.com/eclipse/upm/blob/master/src/sx1276/sx1276.cxx#L1310
+#
+# Same as used in the Semtech mbed driver, here:
+# https://github.com/ARMmbed/mbed-semtech-lora-rf-drivers/blob/master/SX1276/SX1276_LoRaRadio.cpp#L778
+# https://github.com/ARMmbed/mbed-semtech-lora-rf-drivers/blob/master/SX1276/registers/sx1276Regs-LoRa.h#L443
+#
+# Specifically:
+# - The TX bit in _REG_INVERT_IQ is opposite to what's documented in the datasheet
+#   (0x01 normal, 0x00 inverted)
+# - The RX bit in _REG_INVERT_IQ is as documented in the datasheet (0x00 normal, 0x40 inverted)
+# - When enabling LoRa mode, the default register value becomes 0x27 (normal RX & TX)
+#   rather than the documented power-on value of 0x26.
+_REG_INVERT_IQ = const(0x33)
+_INVERT_IQ_RX = const(1 << 6)
+_INVERT_IQ_TX_OFF = const(1 << 0)
+
+_REG_DETECTION_THRESHOLD = const(0x37)
+_DETECTION_THRESHOLD_SF6 = const(0x0C)
+_DETECTION_THRESHOLD_OTHER = const(0x0A)  # SF7 to SF12
+
+_REG_SYNC_WORD = const(0x39)
+
+_REG_FSKOOK_IMAGE_CAL = const(0x3B)  # NOTE: Only accessible in FSK/OOK mode
+_IMAGE_CAL_START = const(1 << 6)
+_IMAGE_CAL_RUNNING = const(1 << 5)
+_IMAGE_CAL_AUTO = const(1 << 7)
+
+_REG_INVERT_IQ2 = const(0x3B)
+_INVERT_IQ2_ON = const(0x19)
+_INVERT_IQ2_OFF = const(0x1D)
+
+_REG_DIO_MAPPING1 = const(0x40)
+_DIO0_MAPPING_MASK = const(0x3)
+_DIO0_MAPPING_SHIFT = const(6)
+_DIO1_MAPPING_MASK = const(0x3)
+_DIO1_MAPPING_SHIFT = const(4)
+_DIO2_MAPPING_MASK = const(0x3)
+_DIO2_MAPPING_SHIFT = const(2)
+_DIO3_MAPPING_MASK = const(0x3)
+_DIO3_MAPPING_SHIFT = const(0)
+
+_REG_DIO_MAPPING2 = const(0x41)
+_DIO4_MAPPING_MASK = const(0x3)
+_DIO4_MAPPING_SHIFT = const(6)
+_DIO5_MAPPING_MASK = const(0x3)
+_DIO5_MAPPING_SHIFT = const(4)
+
+_REG_PA_DAC = const(0x4D)
+_PA_DAC_DEFAULT_VALUE = const(0x84)  # DS 3.4.3 High Power +20 dBm Operation
+_PA_DAC_HIGH_POWER_20DBM = const(0x87)
+
+_REG_VERSION = const(0x42)
+
+# IRQs the driver masks in when receiving
+_IRQ_DRIVER_RX_MASK = const(
+    _IRQ_RX_DONE | _IRQ_RX_TIMEOUT | _IRQ_VALID_HEADER | _IRQ_PAYLOAD_CRC_ERROR
+)
+
+
+class _SX127x(BaseModem):
+    # Don't instantiate this class directly, instantiate either lora.SX1276,
+    #  lora.SX1277, lora.SX1278, lora.SX1279, or lora.AsyncSX1276,
+    #  lora.AsyncSX1277, lora.AsyncSX1278, lora.AsyncSX1279 as applicable.
+
+    # common IRQ masks used by the base class functions
+    _IRQ_RX_COMPLETE = _IRQ_RX_DONE | _IRQ_RX_TIMEOUT
+    _IRQ_TX_COMPLETE = _IRQ_TX_DONE
+
+    def __init__(self, spi, cs, dio0=None, dio1=None, reset=None, lora_cfg=None, ant_sw=None):
+        super().__init__(ant_sw)
+
+        self._buf1 = bytearray(1)  # shared small buffers
+        self._buf2 = bytearray(2)
+        self._spi = spi
+        self._cs = cs
+
+        self._dio0 = dio0
+        self._dio1 = dio1
+
+        cs.init(Pin.OUT, value=1)
+
+        if dio0:
+            dio0.init(Pin.IN)
+            dio0.irq(self._radio_isr, trigger=Pin.IRQ_RISING)
+            if dio1:
+                dio1.init(Pin.IN)
+                dio1.irq(self._radio_isr, trigger=Pin.IRQ_RISING)
+
+        # Configuration settings that need to be tracked by the driver
+        # Note: a number of these are set in the base class constructor
+        self._pa_boost = False
+
+        if reset:
+            # If the user supplies a reset pin argument, reset the radio
+            reset.init(Pin.OUT, value=0)
+            time.sleep_ms(1)
+            reset(1)
+            time.sleep_ms(5)
+
+        version = self._reg_read(_REG_VERSION)
+        if version != 0x12:
+            raise RuntimeError("Unexpected silicon version {}".format(version))
+
+        # wake the radio and enable LoRa mode if it's not already set
+        self._set_mode(_OPMODE_MODE_STDBY)
+
+        if lora_cfg:
+            self.configure(lora_cfg)
+
+    def configure(self, lora_cfg):
+        if self._rx is not False:
+            raise RuntimeError("Receiving")
+
+        # Set frequency
+        if "freq_khz" in lora_cfg:
+            # Assuming F(XOSC)=32MHz (datasheet both implies this value can be different, and
+            # specifies it shouldn't be different!)
+            self._rf_freq_hz = int(lora_cfg["freq_khz"] * 1000)
+            fr_val = self._rf_freq_hz * 16384 // 1000_000
+            buf = bytes([fr_val >> 16, (fr_val >> 8) & 0xFF, fr_val & 0xFF])
+            self._reg_write(_REG_FR_MSB, buf)
+
+        # Turn on/off automatic image re-calibration if temperature changes. May lead to dropped
+        # packets if enabled.
+        if "auto_image_cal" in lora_cfg:
+            self._set_mode(_OPMODE_MODE_STDBY, False)  # Disable LoRa mode to access FSK/OOK
+            self._reg_update(
+                _REG_FSKOOK_IMAGE_CAL,
+                _IMAGE_CAL_AUTO,
+                _flag(_IMAGE_CAL_AUTO, lora_cfg["auto_image_cal"]),
+            )
+            self._set_mode(_OPMODE_MODE_STDBY)  # Switch back to LoRa mode
+
+        # Note: Common pattern below is to generate a new register value and an update_mask,
+        # and then call self._reg_update(). self._reg_update() is a
+        # no-op if update_mask==0 (no bits to change).
+
+        # Update _REG_PA_CONFIG
+        pa_config = 0x0
+        update_mask = 0x0
+
+        # Ref DS 3.4.2 "RF Power Amplifiers"
+        if "tx_ant" in lora_cfg:
+            self._pa_boost = lora_cfg["tx_ant"].upper() == "PA_BOOST"
+            pa_boost_bit = (
+                _PA_CONFIG_PASELECT_PA_BOOST_PIN if self._pa_boost else _PA_CONFIG_PASELECT_RFO_PIN
+            )
+            pa_config |= pa_boost_bit
+            update_mask |= pa_boost_bit
+            if not self._pa_boost:
+                # When using RFO, _REG_PA_DAC can keep default value always
+                # (otherwise, it's set when output_power is set in next block)
+                self._reg_write(_REG_PA_DAC, _PA_DAC_DEFAULT_VALUE)
+
+        if "output_power" in lora_cfg:
+            # See DS 3.4.2 RF Power Amplifiers
+            dbm = int(lora_cfg["output_power"])
+            if self._pa_boost:
+                if dbm >= 20:
+                    output_power = 0x15  # 17dBm setting
+                    pa_dac = _PA_DAC_HIGH_POWER_20DBM
+                else:
+                    dbm = _clamp(dbm, 2, 17)  # +2 to +17dBm only
+                    output_power = dbm - 2
+                    pa_dac = _PA_DAC_DEFAULT_VALUE
+                self._reg_write(_REG_PA_DAC, pa_dac)
+            else:
+                # In RFO mode, Output Power is computed from two register fields
+                # - MaxPower and OutputPower.
+                #
+                # Do what the Semtech LoraMac-node driver does here, which is to
+                # set max_power at one extreme or the other (0 or 7) and then
+                # calculate the output_power setting based on this baseline.
+                dbm = _clamp(dbm, -4, 15)
+                if dbm > 0:
+                    # MaxPower to maximum
+                    pa_config |= _PA_CONFIG_MAXPOWER_MASK << _PA_CONFIG_MAXPOWER_SHIFT
+
+                    # Pout (dBm) == 10.8dBm + 0.6*maxPower - (15 - register value)
+                    # 10.8+0.6*7 == 15dBm, so pOut = register_value (0 to 15 dBm)
+                    output_power = dbm
+                else:
+                    # MaxPower field will be set to 0
+
+                    # Pout (dBm) == 10.8dBm - (15 - OutputPower)
+                    # OutputPower == Pout (dBm) + 4.2
+                    output_power = dbm + 4  # round down to 4.0, to keep using integer math
+
+            pa_config |= output_power << _PA_CONFIG_OUTPUTPOWER_SHIFT
+            update_mask |= (
+                _PA_CONFIG_OUTPUTPOWER_MASK << _PA_CONFIG_OUTPUTPOWER_SHIFT
+                | _PA_CONFIG_MAXPOWER_MASK << _PA_CONFIG_MAXPOWER_SHIFT
+            )
+
+        self._reg_update(_REG_PA_CONFIG, update_mask, pa_config)
+
+        if "pa_ramp_us" in lora_cfg:
+            # other fields in this register are reserved to 0 or unused
+            self._reg_write(
+                _REG_PA_RAMP,
+                self._get_pa_ramp_val(
+                    lora_cfg,
+                    [10, 12, 15, 20, 25, 31, 40, 50, 62, 100, 125, 250, 500, 1000, 2000, 3400],
+                ),
+            )
+
+        # If a hard reset happened then flags should be cleared already and mask should
+        # default to fully enabled, but let's be "belts and braces" sure
+        self._reg_write(_REG_IRQ_FLAGS, 0xFF)
+        self._reg_write(_REG_IRQ_FLAGS_MASK, 0)  # do IRQ masking in software for now
+
+        # Update MODEM_CONFIG1
+        modem_config1 = 0x0
+        update_mask = 0x0
+        if "bw" in lora_cfg:
+            bw = str(lora_cfg["bw"])
+            bw_reg_val, self._bw_hz = {
+                "7.8": (_MODEM_CONFIG1_BW7_8, 7800),
+                "10.4": (_MODEM_CONFIG1_BW10_4, 10400),
+                "15.6": (_MODEM_CONFIG1_BW15_6, 15600),
+                "20.8": (_MODEM_CONFIG1_BW20_8, 20800),
+                "31.25": (_MODEM_CONFIG1_BW31_25, 31250),
+                "41.7": (_MODEM_CONFIG1_BW41_7, 41700),
+                "62.5": (_MODEM_CONFIG1_BW62_5, 62500),
+                "125": (_MODEM_CONFIG1_BW125, 125000),
+                "250": (_MODEM_CONFIG1_BW250, 250000),
+                "500": (_MODEM_CONFIG1_BW500, 500000),
+            }[bw]
+            modem_config1 |= bw_reg_val << _MODEM_CONFIG1_BW_SHIFT
+            update_mask |= _MODEM_CONFIG1_BW_MASK << _MODEM_CONFIG1_BW_SHIFT
+
+        if "freq_khz" in lora_cfg or "bw" in lora_cfg:
+            # Workaround for Errata Note 2.1 "Sensitivity Optimization with a 500 kHz bandwidth"
+            if self._bw_hz == 500000 and 862_000_000 <= self._rf_freq_hz <= 1020_000_000:
+                self._reg_write(0x36, 0x02)
+                self._reg_write(0x3A, 0x64)
+            elif self._bw_hz == 500000 and 410_000_000 <= self._rf_freq_hz <= 525_000_000:
+                self._reg_write(0x36, 0x02)
+                self._reg_write(0x3A, 0x7F)
+            else:
+                # "For all other combinations of bandiwdth/frequencies, register at address 0x36
+                # should be re-set to value 0x03 and the value at address 0x3a will be
+                # automatically selected by the chip"
+                self._reg_write(0x36, 0x03)
+
+        if "coding_rate" in lora_cfg:
+            self._coding_rate = int(lora_cfg["coding_rate"])
+            if self._coding_rate < 5 or self._coding_rate > 8:
+                raise ConfigError("coding_rate")
+            # _MODEM_CONFIG1_CODING_RATE_45 == value 5 == 1
+            modem_config1 |= (self._coding_rate - 4) << _MODEM_CONFIG1_CODING_RATE_SHIFT
+            update_mask |= _MODEM_CONFIG1_CODING_RATE_MASK << _MODEM_CONFIG1_CODING_RATE_SHIFT
+
+        self._reg_update(_REG_MODEM_CONFIG1, update_mask, modem_config1)
+
+        if "implicit_header" in lora_cfg:
+            self._implicit_header = lora_cfg["implicit_header"]
+            modem_config1 |= _flag(_MODEM_CONFIG1_IMPLICIT_HEADER_MODE_ON, self._implicit_header)
+            update_mask |= _MODEM_CONFIG1_IMPLICIT_HEADER_MODE_ON
+
+        # Update MODEM_CONFIG2, for any fields that changed
+        modem_config2 = 0
+        update_mask = 0
+        if "sf" in lora_cfg:
+            sf = self._sf = int(lora_cfg["sf"])
+
+            if sf < _MODEM_CONFIG2_SF_MIN or sf > _MODEM_CONFIG2_SF_MAX:
+                raise ConfigError("sf")
+            if sf == 6 and not self._implicit_header:
+                # DS 4.1.12 "Spreading Factor"
+                raise ConfigError("SF6 requires implicit_header mode")
+
+            # Update these registers when writing 'SF'
+            self._reg_write(
+                _REG_DETECTION_THRESHOLD,
+                _DETECTION_THRESHOLD_SF6 if sf == 6 else _DETECTION_THRESHOLD_OTHER,
+            )
+            # This field has a reserved non-zero field, so do a read-modify-write update
+            self._reg_update(
+                _REG_DETECT_OPTIMIZE,
+                _DETECT_OPTIMIZE_AUTOMATIC_IF_ON | _DETECT_OPTIMIZE_MASK,
+                _DETECT_OPTIMIZE_SF6 if sf == 6 else _DETECT_OPTIMIZE_OTHER,
+            )
+
+            modem_config2 |= sf << _MODEM_CONFIG2_SF_SHIFT
+            update_mask |= _MODEM_CONFIG2_SF_MASK << _MODEM_CONFIG2_SF_SHIFT
+
+        if "crc_en" in lora_cfg:
+            self._crc_en = lora_cfg["crc_en"]
+            # I had to double-check the datasheet about this point:
+            # 1. In implicit header mode, this bit is used on both RX & TX and
+            #    should be set to get CRC generation on TX and/or checking on RX.
+            # 2. In explicit header mode, this bit is only used on TX (should CRC
+            #    be added and CRC flag set in header) and ignored on RX (CRC flag
+            #    read from header instead).
+            modem_config2 |= _flag(_MODEM_CONFIG2_RX_PAYLOAD_CRC_ON, self._crc_en)
+            update_mask |= _MODEM_CONFIG2_RX_PAYLOAD_CRC_ON
+
+        self._reg_update(_REG_MODEM_CONFIG2, update_mask, modem_config2)
+
+        # Update _REG_INVERT_IQ
+        #
+        # See comment about this register's undocumented weirdness at top of
+        # file above _REG_INVERT_IQ constant.
+        #
+        # Note also there is a second register invert_iq2 which may be set differently
+        # for transmit vs receive, see _set_invert_iq2() for that one.
+        invert_iq = 0x0
+        update_mask = 0x0
+        if "invert_iq_rx" in lora_cfg:
+            self._invert_iq[0] = lora_cfg["invert_iq_rx"]
+            invert_iq |= _flag(_INVERT_IQ_RX, lora_cfg["invert_iq_rx"])
+            update_mask |= _INVERT_IQ_RX
+        if "invert_iq_tx" in lora_cfg:
+            self._invert_iq[1] = lora_cfg["invert_iq_tx"]
+            invert_iq |= _flag(_INVERT_IQ_TX_OFF, not lora_cfg["invert_iq_tx"])  # Inverted
+            update_mask |= _INVERT_IQ_TX_OFF
+        self._reg_update(_REG_INVERT_IQ, update_mask, invert_iq)
+
+        if "preamble_len" in lora_cfg:
+            self._preamble_len = lora_cfg["preamble_len"]
+            self._reg_write(_REG_PREAMBLE_LEN_MSB, struct.pack(">H", self._preamble_len))
+
+        # Update MODEM_CONFIG3, for any fields that have changed
+        modem_config3 = 0
+        update_mask = 0
+
+        if "sf" in lora_cfg or "bw" in lora_cfg:
+            # Changing either SF or BW means the Low Data Rate Optimization may need to be changed
+            #
+            # note: BaseModem.get_n_symbols_x4() assumes this value is set automatically
+            # as follows.
+            modem_config3 |= _flag(_MODEM_CONFIG3_LOW_DATA_RATE_OPTIMIZE, self._get_ldr_en())
+            update_mask |= _MODEM_CONFIG3_LOW_DATA_RATE_OPTIMIZE
+
+        if "lna_gain" in lora_cfg:
+            lna_gain = lora_cfg["lna_gain"]
+            update_mask |= _MODEM_CONFIG3_AGC_ON
+            if lna_gain is None:  # Setting 'None' means 'Auto'
+                modem_config3 |= _MODEM_CONFIG3_AGC_ON
+            else:  # numeric register value
+                # Clear the _MODEM_CONFIG3_AGC_ON bit, and write the manual LNA gain level 1-6
+                # to the register
+                self._reg_update(
+                    _REG_LNA, _LNA_GAIN_MASK << _LNA_GAIN_SHIFT, lna_gain << _LNA_GAIN_SHIFT
+                )
+
+        if "rx_boost" in lora_cfg:
+            self._reg_update(
+                _REG_LNA,
+                _LNA_BOOST_HF_MASK << _LNA_BOOST_HF_SHIFT,
+                _flag(0x3, lora_cfg["lna_boost_hf"]),
+            )
+
+        self._reg_update(_REG_MODEM_CONFIG3, update_mask, modem_config3)
+
+    def _reg_write(self, reg, value):
+        self._cs(0)
+        if isinstance(value, int):
+            self._buf2[0] = reg | _WRITE_REG_BIT
+            self._buf2[1] = value
+            self._spi.write(self._buf2)
+            if _DEBUG:
+                dbg = hex(value)
+        else:  # value is a buffer
+            self._buf1[0] = reg | _WRITE_REG_BIT
+            self._spi.write(self._buf1)
+            self._spi.write(value)
+            if _DEBUG:
+                dbg = value.hex()
+        self._cs(1)
+
+        if _DEBUG:
+            print("W {:#x} ==> {}".format(reg, dbg))
+            self._reg_read(reg)  # log the readback as well
+
+    def _reg_update(self, reg, update_mask, new_value):
+        # Update register address 'reg' with byte value new_value, as masked by
+        # bit mask update_mask. Bits not set in update_mask will be kept at
+        # their pre-existing values in the register.
+        #
+        # If update_mask is zero, this function is a no-op and returns None.
+        # If update_mask is not zero, this function updates 'reg' and returns
+        # the previous complete value of 'reg' as a result.
+        #
+        # Note: this function has no way of detecting a race condition if the
+        # modem updates any bits in 'reg' that are unset in update_mask, at the
+        # same time a read/modify/write is occurring. Any such changes are
+        # overwritten with the original values.
+
+        if not update_mask:  # short-circuit if nothing to change
+            if _DEBUG:
+                # Log the current value if DEBUG is on
+                # (Note the compiler will optimize this out otherwise)
+                self._reg_read(reg)
+            return
+        old_value = self._reg_read(reg)
+        value = ((old_value & ~update_mask) & 0xFF) | (new_value & update_mask)
+        if old_value != value:
+            self._reg_write(reg, value)
+        return old_value
+
+    def _reg_read(self, reg):
+        # Read and return a single register value at address 'reg'
+        self._buf2[0] = reg
+        self._buf2[1] = 0xFF
+        self._cs(0)
+        self._spi.write_readinto(self._buf2, self._buf2)
+        self._cs(1)
+        if _DEBUG:
+            print("R {:#x} <== {:#x}".format(reg, self._buf2[1]))
+        return self._buf2[1]
+
+    def _reg_readinto(self, reg, buf):
+        # Read and return one or more register values starting at address 'reg',
+        # into buffer 'buf'.
+        self._cs(0)
+        self._spi.readinto(self._buf1, reg)
+        self._spi.readinto(buf)
+        if _DEBUG:
+            print("R {:#x} <== {}".format(reg, buf.hex()))
+        self._cs(1)
+
+    def _get_mode(self):
+        # Return the current 'Mode' field in RegOpMode
+        return self._reg_read(_REG_OPMODE) & _OPMODE_MODE_MASK
+
+    def _set_mode(self, mode, lora_en=True):
+        # Set the 'Mode' and 'LongRangeMode' fields in RegOpMode
+        # according to 'mode' and 'lora_en', respectively.
+        #
+        # If enabling or disabling LoRa mode, the radio is automatically
+        # switched into Sleep mode as required and then the requested mode is
+        # set (if not sleep mode).
+        #
+        # Returns the previous value of the RegOpMode register (unmasked).
+        mask = _OPMODE_LONGRANGEMODE_LORA | _OPMODE_MODE_MASK
+        lora_val = _flag(_OPMODE_LONGRANGEMODE_LORA, lora_en)
+        old_value = self._reg_read(_REG_OPMODE)
+        new_value = (old_value & ~mask) | lora_val | mode
+
+        if lora_val != (old_value & _OPMODE_LONGRANGEMODE_LORA):
+            # Need to switch into Sleep mode in order to change LongRangeMode flag
+            self._reg_write(_REG_OPMODE, _OPMODE_MODE_SLEEP | lora_val)
+
+        if new_value != old_value:
+            self._reg_write(_REG_OPMODE, new_value)
+
+            if _DEBUG:
+                print(
+                    "Mode {} -> {} ({:#x})".format(
+                        old_value & _OPMODE_MODE_MASK, mode, self._reg_read(_REG_OPMODE)
+                    )
+                )
+
+        return old_value
+
+    def _set_invert_iq2(self, val):
+        # Set the InvertIQ2 register on/off as needed, unless it is already set to the correct
+        # level
+        if self._invert_iq[2] == val:
+            return  # already set to the level we want
+        self._reg_write(_REG_INVERT_IQ2, _INVERT_IQ2_ON if val else _INVERT_IQ2_OFF)
+        self._invert_iq[2] = val
+
+    def _standby(self):
+        # Send the command for standby mode.
+        #
+        # **Don't call this function directly, call standby() instead.**
+        #
+        # (This private version doesn't update the driver's internal state.)
+        old_mode = self._set_mode(_OPMODE_MODE_STDBY) & _OPMODE_MODE_MASK
+        if old_mode not in (_OPMODE_MODE_STDBY, _OPMODE_MODE_SLEEP):
+            # If we just cancelled sending or receiving, clear any pending IRQs
+            self._reg_write(_REG_IRQ_FLAGS, 0xFF)
+
+    def sleep(self):
+        # Put the modem into sleep mode. Modem will wake automatically the next
+        # time host asks it for something, or call standby() to wake it manually.
+        self.standby()  # save some code size, this clears driver state for us
+        self._set_mode(_OPMODE_MODE_SLEEP)
+
+    def is_idle(self):
+        # Returns True if the modem is idle (either in standby or in sleep).
+        #
+        # Note this function can return True in the case where the modem has temporarily gone to
+        # standby, but there's a receive configured in software that will resume receiving the
+        # next time poll_recv() or poll_send() is called.
+        return self._get_mode() in (_OPMODE_MODE_STDBY, _OPMODE_MODE_SLEEP)
+
+    def calibrate_image(self):
+        # Run the modem Image & RSSI calibration process to improve receive performance.
+        #
+        # calibration will be run in the HF or LF band automatically, depending on the
+        # current radio configuration.
+        #
+        # See DS 2.1.3.8 Image and RSSI Calibration. Idea to disable TX power
+        # comes from Semtech's sx1276 driver which does this.
+
+        pa_config = self._reg_update(_REG_PA_CONFIG, 0xFF, 0)  # disable TX power
+
+        self._set_mode(_OPMODE_MODE_STDBY, False)  # Switch to FSK/OOK mode to expose RegImageCal
+
+        self._reg_update(_REG_FSKOOK_IMAGE_CAL, _IMAGE_CAL_START, _IMAGE_CAL_START)
+        while self._reg_read(_REG_FSKOOK_IMAGE_CAL) & _IMAGE_CAL_RUNNING:
+            time.sleep_ms(1)
+
+        self._set_mode(_OPMODE_MODE_STDBY)  # restore LoRA mode
+
+        self._reg_write(_REG_PA_CONFIG, pa_config)  # restore previous TX power
+
+    def calibrate(self):
+        # Run a full calibration.
+        #
+        # For SX1276, this means just the image & RSSI calibration as no other runtime
+        # calibration is implemented in the modem.
+        self.calibrate_image()
+
+    def start_recv(self, timeout_ms=None, continuous=False, rx_length=0xFF):
+        # Start receiving.
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        super().start_recv(timeout_ms, continuous, rx_length)  # sets self._rx
+
+        # will_irq if DIO0 and DIO1 both hooked up, or DIO0 and no timeout
+        will_irq = self._dio0 and (self._dio1 or timeout_ms is None)
+
+        if self._tx:
+            # Send is in progress and has priority, _check_recv() will start receive
+            # once send finishes (caller needs to call poll_send() for this to happen.)
+            if _DEBUG:
+                print("Delaying receive until send completes")
+            return will_irq
+
+        # Put the modem in a known state. It's possible a different
+        # receive was in progress, this prevent anything changing while
+        # we set up the new receive
+        self._standby()  # calling private version to keep driver state as-is
+
+        # Update the InvertIQ2 setting for RX
+        self._set_invert_iq2(self._invert_iq[0])
+
+        if self._implicit_header:
+            # Payload length only needs to be set in implicit header mode
+            self._reg_write(_REG_PAYLOAD_LEN, rx_length)
+
+        if self._dio0:
+            # Field value is 0, for DIO0 = RXDone
+            update_mask = _DIO0_MAPPING_MASK << _DIO0_MAPPING_SHIFT
+            if self._dio1:
+                # Field value also 0, for DIO1 = RXTimeout
+                update_mask |= _DIO1_MAPPING_MASK << _DIO1_MAPPING_SHIFT
+            self._reg_update(_REG_DIO_MAPPING1, update_mask, 0)
+
+        if not continuous:
+            # Unlike SX1262, SX1276 doesn't have a "single RX no timeout" mode. So we set the
+            # maximum hardware timeout and resume RX in software if needed.
+            if timeout_ms is None:
+                timeout_syms = 1023
+            else:
+                t_sym_us = self._get_t_sym_us()
+                timeout_syms = (timeout_ms * 1000 + t_sym_us - 1) // t_sym_us  # round up
+
+                # if the timeout is too long for the modem, the host will
+                # automatically resume it in software. If the timeout is too
+                # short for the modem, round it silently up to the minimum
+                # timeout.
+                timeout_syms = _clamp(timeout_syms, 4, 1023)
+            self._reg_update(
+                _REG_MODEM_CONFIG2,
+                _MODEM_CONFIG2_SYMB_TIMEOUT_MSB_MASK,
+                timeout_syms >> 8,
+            )
+            self._reg_write(_REG_SYMB_TIMEOUT_LSB, timeout_syms & 0xFF)
+
+        # Allocate the full FIFO for RX
+        self._reg_write(_REG_FIFO_ADDR_PTR, 0)
+        self._reg_write(_REG_FIFO_RX_BASE_ADDR, 0)
+
+        self._set_mode(_OPMODE_MODE_RX_CONTINUOUS if continuous else _OPMODE_MODE_RX_SINGLE)
+
+        return will_irq
+
+    def _rx_flags_success(self, flags):
+        # Returns True if IRQ flags indicate successful receive.
+        # Specifically, from the bits in _IRQ_DRIVER_RX_MASK:
+        # - _IRQ_RX_DONE must be set
+        # - _IRQ_RX_TIMEOUT must not be set
+        # - _IRQ_PAYLOAD_CRC_ERROR must not be set
+        # - _IRQ_VALID_HEADER must be set if we're using explicit packet mode, ignored otherwise
+        return flags & _IRQ_DRIVER_RX_MASK == _IRQ_RX_DONE | _flag(
+            _IRQ_VALID_HEADER, not self._implicit_header
+        )
+
+    def _get_irq(self):
+        return self._reg_read(_REG_IRQ_FLAGS)
+
+    def _clear_irq(self, to_clear=0xFF):
+        return self._reg_write(_REG_IRQ_FLAGS, to_clear)
+
+    def _read_packet(self, rx_packet, flags):
+        # Private function to read received packet (RxPacket object) from the
+        # modem, if there is one.
+        #
+        # Called from poll_recv() function, which has already checked the IRQ flags
+        # and verified a valid receive happened.
+
+        ticks_ms = self._get_last_irq()  # IRQ timestamp for the receive
+
+        rx_payload_len = self._reg_read(_REG_RX_NB_BYTES)
+
+        if rx_packet is None or len(rx_packet) != rx_payload_len:
+            rx_packet = RxPacket(rx_payload_len)
+
+        self._reg_readinto(_REG_FIFO, rx_packet)
+
+        rx_packet.ticks_ms = ticks_ms
+        # units: dB*4
+        rx_packet.snr = self._reg_read(_REG_PKT_SNR_VAL)
+        if rx_packet.snr & 0x80:  # Signed 8-bit integer
+            # (avoiding using struct here to skip a heap allocation)
+            rx_packet.snr -= 0x100
+        # units: dBm
+        rx_packet.rssi = self._reg_read(_REG_PKT_RSSI_VAL) - (157 if self._pa_boost else 164)
+        rx_packet.crc_error = flags & _IRQ_PAYLOAD_CRC_ERROR != 0
+        return rx_packet
+
+    def prepare_send(self, packet):
+        # Prepare modem to start sending. Should be followed by a call to start_send()
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        if len(packet) > 255:
+            raise ValueError("packet too long")
+
+        # Put the modem in a known state. Any current receive is suspended at this point,
+        # but calling _check_recv() will resume it later.
+        self._standby()  # calling private version to keep driver state as-is
+
+        if self._ant_sw:
+            self._ant_sw.tx(self._pa_boost)
+
+        self._last_irq = None
+
+        if self._dio0:
+            self._reg_update(
+                _REG_DIO_MAPPING1,
+                _DIO0_MAPPING_MASK << _DIO0_MAPPING_SHIFT,
+                1 << _DIO0_MAPPING_SHIFT,
+            )  # DIO0 = TXDone
+
+        # Update the InvertIQ2 setting for TX
+        self._set_invert_iq2(self._invert_iq[1])
+
+        # Allocate the full FIFO for TX
+        self._reg_write(_REG_FIFO_ADDR_PTR, 0)
+        self._reg_write(_REG_FIFO_TX_BASE_ADDR, 0)
+
+        self._reg_write(_REG_PAYLOAD_LEN, len(packet))
+
+        self._reg_write(_REG_FIFO, packet)
+
+        # clear the TX Done flag in case a previous call left it set
+        # (won't happen unless poll_send() was not called)
+        self._reg_write(_REG_IRQ_FLAGS, _IRQ_TX_DONE)
+
+    def start_send(self):
+        # Actually start a send that was loaded by calling prepare_send().
+        #
+        # This is split into a separate function to allow more precise timing.
+        #
+        # The driver doesn't verify the caller has done the right thing here, the
+        # modem will no doubt do something weird if prepare_send() was not called!
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        self._set_mode(_OPMODE_MODE_TX)
+
+        self._tx = True
+
+        return self._dio0 is not None  # will_irq if dio0 is set
+
+    def _irq_flag_tx_done(self):
+        return _IRQ_TX_DONE
+
+
+# Define the actual modem classes that use the SyncModem & AsyncModem "mixin-like" classes
+# to create sync and async variants.
+
+try:
+    from .sync_modem import SyncModem
+
+    class SX1276(_SX127x, SyncModem):
+        pass
+
+    # Implementation note: Currently the classes SX1276, SX1277, SX1278 and
+    # SX1279 are actually all SX1276. Perhaps in the future some subclasses with
+    # software enforced limits can be added to this driver, but the differences
+    # appear very minor:
+    #
+    # - SX1276 seems like "baseline" with max freq.
+    # - SX1277 supports max SF level of 9.
+    # - SX1278 supports max freq 525MHz, therefore has no RFO_HF and RFI_HF pins.
+    # - SX1279 supports max freq 960MHz.
+    #
+    # There also appears to be no difference in silicon interface or register values to determine
+    # which model is connected.
+    SX1277 = SX1278 = SX1279 = SX1276
+
+except ImportError:
+    pass
+
+try:
+    from .async_modem import AsyncModem
+
+    class AsyncSX1276(_SX127x, AsyncModem):
+        pass
+
+    # See comment above about currently identical implementations
+    AsyncSX1277 = AsyncSX1278 = AsyncSX1279 = AsyncSX1276
+
+except ImportError:
+    pass
diff --git a/micropython/lora/lora-sx127x/manifest.py b/micropython/lora/lora-sx127x/manifest.py
new file mode 100644
index 000000000..ebd665332
--- /dev/null
+++ b/micropython/lora/lora-sx127x/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+require("lora")
+package("lora")
diff --git a/micropython/lora/lora-sync/lora/sync_modem.py b/micropython/lora/lora-sync/lora/sync_modem.py
new file mode 100644
index 000000000..27c2f19d1
--- /dev/null
+++ b/micropython/lora/lora-sync/lora/sync_modem.py
@@ -0,0 +1,86 @@
+# MicroPython LoRa synchronous modem driver
+# MIT license; Copyright (c) 2023 Angus Gratton
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+
+import machine
+import time
+
+
+class SyncModem:
+    # Mixin-like base class that provides synchronous modem send and recv
+    # functions
+    #
+    #
+    # Don't instantiate this class directly, instantiate one of the 'AsyncXYZ'
+    # modem classes defined in the lora module.
+    #
+    # These are intended for simple applications. They block the caller until
+    # the modem operation is complete, and don't support interleaving send
+    # and receive.
+
+    def _after_init(self):
+        pass  # Needed for AsyncModem but not SyncModem
+
+    def send(self, packet, tx_at_ms=None):
+        # Send the given packet (byte sequence),
+        # and return once transmission of the packet is complete.
+        #
+        # Returns a timestamp (result of time.ticks_ms()) when the packet
+        # finished sending.
+        self.prepare_send(packet)
+
+        # If the caller specified a timestamp to start transmission at, wait until
+        # that time before triggering the send
+        if tx_at_ms is not None:
+            time.sleep_ms(max(0, time.ticks_diff(tx_at_ms, time.ticks_ms())))
+
+        will_irq = self.start_send()  # ... and go!
+
+        # sleep for the expected send time before checking if send has ended
+        time.sleep_ms(self.get_time_on_air_us(len(packet)) // 1000)
+
+        tx = True
+        while tx is True:
+            tx = self.poll_send()
+            self._sync_wait(will_irq)
+        return tx
+
+    def recv(self, timeout_ms=None, rx_length=0xFF, rx_packet=None):
+        # Attempt to a receive a single LoRa packet, timeout after timeout_ms milliseconds
+        # or wait indefinitely if no timeout is supplied (default).
+        #
+        # Returns an instance of RxPacket or None if the radio timed out while receiving.
+        #
+        # Optional rx_length argument is only used if lora_cfg["implict_header"] == True
+        # (not the default) and holds the length of the payload to receive.
+        #
+        # Optional rx_packet argument can be an existing instance of RxPacket
+        # which will be reused to save allocations, but only if the received packet
+        # is the same length as the rx_packet packet. If the length is different, a
+        # new RxPacket instance is allocated and returned.
+        will_irq = self.start_recv(timeout_ms, False, rx_length)
+        rx = True
+        while rx is True:
+            self._sync_wait(will_irq)
+            rx = self.poll_recv(rx_packet)
+        return rx or None
+
+    def _sync_wait(self, will_irq):
+        # For synchronous usage, block until an interrupt occurs or we time out
+        if will_irq:
+            for n in range(100):
+                machine.idle()
+                # machine.idle() wakes up very often, so don't actually return
+                # unless _radio_isr ran already. The outer for loop is so the
+                # modem is still polled occasionally to
+                # avoid the possibility an IRQ was lost somewhere.
+                #
+                # None of this is very efficient, power users should either use
+                # async or call the low-level API manually with better
+                # port-specific sleep configurations, in order to get the best
+                # efficiency.
+                if self.irq_triggered():
+                    break
+        else:
+            time.sleep_ms(1)
diff --git a/micropython/lora/lora-sync/manifest.py b/micropython/lora/lora-sync/manifest.py
new file mode 100644
index 000000000..ebd665332
--- /dev/null
+++ b/micropython/lora/lora-sync/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+require("lora")
+package("lora")
diff --git a/micropython/lora/lora/lora/__init__.py b/micropython/lora/lora/lora/__init__.py
new file mode 100644
index 000000000..a12ec45d7
--- /dev/null
+++ b/micropython/lora/lora/lora/__init__.py
@@ -0,0 +1,29 @@
+# MicroPython lora module
+# MIT license; Copyright (c) 2023 Angus Gratton
+
+from .modem import RxPacket  # noqa: F401
+
+ok = False  # Flag if at least one modem driver package is installed
+
+# Various lora "sub-packages"
+
+try:
+    from .sx126x import *  # noqa: F401
+
+    ok = True
+except ImportError as e:
+    if "no module named 'lora." not in str(e):
+        raise
+
+try:
+    from .sx127x import *  # noqa: F401
+
+    ok = True
+except ImportError as e:
+    if "no module named 'lora." not in str(e):
+        raise
+
+if not ok:
+    raise ImportError(
+        "Incomplete lora installation. Need at least one of lora-sync, lora-async and one of lora-sx126x, lora-sx127x"
+    )
diff --git a/micropython/lora/lora/lora/modem.py b/micropython/lora/lora/lora/modem.py
new file mode 100644
index 000000000..62313dc04
--- /dev/null
+++ b/micropython/lora/lora/lora/modem.py
@@ -0,0 +1,483 @@
+# MicroPython LoRa modem driver base class
+# MIT license; Copyright (c) 2023 Angus Gratton
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+import time
+from micropython import const, schedule
+
+# Set to True to get some additional printed debug output.
+_DEBUG = const(False)
+
+
+def _clamp(v, vmin, vmax):
+    # Small utility function to clamp a value 'v' between 'vmin' and 'vmax', inclusive.
+    return min(max(vmin, v), vmax)
+
+
+def _flag(value, condition):
+    # Small utility function for returning a bit 'value' or not, based on a
+    # boolean condition. Can help make expressions to build register values more
+    # readable.
+    #
+    # Note that for value==1, can also rely on int(bool(x)) with one or both
+    # conversions being implicit, as int(True)==1 and int(False)==0
+    #
+    # There is also (condition and value) but this is (IMO) confusing to read.
+    return value if condition else 0
+
+
+class ConfigError(ValueError):
+    # Raise if there is an error in lora_cfg, saves some duplicated strings
+    def __init__(self, field):
+        super().__init__("Invalid lora_cfg {}".format(field))
+
+
+class BaseModem:
+    def __init__(self, ant_sw):
+        self._ant_sw = ant_sw
+        self._irq_callback = None
+
+        # Common configuration settings that need to be tracked by all modem drivers
+        # (Note that subclasses may set these to other values in their constructors, to match
+        # the power-on-reset configuration of a particular modem.)
+        #
+        self._rf_freq_hz = 0  # Needs to be set via configure()
+        self._sf = 7  # Spreading factor
+        self._bw_hz = 125000  # Reset value
+        self._coding_rate = 5
+        self._crc_en = True  # use packet CRCs
+        self._implicit_header = False  # implict vs explicit header mode
+        self._preamble_len = 12
+        self._coding_rate = 5
+
+        # CRC error counter
+        self.crc_errors = 0
+        self.rx_crc_error = False
+
+        # Current state of the modem
+
+        # _rx holds radio recv state:
+        #
+        # - False if the radio is not receiving
+        # - True if the radio is continuously receiving, or performing a single receive with
+        #   no timeout.
+        # - An int if there is a timeout set, in which case it is the is the receive deadline
+        #   (as a time.ticks_ms() timestamp).
+        #
+        # Note that self._rx can be not-False even when the radio hardware is not actually
+        # receiving, if self._tx is True (send always pauses recv.)
+        self._rx = False
+
+        # _rx_continuous is True if the modem is in continuous receive mode
+        # (this value is only valid when self._rx is also True).
+        self._rx_continuous = False
+
+        # This argument is stored from the parameter of the same name, as set in
+        # the last call to start_recv()
+        self._rx_length = None
+
+        # _tx holds radio send state and is simpler, True means sending and
+        # False means not sending.
+        self._tx = False
+
+        # timestamp (as time.ticks_ms() result) of last IRQ event
+        self._last_irq = None
+
+        # values are:
+        # - lora_cfg["invert_iq_rx"]
+        # - lora_cfg["invert_iq_tx"]
+        # - Current modem Invert setting
+        self._invert_iq = [False, False, False]
+
+        # This hook exists to allow the SyncModem & AsyncModem "mixin-like"
+        # classes to have some of their own state, without needing to manage the
+        # fuss of multiple constructor paths.
+        try:
+            self._after_init()
+        except AttributeError:
+            # If this exception happens here then one of the modem classes without a SyncModem or AsyncModem "mixin-like" class
+            # has been instantiated.
+            raise NotImplementedError(
+                "Don't instantiate this class directly, "
+                "instantiate a class from the 'lora' package"
+            )
+
+    def standby(self):
+        # Put the modem into standby. Can be used to cancel a continuous recv,
+        # or cancel a send before it completes.
+        #
+        # Calls the private function which actually sets the mode to standby, and then
+        # clears all the driver's state flags.
+        #
+        # Note this is also called before going to sleep(), to save on duplicated code.
+        self._standby()
+        self._rx = False
+        self._tx = False
+        self._last_irq = None
+        if self._ant_sw:
+            self._ant_sw.idle()
+        self._radio_isr(None)  # "soft ISR"
+
+    def _get_t_sym_us(self):
+        # Return length of a symbol in microseconds
+        return 1000_000 * (1 << self._sf) // self._bw_hz
+
+    def _get_ldr_en(self):
+        # Return true if Low Data Rate should be enabled
+        #
+        # The calculation in get_n_symbols_x4() relies on this being the same logic applied
+        # in the modem configuration routines.
+        return self._get_t_sym_us() >= 16000
+
+    def _get_pa_ramp_val(self, lora_cfg, supported):
+        # Return the PA ramp register index from the list of supported PA ramp
+        # values. If the requested ramp time is supported by the modem, round up
+        # to the next supported value.
+        #
+        # 'supported' is the list of supported ramp times, must be sorted
+        # already.
+        us = int(lora_cfg["pa_ramp_us"])
+
+        # Find the index of the lowest supported ramp time that is longer or the
+        # same value as 'us'
+        for i, v in enumerate(supported):
+            if v >= us:
+                return i
+        # The request ramp time is longer than all this modem's supported ramp times
+        raise ConfigError("pa_ramp_us")
+
+    def _symbol_offsets(self):
+        # Called from get_time_on_air_us().
+        #
+        # This function provides a way to implement the different SF5 and SF6 in SX126x,
+        # by returning two offsets: one for the overall number of symbols, and one for the
+        # number of bits used to calculate the symbol length of the payload.
+        return (0, 0)
+
+    def get_n_symbols_x4(self, payload_len):
+        # Get the number of symbols in a packet (Time-on-Air) for the current
+        # configured modem settings and the provided payload length in bytes.
+        #
+        # Result is in units of "symbols times 4" as there is a fractional term
+        # in the equation, and we want to limit ourselves to integer arithmetic.
+        #
+        # References are:
+        # - SX1261/2 DS 6.1.4 "LoRa Time-on-Air"
+        # - SX1276 DS 4.1.1 "Time on air"
+        #
+        # Note the two datasheets give the same information in different
+        # ways. SX1261/62 DS is (IMO) clearer, so this function is based on that
+        # formula. The result is equivalent to the datasheet value "Nsymbol",
+        # times 4.
+        #
+        # Note also there are unit tests for this function in tests/test_time_on_air.py,
+        # and that it's been optimised a bit for code size (with impact on readability)
+
+        # Account for a minor difference between SX126x and SX127x: they have
+        # incompatible SF 5 & 6 modes.
+        #
+        # In SX126x when using SF5 or SF6, we apply an offset of +2 symbols to
+        # the overall preamble symbol count (s_o), and an offset of -8 to the
+        # payload bit length (b_o).
+        s_o, b_o = self._symbol_offsets()
+
+        # calculate the bit length of the payload
+        #
+        # This is the part inside the max(...,0) in the datasheet
+        bits = (
+            # payload_bytes
+            8 * payload_len
+            # N_bit_crc
+            + (16 if self._crc_en else 0)
+            # (4 * SF)
+            - (4 * self._sf)
+            # +8 for most modes, except SF5/6 on SX126x where b_o == -8 so these two cancel out
+            + 8
+            + b_o
+            # N_symbol_header
+            + (0 if self._implicit_header else 20)
+        )
+        bits = max(bits, 0)
+
+        # "Bits per symbol" denominator is either (4 * SF) or (4 * (SF -2))
+        # depending on Low Data Rate Optimization
+        bps = (self._sf - (2 * self._get_ldr_en())) * 4
+
+        return (
+            # Fixed preamble portion (4.25), times 4
+            17
+            # Remainder of equation is an integer number of symbols, times 4
+            + 4
+            * (
+                # configured preamble length
+                self._preamble_len
+                +
+                # optional extra preamble symbols (4.25+2=6.25 for SX1262 SF5,SF6)
+                s_o
+                +
+                # 8 symbol constant overhead
+                8
+                +
+                # Payload symbol length
+                # (this is the term "ceil(bits / 4 * SF) * (CR + 4)" in the datasheet
+                ((bits + bps - 1) // bps) * self._coding_rate
+            )
+        )
+
+    def get_time_on_air_us(self, payload_len):
+        # Return the "Time on Air" in microseconds for a particular
+        # payload length and the current configured modem settings.
+        return self._get_t_sym_us() * self.get_n_symbols_x4(payload_len) // 4
+
+    # Modem ISR routines
+    #
+    # ISR implementation is relatively simple, just exists to signal an optional
+    # callback, record a timestamp, and wake up the hardware if
+    # needed. ppplication code is expected to call poll_send() or
+    # poll_recv() as applicable in order to confirm the modem state.
+    #
+    # This is a MP hard irq in some configurations, meaning no memory allocation is possible.
+    #
+    # 'pin' may also be None if this is a "soft" IRQ triggered after a receive
+    # timed out during a send (meaning no receive IRQ will fire, but the
+    # receiver should wake up and move on anyhow.)
+    def _radio_isr(self, pin):
+        self._last_irq = time.ticks_ms()
+        if self._irq_callback:
+            self._irq_callback(pin)
+        if _DEBUG:
+            # Note: this may cause a MemoryError and fail if _DEBUG is enabled in this base class
+            # but disabled in the subclass, meaning this is a hard irq handler
+            try:
+                print("_radio_isr pin={}".format(pin))
+            except MemoryError:
+                pass
+
+    def irq_triggered(self):
+        # Returns True if the ISR has executed since the last time a send or a receive
+        # started
+        return self._last_irq is not None
+
+    def set_irq_callback(self, callback):
+        # Set a function to be called from the radio ISR
+        #
+        # This is used by the AsyncModem implementation, but can be called in
+        # other circumstances to implement custom ISR logic.
+        #
+        # Note that callback may be called in hard ISR context, meaning no
+        # memory allocation is possible.
+        self._irq_callback = callback
+
+    def _get_last_irq(self):
+        # Return the _last_irq timestamp if set by an ISR, or the
+        # current time.time_ms() timestamp otherwise.
+        if self._last_irq is None:
+            return time.ticks_ms()
+        return self._last_irq
+
+    # Common parts of receive API
+
+    def start_recv(self, timeout_ms=None, continuous=False, rx_length=0xFF):
+        # Start receiving.
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        if continuous and timeout_ms is not None:
+            raise ValueError()  # these two options are mutually exclusive
+
+        if timeout_ms is not None:
+            self._rx = time.ticks_add(time.ticks_ms(), timeout_ms)
+        else:
+            self._rx = True
+
+        self._rx_continuous = continuous
+        self._rx_length = rx_length
+
+        if self._ant_sw and not self._tx:
+            # this is guarded on 'not self._tx' as the subclass will not immediately
+            # start receiving if a send is in progress.
+            self._ant_sw.rx()
+
+    def poll_recv(self, rx_packet=None):
+        # Should be called while a receive is in progress:
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        #
+        # This function may alter the state of the modem - it will clear
+        # RX interrupts, it may read out a packet from the FIFO, and it
+        # may resume receiving if the modem has gone to standby but receive
+        # should resume.
+
+        if self._rx is False:
+            # Not actually receiving...
+            return False
+
+        if self._tx:
+            # Actually sending, this has to complete before we
+            # resume receiving, but we'll indicate that we are still receiving.
+            #
+            # (It's not harmful to fall through here and check flags anyhow, but
+            # it is a little wasteful if an interrupt has just triggered
+            # poll_send() as well.)
+            return True
+
+        packet = None
+
+        flags = self._get_irq()
+
+        if _DEBUG and flags:
+            print("RX flags {:#x}".format(flags))
+        if flags & self._IRQ_RX_COMPLETE:
+            # There is a small potential for race conditions here in continuous
+            # RX mode. If packets are received rapidly and the call to this
+            # function delayed, then a ValidHeader interrupt (for example) might
+            # have already set for a second packet which is being received now,
+            # and clearing it will mark the second packet as invalid.
+            #
+            # However it's necessary in continuous mode as interrupt flags don't
+            # self-clear in the modem otherwise (for example, if a CRC error IRQ
+            # bit sets then it stays set on the next packet, even if that packet
+            # has a valid CRC.)
+            self._clear_irq(flags)
+            ok = self._rx_flags_success(flags)
+            if not ok:
+                # If a non-valid receive happened, increment the CRC error counter
+                self.crc_errors += 1
+            if ok or self.rx_crc_error:
+                # Successfully received a valid packet (or configured to return all packets)
+                packet = self._read_packet(rx_packet, flags)
+                if not self._rx_continuous:
+                    # Done receiving now
+                    self._end_recv()
+
+        # _check_recv() will return True if a receive is ongoing and hasn't timed out,
+        # and also manages resuming any modem receive if needed
+        #
+        # We need to always call check_recv(), but if we received a packet then this is what
+        # we should return to the caller.
+        res = self._check_recv()
+        return packet or res
+
+    def _end_recv(self):
+        # Utility function to clear the receive state
+        self._rx = False
+        if self._ant_sw:
+            self._ant_sw.idle()
+
+    def _check_recv(self):
+        # Internal function to automatically call start_recv()
+        # again if a receive has been interrupted and the host
+        # needs to start it again.
+        #
+        # Return True if modem is still receiving (or sending, but will
+        # resume receiving after send finishes).
+
+        if not self._rx:
+            return False  # Not receiving, nothing to do
+
+        if not self.is_idle():
+            return True  # Radio is already sending or receiving
+
+        rx = self._rx
+
+        timeout_ms = None
+        if isinstance(rx, int):  # timeout is set
+            timeout_ms = time.ticks_diff(rx, time.ticks_ms())
+            if timeout_ms <= 0:
+                # Timed out in software, nothing to resume
+                self._end_recv()
+                if _DEBUG:
+                    print("Timed out in software timeout_ms={}".format(timeout_ms))
+                schedule(
+                    self._radio_isr, None
+                )  # "soft irq" to unblock anything waiting on the interrupt event
+                return False
+
+        if _DEBUG:
+            print(
+                "Resuming receive timeout_ms={} continuous={} rx_length={}".format(
+                    timeout_ms, self._rx_continuous, self._rx_length
+                )
+            )
+
+        self.start_recv(timeout_ms, self._rx_continuous, self._rx_length)
+
+        # restore the previous version of _rx so ticks_ms deadline can't
+        # slowly creep forward each time this happens
+        self._rx = rx
+
+        return True
+
+    # Common parts of send API
+
+    def poll_send(self):
+        # Check the ongoing send state.
+        #
+        # Returns one of:
+        #
+        # - True if a send is ongoing and the caller
+        #   should call again.
+        # - False if no send is ongoing.
+        # - An int value exactly one time per transmission, the first time
+        #   poll_send() is called after a send ends. In this case it
+        #   is the time.ticks_ms() timestamp of the time that the send completed.
+        #
+        # Note this function only returns an int value one time (the first time it
+        # is called after send completes).
+        #
+        # Part of common low-level modem API, see README.md for usage.
+        if not self._tx:
+            return False
+
+        ticks_ms = self._get_last_irq()
+
+        if not (self._get_irq() & self._IRQ_TX_COMPLETE):
+            # Not done. If the host and modem get out
+            # of sync here, or the caller doesn't follow the sequence of
+            # send operations exactly, then can end up in a situation here
+            # where the modem has stopped sending and has gone to Standby,
+            # so _IRQ_TX_DONE is never set.
+            #
+            # For now, leaving this for the caller to do correctly. But if it becomes an issue then
+            # we can call _get_mode() here as well and check the modem is still in a TX mode.
+            return True
+
+        self._clear_irq()
+
+        self._tx = False
+
+        if self._ant_sw:
+            self._ant_sw.idle()
+
+        # The modem just finished sending, so start receiving again if needed
+        self._check_recv()
+
+        return ticks_ms
+
+
+class RxPacket(bytearray):
+    # A class to hold a packet received from a LoRa modem.
+    #
+    # The base class is bytearray, which represents the packet payload,
+    # allowing RxPacket objects to be passed anywhere that bytearrays are
+    # accepted.
+    #
+    # Some additional properties are set on the object to store metadata about
+    # the received packet.
+    def __init__(self, payload, ticks_ms=None, snr=None, rssi=None, valid_crc=True):
+        super().__init__(payload)
+        self.ticks_ms = ticks_ms
+        self.snr = snr
+        self.rssi = rssi
+        self.valid_crc = valid_crc
+
+    def __repr__(self):
+        return "{}({}, {}, {}, {}, {})".format(
+            "RxPacket",
+            repr(
+                bytes(self)
+            ),  # This is a bit wasteful, but gets us b'XYZ' rather than "bytearray(b'XYZ')"
+            self.ticks_ms,
+            self.snr,
+            self.rssi,
+            self.valid_crc,
+        )
diff --git a/micropython/lora/lora/manifest.py b/micropython/lora/lora/manifest.py
new file mode 100644
index 000000000..cb9c5d5aa
--- /dev/null
+++ b/micropython/lora/lora/manifest.py
@@ -0,0 +1,2 @@
+metadata(version="0.1")
+package("lora")
diff --git a/micropython/lora/tests/test_time_on_air.py b/micropython/lora/tests/test_time_on_air.py
new file mode 100644
index 000000000..56fa1ad81
--- /dev/null
+++ b/micropython/lora/tests/test_time_on_air.py
@@ -0,0 +1,310 @@
+# MicroPython LoRa modem driver time on air tests
+# MIT license; Copyright (c) 2023 Angus Gratton
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+#
+# ## What is this?
+#
+# Host tests for the BaseModem.get_time_on_air_us() function. Theses against
+# dummy test values produced by the Semtech "SX1261 LoRa Calculator" software,
+# as downloaded from
+# https://lora-developers.semtech.com/documentation/product-documents/
+#
+# The app notes for SX1276 (AN1200.3) suggest a similar calculator exists for that
+# modem, but it doesn't appear to be available for download any more. I couldn't find
+# an accurate calculator for SX1276, so manually calculated the SF5 & SF6 test cases below
+# (other values should be the same as SX1262).
+#
+# ## Instructions
+#
+# These tests are intended to be run on a host PC via micropython unix port:
+#
+# cd /path/to/micropython-lib/micropython/lora
+# micropython -m tests.test_time_on_air
+#
+# Note: Using the working directory shown above is easiest way to ensure 'lora' files are imported.
+#
+from lora import SX1262, SX1276
+
+# Allow time calculations to deviate by up to this much as a ratio
+# of the expected value (due to floating point, etc.)
+TIME_ERROR_RATIO = 0.00001  # 0.001%
+
+
+def main():
+    sx1262 = SX1262(spi=DummySPI(), cs=DummyPin(), busy=DummyPin())
+    sx1276 = SX1276(spi=DummySPI(0x12), cs=DummyPin())
+
+    # Test case format is based on the layout of the Semtech Calculator UI:
+    #
+    # (modem_instance,
+    #  (modem settings),
+    #  [
+    #      ((packet config), (output values)),
+    #      ...
+    #  ],
+    # ),
+    #
+    # where each set of modem settings maps to zero or more packet config / output pairs
+    #
+    # - modem instance is sx1262 or sx1276 (SF5 & SF6 are different between these modems)
+    # - (modem settings) is (sf, bw (in khz), coding_rate, low_datarate_optimize)
+    # - (packet config) is (preamble_len, payload_len, explicit_header, crc_en)
+    # - (output values) is (total_symbols_excl, symbol_time in ms, time_on_air in ms)
+    #
+    # NOTE: total_symbols_excl is the value shown in the calculator output,
+    # which doesn't include 8 symbols of constant overhead between preamble and
+    # header+payload+crc. I think this is a bug in the Semtech calculator(!).
+    # These 8 symbols are included when the calculator derives the total time on
+    # air.
+    #
+    # NOTE ALSO: The "symbol_time" only depends on the modem settings so is
+    # repeated each group of test cases, and the "time_on_air" is the previous
+    # two output values multiplied (after accounting for the 8 symbols noted
+    # above). This repetition is deliberate to make the cases easier to read
+    # line-by-line when comparing to the calculator window.
+    CASES = [
+        (
+            sx1262,
+            (12, 500, 5, False),  # Calculator defaults when launching calculator
+            [
+                ((8, 1, True, True), (17.25, 8.192, 206.848)),  # Calculator defaults
+                ((12, 64, True, True), (71.25, 8.192, 649.216)),
+                ((8, 1, True, False), (12.25, 8.192, 165.888)),
+                ((8, 192, True, True), (172.25, 8.192, 1476.608)),
+                ((12, 16, False, False), (26.25, 8.192, 280.576)),
+            ],
+        ),
+        (
+            sx1262,
+            (8, 125, 6, False),
+            [
+                ((8, 1, True, True), (18.25, 2.048, 53.760)),
+                ((8, 2, True, True), (18.25, 2.048, 53.760)),
+                ((8, 2, True, False), (18.25, 2.048, 53.760)),
+                ((8, 3, True, True), (24.25, 2.048, 66.048)),
+                ((8, 3, True, False), (18.25, 2.048, 53.760)),
+                ((8, 4, True, True), (24.25, 2.048, 66.048)),
+                ((8, 4, True, False), (18.25, 2.048, 53.760)),
+                ((8, 5, True, True), (24.25, 2.048, 66.048)),
+                ((8, 5, True, False), (24.25, 2.048, 66.048)),
+                ((8, 253, True, True), (396.25, 2.048, 827.904)),
+                ((8, 253, True, False), (396.25, 2.048, 827.904)),
+                ((12, 5, False, True), (22.25, 2.048, 61.952)),
+                ((12, 5, False, False), (22.25, 2.048, 61.952)),
+                ((12, 10, False, True), (34.25, 2.048, 86.528)),
+                ((12, 253, False, True), (394.25, 2.048, 823.808)),
+            ],
+        ),
+        # quick check that sx1276 is the same as sx1262 for SF>6
+        (
+            sx1276,
+            (8, 125, 6, False),
+            [
+                ((8, 1, True, True), (18.25, 2.048, 53.760)),
+                ((8, 2, True, True), (18.25, 2.048, 53.760)),
+                ((12, 5, False, True), (22.25, 2.048, 61.952)),
+                ((12, 5, False, False), (22.25, 2.048, 61.952)),
+            ],
+        ),
+        # SF5 on SX1262
+        (
+            sx1262,
+            (5, 500, 5, False),
+            [
+                (
+                    (2, 1, True, False),
+                    (13.25, 0.064, 1.360),
+                ),  # Shortest possible LoRa packet?
+                ((2, 1, True, True), (18.25, 0.064, 1.680)),
+                ((12, 1, False, False), (18.25, 0.064, 1.680)),
+                ((12, 253, False, True), (523.25, 0.064, 34.000)),
+            ],
+        ),
+        (
+            sx1262,
+            (5, 125, 8, False),
+            [
+                ((12, 253, False, True), (826.25, 0.256, 213.568)),
+            ],
+        ),
+        # SF5 on SX1276
+        #
+        # Note: SF5 & SF6 settings are different between SX1262 & SX1276.
+        #
+        # There's no Semtech official calculator available for SX1276, so the
+        # symbol length is calculated by copying the formula from the datasheet
+        # "Time on air" section. Symbol time is the same as SX1262. Then the
+        # time on air is manually calculated by multiplying the two together.
+        #
+        # see the functions sx1276_num_payload and sx1276_num_symbols at end of this module
+        # for the actual functions used.
+        (
+            sx1276,
+            (5, 500, 5, False),
+            [
+                (
+                    (2, 1, True, False),
+                    (19.25 - 8, 0.064, 1.232),
+                ),  # Shortest possible LoRa packet?
+                ((2, 1, True, True), (24.25 - 8, 0.064, 1.552)),
+                ((12, 1, False, False), (24.25 - 8, 0.064, 1.552)),
+                ((12, 253, False, True), (534.25 - 8, 0.064, 34.192)),
+            ],
+        ),
+        (
+            sx1276,
+            (5, 125, 8, False),
+            [
+                ((12, 253, False, True), (840.25 - 8, 0.256, 215.104)),
+            ],
+        ),
+        (
+            sx1262,
+            (12, 7.81, 8, True),  # Slowest possible
+            [
+                ((128, 253, True, True), (540.25, 524.456, 287532.907)),
+                ((1000, 253, True, True), (1412.25, 524.456, 744858.387)),
+            ],
+        ),
+        (
+            sx1262,
+            (11, 10.42, 7, True),
+            [
+                ((25, 16, True, True), (57.25, 196.545, 12824.568)),
+                ((25, 16, False, False), (50.25, 196.545, 11448.752)),
+            ],
+        ),
+    ]
+
+    tests = 0
+    failures = set()
+    for modem, modem_settings, packets in CASES:
+        (sf, bw_khz, coding_rate, low_datarate_optimize) = modem_settings
+        print(
+            f"Modem config sf={sf} bw={bw_khz}kHz coding_rate=4/{coding_rate} "
+            + f"low_datarate_optimize={low_datarate_optimize}"
+        )
+
+        # We don't call configure() as the Dummy interfaces won't handle it,
+        # just update the BaseModem fields directly
+        modem._sf = sf
+        modem._bw_hz = int(bw_khz * 1000)
+        modem._coding_rate = coding_rate
+
+        # Low datarate optimize on/off is auto-configured in the current driver,
+        # check the automatic selection matches the test case from the
+        # calculator
+        if modem._get_ldr_en() != low_datarate_optimize:
+            print(
+                f" -- ERROR: Test case has low_datarate_optimize={low_datarate_optimize} "
+                + f"but modem selects {modem._get_ldr_en()}"
+            )
+            failures += 1
+            continue  # results will not match so don't run any of the packet test cases
+
+        for packet_config, expected_outputs in packets:
+            preamble_len, payload_len, explicit_header, crc_en = packet_config
+            print(
+                f" -- preamble_len={preamble_len} payload_len={payload_len} "
+                + f"explicit_header={explicit_header} crc_en={crc_en}"
+            )
+            modem._preamble_len = preamble_len
+            modem._implicit_header = not explicit_header  # opposite logic to calculator
+            modem._crc_en = crc_en
+
+            # Now calculate the symbol length and times and compare with the expected valuesd
+            (
+                expected_symbols,
+                expected_symbol_time,
+                expected_time_on_air,
+            ) = expected_outputs
+
+            print(f" ---- calculator shows total length {expected_symbols}")
+            expected_symbols += 8  # Account for the calculator bug mentioned in the comment above
+
+            n_symbols = modem.get_n_symbols_x4(payload_len) / 4.0
+            symbol_time_us = modem._get_t_sym_us()
+            time_on_air_us = modem.get_time_on_air_us(payload_len)
+
+            tests += 1
+
+            if n_symbols == expected_symbols:
+                print(f" ---- symbols {n_symbols}")
+            else:
+                print(f" ---- SYMBOL COUNT ERROR expected {expected_symbols} got {n_symbols}")
+                failures.add((modem, modem_settings, packet_config))
+
+            max_error = expected_symbol_time * 1000 * TIME_ERROR_RATIO
+            if abs(int(expected_symbol_time * 1000) - symbol_time_us) <= max_error:
+                print(f" ---- symbol time {expected_symbol_time}ms")
+            else:
+                print(
+                    f" ---- SYMBOL TIME ERROR expected {expected_symbol_time}ms "
+                    + f"got {symbol_time_us}us"
+                )
+                failures.add((modem, modem_settings, packet_config))
+
+            max_error = expected_time_on_air * 1000 * TIME_ERROR_RATIO
+            if abs(int(expected_time_on_air * 1000) - time_on_air_us) <= max_error:
+                print(f" ---- time on air {expected_time_on_air}ms")
+            else:
+                print(
+                    f" ---- TIME ON AIR ERROR expected {expected_time_on_air}ms "
+                    + f"got {time_on_air_us}us"
+                )
+                failures.add((modem, modem_settings, packet_config))
+
+        print("************************")
+
+    print(f"\n{len(failures)}/{tests} tests failed")
+    if failures:
+        print("FAILURES:")
+        for f in failures:
+            print(f)
+        raise SystemExit(1)
+    print("SUCCESS")
+
+
+class DummySPI:
+    # Dummy SPI Interface allows us to use normal constructors
+    #
+    # Reading will always return the 'always_read' value
+    def __init__(self, always_read=0x00):
+        self.always_read = always_read
+
+    def write_readinto(self, _wrbuf, rdbuf):
+        for i in range(len(rdbuf)):
+            rdbuf[i] = self.always_read
+
+
+class DummyPin:
+    # Dummy Pin interface allows us to use normal constructors
+    def __init__(self):
+        pass
+
+    def __call__(self, _=None):
+        pass
+
+
+# Copies of the functions used to calculate SX1276 SF5, SF6 test case symbol counts.
+# (see comments above).
+#
+# These are written as closely to the SX1276 datasheet "Time on air" section as
+# possible, quite different from the BaseModem implementation.
+
+
+def sx1276_n_payload(pl, sf, ih, de, cr, crc):
+    import math
+
+    ceil_arg = 8 * pl - 4 * sf + 28 + 16 * crc - 20 * ih
+    ceil_arg /= 4 * (sf - 2 * de)
+    return 8 + max(math.ceil(ceil_arg) * (cr + 4), 0)
+
+
+def sx1276_n_syms(pl, sf, ih, de, cr, crc, n_preamble):
+    return sx1276_n_payload(pl, sf, ih, de, cr, crc) + n_preamble + 4.25
+
+
+if __name__ == "__main__":
+    main()

From 2fba6b8644868c1acd3dc823ca3f203b633635b1 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Mon, 16 Jan 2023 13:39:29 +1100
Subject: [PATCH 164/343] lora: Workaround SX1262 bug with GetStatus.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index e695f4a4d..ada3616c6 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -24,6 +24,7 @@
 _CMD_GET_ERROR = const(0x17)
 _CMD_GET_IRQ_STATUS = const(0x12)  # args: (r) Status, IrqStatus
 _CMD_GET_RX_BUFFER_STATUS = const(0x13)  # args: (r) Status, RxPayloadLength, RxBufferPointer
+# NOTE: _CMD_GET_STATUS seems to have an issue, see _get_status() function below.
 _CMD_GET_STATUS = const(0xC0)  # args: (r) Status
 _CMD_GET_PACKET_STATUS = const(0x14)
 _CMD_READ_REGISTER = const(0x1D)  # args: addr (2b), status, (r) Data0 ... DataN
@@ -296,8 +297,21 @@ def _decode_status(self, raw_status, check_errors=True):
         return (mode, cmd)
 
     def _get_status(self):
-        # Issue the GetStatus command and return the decoded status of (mode value, command status)
-        res = self._cmd("B", _CMD_GET_STATUS, n_read=1)[0]
+        # Issue the GetStatus command and return the decoded status of (mode
+        # value, command status)
+        #
+        # Due to what appears to be a silicon bug, we send GetIrqStatus here
+        # instead of GetStatus. It seems that there is some specific sequence
+        # where sending command GetStatus to the chip immediately after SetRX
+        # (mode 5) will trip it it into an endless TX (mode 6) for no apparent
+        # reason!
+        #
+        # It doesn't seem to be timing dependent, all that's needed is that
+        # ordering (and the modem works fine otherwise).
+        #
+        # As a workaround we send the GetIrqStatus command and read an extra two
+        # bytes that are then ignored...
+        res = self._cmd("B", _CMD_GET_IRQ_STATUS, n_read=3)[0]
         return self._decode_status(res)
 
     def _check_error(self):

From da5ddfc6e21e8b2d680a74826bcf2652aa8e75ee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 2 Jun 2023 00:12:28 +1000
Subject: [PATCH 165/343] hashlib: Refactor, split, and optimise.

This splits out each algorithm into its own extension package, so that only
the necessary algorithms can be installed.

This allows for a significant reduction in RAM and flash. i.e. previously
installing hashlib meant that all algorithms were imported.

Additionally ensures that any built-in hash algorithms (from uhashlib) are
still exposed (e.g. `md5`), and retains the existing behavior to use the
built-in preferentially.

Also includes a refactoring of the algorithms to reduce code size and
reduce the number of allocations they do as well as using bytearrays in
place of list-of-int where possible.

Add more comprehensive tests (using unittest).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../hashlib-core/hashlib/__init__.py          |  29 +
 python-stdlib/hashlib-core/hashlib/_sha.py    |  42 ++
 python-stdlib/hashlib-core/manifest.py        |   3 +
 .../hashlib-sha224/hashlib/_sha224.py         |  18 +
 python-stdlib/hashlib-sha224/manifest.py      |   4 +
 .../hashlib-sha256/hashlib/_sha256.py         | 194 +++++++
 python-stdlib/hashlib-sha256/manifest.py      |   4 +
 .../hashlib-sha384/hashlib/_sha384.py         |  18 +
 python-stdlib/hashlib-sha384/manifest.py      |   4 +
 .../hashlib-sha512/hashlib/_sha512.py         | 393 +++++++++++++
 python-stdlib/hashlib-sha512/manifest.py      |   4 +
 python-stdlib/hashlib/hashlib/__init__.py     |  24 -
 python-stdlib/hashlib/hashlib/_sha224.py      |   1 -
 python-stdlib/hashlib/hashlib/_sha256.py      | 301 ----------
 python-stdlib/hashlib/hashlib/_sha384.py      |   1 -
 python-stdlib/hashlib/hashlib/_sha512.py      | 519 ------------------
 python-stdlib/hashlib/manifest.py             |   9 +-
 python-stdlib/hashlib/test_hashlib.py         |  35 --
 python-stdlib/hashlib/tests/test_new.py       |  32 ++
 python-stdlib/hashlib/tests/test_sha256.py    |  83 +++
 python-stdlib/hashlib/tests/test_sha512.py    |  89 +++
 21 files changed, 924 insertions(+), 883 deletions(-)
 create mode 100644 python-stdlib/hashlib-core/hashlib/__init__.py
 create mode 100644 python-stdlib/hashlib-core/hashlib/_sha.py
 create mode 100644 python-stdlib/hashlib-core/manifest.py
 create mode 100644 python-stdlib/hashlib-sha224/hashlib/_sha224.py
 create mode 100644 python-stdlib/hashlib-sha224/manifest.py
 create mode 100644 python-stdlib/hashlib-sha256/hashlib/_sha256.py
 create mode 100644 python-stdlib/hashlib-sha256/manifest.py
 create mode 100644 python-stdlib/hashlib-sha384/hashlib/_sha384.py
 create mode 100644 python-stdlib/hashlib-sha384/manifest.py
 create mode 100644 python-stdlib/hashlib-sha512/hashlib/_sha512.py
 create mode 100644 python-stdlib/hashlib-sha512/manifest.py
 delete mode 100644 python-stdlib/hashlib/hashlib/__init__.py
 delete mode 100644 python-stdlib/hashlib/hashlib/_sha224.py
 delete mode 100644 python-stdlib/hashlib/hashlib/_sha256.py
 delete mode 100644 python-stdlib/hashlib/hashlib/_sha384.py
 delete mode 100644 python-stdlib/hashlib/hashlib/_sha512.py
 delete mode 100644 python-stdlib/hashlib/test_hashlib.py
 create mode 100644 python-stdlib/hashlib/tests/test_new.py
 create mode 100644 python-stdlib/hashlib/tests/test_sha256.py
 create mode 100644 python-stdlib/hashlib/tests/test_sha512.py

diff --git a/python-stdlib/hashlib-core/hashlib/__init__.py b/python-stdlib/hashlib-core/hashlib/__init__.py
new file mode 100644
index 000000000..932b6f647
--- /dev/null
+++ b/python-stdlib/hashlib-core/hashlib/__init__.py
@@ -0,0 +1,29 @@
+# Use built-in algorithms preferentially (on many ports this is just sha256).
+try:
+    from uhashlib import *
+except ImportError:
+    pass
+
+
+# Add missing algorithms based on installed extensions.
+def _init():
+    for algo in ("sha224", "sha256", "sha384", "sha512"):
+        if algo not in globals():
+            try:
+                # from ._{algo} import {algo}
+                c = __import__("_" + algo, None, None, (), 1)
+                globals()[algo] = getattr(c, algo)
+            except ImportError:
+                pass
+
+
+_init()
+del _init
+
+
+def new(algo, data=b""):
+    try:
+        c = globals()[algo]
+        return c(data)
+    except KeyError:
+        raise ValueError(algo)
diff --git a/python-stdlib/hashlib-core/hashlib/_sha.py b/python-stdlib/hashlib-core/hashlib/_sha.py
new file mode 100644
index 000000000..4e7339c76
--- /dev/null
+++ b/python-stdlib/hashlib-core/hashlib/_sha.py
@@ -0,0 +1,42 @@
+# MIT license; Copyright (c) 2023 Jim Mussared
+# Originally ported from CPython by Paul Sokolovsky
+
+
+# Base class for SHA implementations, which must provide:
+#   .digestsize & .digest_size
+#   .block_size
+#   ._iv
+#   ._update
+#   ._final
+class sha:
+    def __init__(self, s=None):
+        self._digest = self._iv[:]
+        self._count_lo = 0
+        self._count_hi = 0
+        self._data = bytearray(self.block_size)
+        self._local = 0
+        self._digestsize = self.digest_size
+        if s:
+            self.update(s)
+
+    def update(self, s):
+        if isinstance(s, str):
+            s = s.encode("ascii")
+        else:
+            s = bytes(s)
+        self._update(s)
+
+    def digest(self):
+        return self.copy()._final()[: self._digestsize]
+
+    def hexdigest(self):
+        return "".join(["%.2x" % i for i in self.digest()])
+
+    def copy(self):
+        new = type(self)()
+        new._digest = self._digest[:]
+        new._count_lo = self._count_lo
+        new._count_hi = self._count_hi
+        new._data = self._data[:]
+        new._local = self._local
+        return new
diff --git a/python-stdlib/hashlib-core/manifest.py b/python-stdlib/hashlib-core/manifest.py
new file mode 100644
index 000000000..21f2c2674
--- /dev/null
+++ b/python-stdlib/hashlib-core/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="1.0")
+
+package("hashlib")
diff --git a/python-stdlib/hashlib-sha224/hashlib/_sha224.py b/python-stdlib/hashlib-sha224/hashlib/_sha224.py
new file mode 100644
index 000000000..4f6dc7181
--- /dev/null
+++ b/python-stdlib/hashlib-sha224/hashlib/_sha224.py
@@ -0,0 +1,18 @@
+# MIT license; Copyright (c) 2023 Jim Mussared
+# Originally ported from CPython by Paul Sokolovsky
+
+from ._sha256 import sha256
+
+
+class sha224(sha256):
+    digest_size = digestsize = 28
+    _iv = [
+        0xC1059ED8,
+        0x367CD507,
+        0x3070DD17,
+        0xF70E5939,
+        0xFFC00B31,
+        0x68581511,
+        0x64F98FA7,
+        0xBEFA4FA4,
+    ]
diff --git a/python-stdlib/hashlib-sha224/manifest.py b/python-stdlib/hashlib-sha224/manifest.py
new file mode 100644
index 000000000..d329c8c41
--- /dev/null
+++ b/python-stdlib/hashlib-sha224/manifest.py
@@ -0,0 +1,4 @@
+metadata(version="1.0", description="Adds the SHA224 hash algorithm to hashlib.")
+
+require("hashlib-sha256")
+package("hashlib")
diff --git a/python-stdlib/hashlib-sha256/hashlib/_sha256.py b/python-stdlib/hashlib-sha256/hashlib/_sha256.py
new file mode 100644
index 000000000..43fc1522b
--- /dev/null
+++ b/python-stdlib/hashlib-sha256/hashlib/_sha256.py
@@ -0,0 +1,194 @@
+# MIT license; Copyright (c) 2023 Jim Mussared
+# Originally ported from CPython by Paul Sokolovsky
+
+from ._sha import sha
+
+_SHA_BLOCKSIZE = const(64)
+
+
+ROR = lambda x, y: (((x & 0xFFFFFFFF) >> (y & 31)) | (x << (32 - (y & 31)))) & 0xFFFFFFFF
+Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
+Maj = lambda x, y, z: (((x | y) & z) | (x & y))
+S = lambda x, n: ROR(x, n)
+R = lambda x, n: (x & 0xFFFFFFFF) >> n
+Sigma0 = lambda x: (S(x, 2) ^ S(x, 13) ^ S(x, 22))
+Sigma1 = lambda x: (S(x, 6) ^ S(x, 11) ^ S(x, 25))
+Gamma0 = lambda x: (S(x, 7) ^ S(x, 18) ^ R(x, 3))
+Gamma1 = lambda x: (S(x, 17) ^ S(x, 19) ^ R(x, 10))
+
+
+class sha256(sha):
+    digest_size = digestsize = 32
+    block_size = _SHA_BLOCKSIZE
+    _iv = [
+        0x6A09E667,
+        0xBB67AE85,
+        0x3C6EF372,
+        0xA54FF53A,
+        0x510E527F,
+        0x9B05688C,
+        0x1F83D9AB,
+        0x5BE0CD19,
+    ]
+
+    def _transform(self):
+        W = []
+
+        d = self._data
+        for i in range(0, 16):
+            W.append((d[4 * i] << 24) + (d[4 * i + 1] << 16) + (d[4 * i + 2] << 8) + d[4 * i + 3])
+
+        for i in range(16, 64):
+            W.append((Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xFFFFFFFF)
+
+        ss = self._digest[:]
+
+        def RND(a, b, c, d, e, f, g, h, i, ki):
+            t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i]
+            t1 = Sigma0(a) + Maj(a, b, c)
+            d += t0
+            h = t0 + t1
+            return d & 0xFFFFFFFF, h & 0xFFFFFFFF
+
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 0, 0x428A2F98)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 1, 0x71374491)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 2, 0xB5C0FBCF)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 3, 0xE9B5DBA5)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 4, 0x3956C25B)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 5, 0x59F111F1)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 6, 0x923F82A4)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 7, 0xAB1C5ED5)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 8, 0xD807AA98)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 9, 0x12835B01)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 10, 0x243185BE)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 11, 0x550C7DC3)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 12, 0x72BE5D74)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 13, 0x80DEB1FE)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 14, 0x9BDC06A7)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 15, 0xC19BF174)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 16, 0xE49B69C1)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 17, 0xEFBE4786)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 18, 0x0FC19DC6)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 19, 0x240CA1CC)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 20, 0x2DE92C6F)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 21, 0x4A7484AA)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 22, 0x5CB0A9DC)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 23, 0x76F988DA)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 24, 0x983E5152)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 25, 0xA831C66D)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 26, 0xB00327C8)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 27, 0xBF597FC7)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 28, 0xC6E00BF3)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 29, 0xD5A79147)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 30, 0x06CA6351)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 31, 0x14292967)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 32, 0x27B70A85)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 33, 0x2E1B2138)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 34, 0x4D2C6DFC)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 35, 0x53380D13)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 36, 0x650A7354)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 37, 0x766A0ABB)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 38, 0x81C2C92E)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 39, 0x92722C85)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 40, 0xA2BFE8A1)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 41, 0xA81A664B)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 42, 0xC24B8B70)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 43, 0xC76C51A3)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 44, 0xD192E819)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 45, 0xD6990624)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 46, 0xF40E3585)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 47, 0x106AA070)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 48, 0x19A4C116)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 49, 0x1E376C08)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 50, 0x2748774C)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 51, 0x34B0BCB5)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 52, 0x391C0CB3)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 53, 0x4ED8AA4A)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 54, 0x5B9CCA4F)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 55, 0x682E6FF3)
+        ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 56, 0x748F82EE)
+        ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 57, 0x78A5636F)
+        ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 58, 0x84C87814)
+        ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 59, 0x8CC70208)
+        ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 60, 0x90BEFFFA)
+        ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 61, 0xA4506CEB)
+        ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 62, 0xBEF9A3F7)
+        ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 63, 0xC67178F2)
+
+        for i in range(len(self._digest)):
+            self._digest[i] = (self._digest[i] + ss[i]) & 0xFFFFFFFF
+
+    def _update(self, buffer):
+        if isinstance(buffer, str):
+            raise TypeError("Unicode strings must be encoded before hashing")
+        count = len(buffer)
+        buffer_idx = 0
+        clo = (self._count_lo + (count << 3)) & 0xFFFFFFFF
+        if clo < self._count_lo:
+            self._count_hi += 1
+        self._count_lo = clo
+
+        self._count_hi += count >> 29
+
+        if self._local:
+            i = _SHA_BLOCKSIZE - self._local
+            if i > count:
+                i = count
+
+            # copy buffer
+            for x in enumerate(buffer[buffer_idx : buffer_idx + i]):
+                self._data[self._local + x[0]] = x[1]
+
+            count -= i
+            buffer_idx += i
+
+            self._local += i
+            if self._local == _SHA_BLOCKSIZE:
+                self._transform()
+                self._local = 0
+            else:
+                return
+
+        while count >= _SHA_BLOCKSIZE:
+            # copy buffer
+            self._data = bytearray(buffer[buffer_idx : buffer_idx + _SHA_BLOCKSIZE])
+            count -= _SHA_BLOCKSIZE
+            buffer_idx += _SHA_BLOCKSIZE
+            self._transform()
+
+        # copy buffer
+        pos = self._local
+        self._data[pos : pos + count] = buffer[buffer_idx : buffer_idx + count]
+        self._local = count
+
+    def _final(self):
+        lo_bit_count = self._count_lo
+        hi_bit_count = self._count_hi
+        count = (lo_bit_count >> 3) & 0x3F
+        self._data[count] = 0x80
+        count += 1
+        if count > _SHA_BLOCKSIZE - 8:
+            # zero the bytes in data after the count
+            self._data = self._data[:count] + bytes(_SHA_BLOCKSIZE - count)
+            self._transform()
+            # zero bytes in data
+            self._data = bytearray(_SHA_BLOCKSIZE)
+        else:
+            self._data = self._data[:count] + bytes(_SHA_BLOCKSIZE - count)
+
+        self._data[56] = (hi_bit_count >> 24) & 0xFF
+        self._data[57] = (hi_bit_count >> 16) & 0xFF
+        self._data[58] = (hi_bit_count >> 8) & 0xFF
+        self._data[59] = (hi_bit_count >> 0) & 0xFF
+        self._data[60] = (lo_bit_count >> 24) & 0xFF
+        self._data[61] = (lo_bit_count >> 16) & 0xFF
+        self._data[62] = (lo_bit_count >> 8) & 0xFF
+        self._data[63] = (lo_bit_count >> 0) & 0xFF
+
+        self._transform()
+
+        dig = bytearray()
+        for i in self._digest:
+            for j in range(4):
+                dig.append((i >> ((3 - j) * 8)) & 0xFF)
+        return dig
diff --git a/python-stdlib/hashlib-sha256/manifest.py b/python-stdlib/hashlib-sha256/manifest.py
new file mode 100644
index 000000000..7790ff6a2
--- /dev/null
+++ b/python-stdlib/hashlib-sha256/manifest.py
@@ -0,0 +1,4 @@
+metadata(version="1.0", description="Adds the SHA256 hash algorithm to hashlib.")
+
+require("hashlib-core")
+package("hashlib")
diff --git a/python-stdlib/hashlib-sha384/hashlib/_sha384.py b/python-stdlib/hashlib-sha384/hashlib/_sha384.py
new file mode 100644
index 000000000..fe15a10af
--- /dev/null
+++ b/python-stdlib/hashlib-sha384/hashlib/_sha384.py
@@ -0,0 +1,18 @@
+# MIT license; Copyright (c) 2023 Jim Mussared
+# Originally ported from CPython by Paul Sokolovsky
+
+from ._sha512 import sha512
+
+
+class sha384(sha512):
+    digest_size = digestsize = 48
+    _iv = [
+        0xCBBB9D5DC1059ED8,
+        0x629A292A367CD507,
+        0x9159015A3070DD17,
+        0x152FECD8F70E5939,
+        0x67332667FFC00B31,
+        0x8EB44A8768581511,
+        0xDB0C2E0D64F98FA7,
+        0x47B5481DBEFA4FA4,
+    ]
diff --git a/python-stdlib/hashlib-sha384/manifest.py b/python-stdlib/hashlib-sha384/manifest.py
new file mode 100644
index 000000000..aaf9b247b
--- /dev/null
+++ b/python-stdlib/hashlib-sha384/manifest.py
@@ -0,0 +1,4 @@
+metadata(version="1.0", description="Adds the SHA384 hash algorithm to hashlib.")
+
+require("hashlib-sha512")
+package("hashlib")
diff --git a/python-stdlib/hashlib-sha512/hashlib/_sha512.py b/python-stdlib/hashlib-sha512/hashlib/_sha512.py
new file mode 100644
index 000000000..44e8656a6
--- /dev/null
+++ b/python-stdlib/hashlib-sha512/hashlib/_sha512.py
@@ -0,0 +1,393 @@
+# MIT license; Copyright (c) 2023 Jim Mussared
+# Originally ported from CPython by Paul Sokolovsky
+
+from ._sha import sha
+
+_SHA_BLOCKSIZE = const(128)
+
+
+ROR64 = (
+    lambda x, y: (((x & 0xFFFFFFFFFFFFFFFF) >> (y & 63)) | (x << (64 - (y & 63))))
+    & 0xFFFFFFFFFFFFFFFF
+)
+Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
+Maj = lambda x, y, z: (((x | y) & z) | (x & y))
+S = lambda x, n: ROR64(x, n)
+R = lambda x, n: (x & 0xFFFFFFFFFFFFFFFF) >> n
+Sigma0 = lambda x: (S(x, 28) ^ S(x, 34) ^ S(x, 39))
+Sigma1 = lambda x: (S(x, 14) ^ S(x, 18) ^ S(x, 41))
+Gamma0 = lambda x: (S(x, 1) ^ S(x, 8) ^ R(x, 7))
+Gamma1 = lambda x: (S(x, 19) ^ S(x, 61) ^ R(x, 6))
+
+
+class sha512(sha):
+    digest_size = digestsize = 64
+    block_size = _SHA_BLOCKSIZE
+    _iv = [
+        0x6A09E667F3BCC908,
+        0xBB67AE8584CAA73B,
+        0x3C6EF372FE94F82B,
+        0xA54FF53A5F1D36F1,
+        0x510E527FADE682D1,
+        0x9B05688C2B3E6C1F,
+        0x1F83D9ABFB41BD6B,
+        0x5BE0CD19137E2179,
+    ]
+
+    def _transform(self):
+        W = []
+
+        d = self._data
+        for i in range(0, 16):
+            W.append(
+                (d[8 * i] << 56)
+                + (d[8 * i + 1] << 48)
+                + (d[8 * i + 2] << 40)
+                + (d[8 * i + 3] << 32)
+                + (d[8 * i + 4] << 24)
+                + (d[8 * i + 5] << 16)
+                + (d[8 * i + 6] << 8)
+                + d[8 * i + 7]
+            )
+
+        for i in range(16, 80):
+            W.append(
+                (Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xFFFFFFFFFFFFFFFF
+            )
+
+        ss = self._digest[:]
+
+        def RND(a, b, c, d, e, f, g, h, i, ki):
+            t0 = (h + Sigma1(e) + Ch(e, f, g) + ki + W[i]) & 0xFFFFFFFFFFFFFFFF
+            t1 = (Sigma0(a) + Maj(a, b, c)) & 0xFFFFFFFFFFFFFFFF
+            d = (d + t0) & 0xFFFFFFFFFFFFFFFF
+            h = (t0 + t1) & 0xFFFFFFFFFFFFFFFF
+            return d & 0xFFFFFFFFFFFFFFFF, h & 0xFFFFFFFFFFFFFFFF
+
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 0, 0x428A2F98D728AE22
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 1, 0x7137449123EF65CD
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 2, 0xB5C0FBCFEC4D3B2F
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 3, 0xE9B5DBA58189DBBC
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 4, 0x3956C25BF348B538
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 5, 0x59F111F1B605D019
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 6, 0x923F82A4AF194F9B
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 7, 0xAB1C5ED5DA6D8118
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 8, 0xD807AA98A3030242
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 9, 0x12835B0145706FBE
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 10, 0x243185BE4EE4B28C
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 11, 0x550C7DC3D5FFB4E2
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 12, 0x72BE5D74F27B896F
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 13, 0x80DEB1FE3B1696B1
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 14, 0x9BDC06A725C71235
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 15, 0xC19BF174CF692694
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 16, 0xE49B69C19EF14AD2
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 17, 0xEFBE4786384F25E3
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 18, 0x0FC19DC68B8CD5B5
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 19, 0x240CA1CC77AC9C65
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 20, 0x2DE92C6F592B0275
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 21, 0x4A7484AA6EA6E483
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 22, 0x5CB0A9DCBD41FBD4
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 23, 0x76F988DA831153B5
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 24, 0x983E5152EE66DFAB
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 25, 0xA831C66D2DB43210
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 26, 0xB00327C898FB213F
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 27, 0xBF597FC7BEEF0EE4
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 28, 0xC6E00BF33DA88FC2
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 29, 0xD5A79147930AA725
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 30, 0x06CA6351E003826F
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 31, 0x142929670A0E6E70
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 32, 0x27B70A8546D22FFC
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 33, 0x2E1B21385C26C926
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 34, 0x4D2C6DFC5AC42AED
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 35, 0x53380D139D95B3DF
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 36, 0x650A73548BAF63DE
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 37, 0x766A0ABB3C77B2A8
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 38, 0x81C2C92E47EDAEE6
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 39, 0x92722C851482353B
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 40, 0xA2BFE8A14CF10364
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 41, 0xA81A664BBC423001
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 42, 0xC24B8B70D0F89791
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 43, 0xC76C51A30654BE30
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 44, 0xD192E819D6EF5218
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 45, 0xD69906245565A910
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 46, 0xF40E35855771202A
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 47, 0x106AA07032BBD1B8
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 48, 0x19A4C116B8D2D0C8
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 49, 0x1E376C085141AB53
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 50, 0x2748774CDF8EEB99
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 51, 0x34B0BCB5E19B48A8
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 52, 0x391C0CB3C5C95A63
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 53, 0x4ED8AA4AE3418ACB
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 54, 0x5B9CCA4F7763E373
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 55, 0x682E6FF3D6B2B8A3
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 56, 0x748F82EE5DEFB2FC
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 57, 0x78A5636F43172F60
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 58, 0x84C87814A1F0AB72
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 59, 0x8CC702081A6439EC
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 60, 0x90BEFFFA23631E28
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 61, 0xA4506CEBDE82BDE9
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 62, 0xBEF9A3F7B2C67915
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 63, 0xC67178F2E372532B
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 64, 0xCA273ECEEA26619C
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 65, 0xD186B8C721C0C207
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 66, 0xEADA7DD6CDE0EB1E
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 67, 0xF57D4F7FEE6ED178
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 68, 0x06F067AA72176FBA
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 69, 0x0A637DC5A2C898A6
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 70, 0x113F9804BEF90DAE
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 71, 0x1B710B35131C471B
+        )
+        ss[3], ss[7] = RND(
+            ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 72, 0x28DB77F523047D84
+        )
+        ss[2], ss[6] = RND(
+            ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 73, 0x32CAAB7B40C72493
+        )
+        ss[1], ss[5] = RND(
+            ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 74, 0x3C9EBE0A15C9BEBC
+        )
+        ss[0], ss[4] = RND(
+            ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 75, 0x431D67C49C100D4C
+        )
+        ss[7], ss[3] = RND(
+            ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 76, 0x4CC5D4BECB3E42B6
+        )
+        ss[6], ss[2] = RND(
+            ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 77, 0x597F299CFC657E2A
+        )
+        ss[5], ss[1] = RND(
+            ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 78, 0x5FCB6FAB3AD6FAEC
+        )
+        ss[4], ss[0] = RND(
+            ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 79, 0x6C44198C4A475817
+        )
+
+        for i in range(len(self._digest)):
+            self._digest[i] = (self._digest[i] + ss[i]) & 0xFFFFFFFFFFFFFFFF
+
+    def _update(self, buffer):
+        if isinstance(buffer, str):
+            raise TypeError("Unicode strings must be encoded before hashing")
+        count = len(buffer)
+        buffer_idx = 0
+        clo = (self._count_lo + (count << 3)) & 0xFFFFFFFF
+        if clo < self._count_lo:
+            self._count_hi += 1
+        self._count_lo = clo
+
+        self._count_hi += count >> 29
+
+        if self._local:
+            i = _SHA_BLOCKSIZE - self._local
+            if i > count:
+                i = count
+
+            # copy buffer
+            for x in enumerate(buffer[buffer_idx : buffer_idx + i]):
+                self._data[self._local + x[0]] = x[1]
+
+            count -= i
+            buffer_idx += i
+
+            self._local += i
+            if self._local == _SHA_BLOCKSIZE:
+                self._transform()
+                self._local = 0
+            else:
+                return
+
+        while count >= _SHA_BLOCKSIZE:
+            # copy buffer
+            self._data = bytearray(buffer[buffer_idx : buffer_idx + _SHA_BLOCKSIZE])
+            count -= _SHA_BLOCKSIZE
+            buffer_idx += _SHA_BLOCKSIZE
+            self._transform()
+
+        # copy buffer
+        pos = self._local
+        self._data[pos : pos + count] = buffer[buffer_idx : buffer_idx + count]
+        self._local = count
+
+    def _final(self):
+        lo_bit_count = self._count_lo
+        hi_bit_count = self._count_hi
+        count = (lo_bit_count >> 3) & 0x7F
+        self._data[count] = 0x80
+        count += 1
+        if count > _SHA_BLOCKSIZE - 16:
+            # zero the bytes in data after the count
+            self._data = self._data[:count] + bytes(_SHA_BLOCKSIZE - count)
+            self._transform()
+            # zero bytes in data
+            self._data = bytearray(_SHA_BLOCKSIZE)
+        else:
+            self._data = self._data[:count] + bytes(_SHA_BLOCKSIZE - count)
+
+        self._data[112] = 0
+        self._data[113] = 0
+        self._data[114] = 0
+        self._data[115] = 0
+        self._data[116] = 0
+        self._data[117] = 0
+        self._data[118] = 0
+        self._data[119] = 0
+
+        self._data[120] = (hi_bit_count >> 24) & 0xFF
+        self._data[121] = (hi_bit_count >> 16) & 0xFF
+        self._data[122] = (hi_bit_count >> 8) & 0xFF
+        self._data[123] = (hi_bit_count >> 0) & 0xFF
+        self._data[124] = (lo_bit_count >> 24) & 0xFF
+        self._data[125] = (lo_bit_count >> 16) & 0xFF
+        self._data[126] = (lo_bit_count >> 8) & 0xFF
+        self._data[127] = (lo_bit_count >> 0) & 0xFF
+
+        self._transform()
+
+        dig = bytearray()
+        for i in self._digest:
+            for j in range(8):
+                dig.append((i >> ((7 - j) * 8)) & 0xFF)
+        return dig
diff --git a/python-stdlib/hashlib-sha512/manifest.py b/python-stdlib/hashlib-sha512/manifest.py
new file mode 100644
index 000000000..118eb085f
--- /dev/null
+++ b/python-stdlib/hashlib-sha512/manifest.py
@@ -0,0 +1,4 @@
+metadata(version="1.0", description="Adds the SHA512 hash algorithm to hashlib.")
+
+require("hashlib-core")
+package("hashlib")
diff --git a/python-stdlib/hashlib/hashlib/__init__.py b/python-stdlib/hashlib/hashlib/__init__.py
deleted file mode 100644
index d7afbf819..000000000
--- a/python-stdlib/hashlib/hashlib/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-try:
-    import uhashlib
-except ImportError:
-    uhashlib = None
-
-
-def init():
-    for i in ("sha1", "sha224", "sha256", "sha384", "sha512"):
-        c = getattr(uhashlib, i, None)
-        if not c:
-            c = __import__("_" + i, None, None, (), 1)
-            c = getattr(c, i)
-        globals()[i] = c
-
-
-init()
-
-
-def new(algo, data=b""):
-    try:
-        c = globals()[algo]
-        return c(data)
-    except KeyError:
-        raise ValueError(algo)
diff --git a/python-stdlib/hashlib/hashlib/_sha224.py b/python-stdlib/hashlib/hashlib/_sha224.py
deleted file mode 100644
index 634343b50..000000000
--- a/python-stdlib/hashlib/hashlib/_sha224.py
+++ /dev/null
@@ -1 +0,0 @@
-from ._sha256 import sha224
diff --git a/python-stdlib/hashlib/hashlib/_sha256.py b/python-stdlib/hashlib/hashlib/_sha256.py
deleted file mode 100644
index e4bdeca4e..000000000
--- a/python-stdlib/hashlib/hashlib/_sha256.py
+++ /dev/null
@@ -1,301 +0,0 @@
-SHA_BLOCKSIZE = 64
-SHA_DIGESTSIZE = 32
-
-
-def new_shaobject():
-    return {
-        "digest": [0] * 8,
-        "count_lo": 0,
-        "count_hi": 0,
-        "data": [0] * SHA_BLOCKSIZE,
-        "local": 0,
-        "digestsize": 0,
-    }
-
-
-ROR = lambda x, y: (((x & 0xFFFFFFFF) >> (y & 31)) | (x << (32 - (y & 31)))) & 0xFFFFFFFF
-Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
-Maj = lambda x, y, z: (((x | y) & z) | (x & y))
-S = lambda x, n: ROR(x, n)
-R = lambda x, n: (x & 0xFFFFFFFF) >> n
-Sigma0 = lambda x: (S(x, 2) ^ S(x, 13) ^ S(x, 22))
-Sigma1 = lambda x: (S(x, 6) ^ S(x, 11) ^ S(x, 25))
-Gamma0 = lambda x: (S(x, 7) ^ S(x, 18) ^ R(x, 3))
-Gamma1 = lambda x: (S(x, 17) ^ S(x, 19) ^ R(x, 10))
-
-
-def sha_transform(sha_info):
-    W = []
-
-    d = sha_info["data"]
-    for i in range(0, 16):
-        W.append((d[4 * i] << 24) + (d[4 * i + 1] << 16) + (d[4 * i + 2] << 8) + d[4 * i + 3])
-
-    for i in range(16, 64):
-        W.append((Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xFFFFFFFF)
-
-    ss = sha_info["digest"][:]
-
-    def RND(a, b, c, d, e, f, g, h, i, ki):
-        t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i]
-        t1 = Sigma0(a) + Maj(a, b, c)
-        d += t0
-        h = t0 + t1
-        return d & 0xFFFFFFFF, h & 0xFFFFFFFF
-
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 0, 0x428A2F98)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 1, 0x71374491)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 2, 0xB5C0FBCF)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 3, 0xE9B5DBA5)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 4, 0x3956C25B)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 5, 0x59F111F1)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 6, 0x923F82A4)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 7, 0xAB1C5ED5)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 8, 0xD807AA98)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 9, 0x12835B01)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 10, 0x243185BE)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 11, 0x550C7DC3)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 12, 0x72BE5D74)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 13, 0x80DEB1FE)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 14, 0x9BDC06A7)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 15, 0xC19BF174)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 16, 0xE49B69C1)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 17, 0xEFBE4786)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 18, 0x0FC19DC6)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 19, 0x240CA1CC)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 20, 0x2DE92C6F)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 21, 0x4A7484AA)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 22, 0x5CB0A9DC)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 23, 0x76F988DA)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 24, 0x983E5152)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 25, 0xA831C66D)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 26, 0xB00327C8)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 27, 0xBF597FC7)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 28, 0xC6E00BF3)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 29, 0xD5A79147)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 30, 0x06CA6351)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 31, 0x14292967)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 32, 0x27B70A85)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 33, 0x2E1B2138)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 34, 0x4D2C6DFC)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 35, 0x53380D13)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 36, 0x650A7354)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 37, 0x766A0ABB)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 38, 0x81C2C92E)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 39, 0x92722C85)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 40, 0xA2BFE8A1)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 41, 0xA81A664B)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 42, 0xC24B8B70)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 43, 0xC76C51A3)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 44, 0xD192E819)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 45, 0xD6990624)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 46, 0xF40E3585)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 47, 0x106AA070)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 48, 0x19A4C116)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 49, 0x1E376C08)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 50, 0x2748774C)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 51, 0x34B0BCB5)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 52, 0x391C0CB3)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 53, 0x4ED8AA4A)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 54, 0x5B9CCA4F)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 55, 0x682E6FF3)
-    ss[3], ss[7] = RND(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 56, 0x748F82EE)
-    ss[2], ss[6] = RND(ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 57, 0x78A5636F)
-    ss[1], ss[5] = RND(ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 58, 0x84C87814)
-    ss[0], ss[4] = RND(ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 59, 0x8CC70208)
-    ss[7], ss[3] = RND(ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 60, 0x90BEFFFA)
-    ss[6], ss[2] = RND(ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 61, 0xA4506CEB)
-    ss[5], ss[1] = RND(ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 62, 0xBEF9A3F7)
-    ss[4], ss[0] = RND(ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 63, 0xC67178F2)
-
-    dig = []
-    for i, x in enumerate(sha_info["digest"]):
-        dig.append((x + ss[i]) & 0xFFFFFFFF)
-    sha_info["digest"] = dig
-
-
-def sha_init():
-    sha_info = new_shaobject()
-    sha_info["digest"] = [
-        0x6A09E667,
-        0xBB67AE85,
-        0x3C6EF372,
-        0xA54FF53A,
-        0x510E527F,
-        0x9B05688C,
-        0x1F83D9AB,
-        0x5BE0CD19,
-    ]
-    sha_info["count_lo"] = 0
-    sha_info["count_hi"] = 0
-    sha_info["local"] = 0
-    sha_info["digestsize"] = 32
-    return sha_info
-
-
-def sha224_init():
-    sha_info = new_shaobject()
-    sha_info["digest"] = [
-        0xC1059ED8,
-        0x367CD507,
-        0x3070DD17,
-        0xF70E5939,
-        0xFFC00B31,
-        0x68581511,
-        0x64F98FA7,
-        0xBEFA4FA4,
-    ]
-    sha_info["count_lo"] = 0
-    sha_info["count_hi"] = 0
-    sha_info["local"] = 0
-    sha_info["digestsize"] = 28
-    return sha_info
-
-
-def getbuf(s):
-    if isinstance(s, str):
-        return s.encode("ascii")
-    else:
-        return bytes(s)
-
-
-def sha_update(sha_info, buffer):
-    if isinstance(buffer, str):
-        raise TypeError("Unicode strings must be encoded before hashing")
-    count = len(buffer)
-    buffer_idx = 0
-    clo = (sha_info["count_lo"] + (count << 3)) & 0xFFFFFFFF
-    if clo < sha_info["count_lo"]:
-        sha_info["count_hi"] += 1
-    sha_info["count_lo"] = clo
-
-    sha_info["count_hi"] += count >> 29
-
-    if sha_info["local"]:
-        i = SHA_BLOCKSIZE - sha_info["local"]
-        if i > count:
-            i = count
-
-        # copy buffer
-        for x in enumerate(buffer[buffer_idx : buffer_idx + i]):
-            sha_info["data"][sha_info["local"] + x[0]] = x[1]
-
-        count -= i
-        buffer_idx += i
-
-        sha_info["local"] += i
-        if sha_info["local"] == SHA_BLOCKSIZE:
-            sha_transform(sha_info)
-            sha_info["local"] = 0
-        else:
-            return
-
-    while count >= SHA_BLOCKSIZE:
-        # copy buffer
-        sha_info["data"] = list(buffer[buffer_idx : buffer_idx + SHA_BLOCKSIZE])
-        count -= SHA_BLOCKSIZE
-        buffer_idx += SHA_BLOCKSIZE
-        sha_transform(sha_info)
-
-    # copy buffer
-    pos = sha_info["local"]
-    sha_info["data"][pos : pos + count] = list(buffer[buffer_idx : buffer_idx + count])
-    sha_info["local"] = count
-
-
-def sha_final(sha_info):
-    lo_bit_count = sha_info["count_lo"]
-    hi_bit_count = sha_info["count_hi"]
-    count = (lo_bit_count >> 3) & 0x3F
-    sha_info["data"][count] = 0x80
-    count += 1
-    if count > SHA_BLOCKSIZE - 8:
-        # zero the bytes in data after the count
-        sha_info["data"] = sha_info["data"][:count] + ([0] * (SHA_BLOCKSIZE - count))
-        sha_transform(sha_info)
-        # zero bytes in data
-        sha_info["data"] = [0] * SHA_BLOCKSIZE
-    else:
-        sha_info["data"] = sha_info["data"][:count] + ([0] * (SHA_BLOCKSIZE - count))
-
-    sha_info["data"][56] = (hi_bit_count >> 24) & 0xFF
-    sha_info["data"][57] = (hi_bit_count >> 16) & 0xFF
-    sha_info["data"][58] = (hi_bit_count >> 8) & 0xFF
-    sha_info["data"][59] = (hi_bit_count >> 0) & 0xFF
-    sha_info["data"][60] = (lo_bit_count >> 24) & 0xFF
-    sha_info["data"][61] = (lo_bit_count >> 16) & 0xFF
-    sha_info["data"][62] = (lo_bit_count >> 8) & 0xFF
-    sha_info["data"][63] = (lo_bit_count >> 0) & 0xFF
-
-    sha_transform(sha_info)
-
-    dig = []
-    for i in sha_info["digest"]:
-        dig.extend([((i >> 24) & 0xFF), ((i >> 16) & 0xFF), ((i >> 8) & 0xFF), (i & 0xFF)])
-    return bytes(dig)
-
-
-class sha256(object):
-    digest_size = digestsize = SHA_DIGESTSIZE
-    block_size = SHA_BLOCKSIZE
-
-    def __init__(self, s=None):
-        self._sha = sha_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def update(self, s):
-        sha_update(self._sha, getbuf(s))
-
-    def digest(self):
-        return sha_final(self._sha.copy())[: self._sha["digestsize"]]
-
-    def hexdigest(self):
-        return "".join(["%.2x" % i for i in self.digest()])
-
-    def copy(self):
-        new = sha256()
-        new._sha = self._sha.copy()
-        return new
-
-
-class sha224(sha256):
-    digest_size = digestsize = 28
-
-    def __init__(self, s=None):
-        self._sha = sha224_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def copy(self):
-        new = sha224()
-        new._sha = self._sha.copy()
-        return new
-
-
-def test():
-    a_str = "just a test string"
-
-    assert (
-        b"\xe3\xb0\xc4B\x98\xfc\x1c\x14\x9a\xfb\xf4\xc8\x99o\xb9$'\xaeA\xe4d\x9b\x93L\xa4\x95\x99\x1bxR\xb8U"
-        == sha256().digest()
-    )
-    assert (
-        "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" == sha256().hexdigest()
-    )
-    assert (
-        "d7b553c6f09ac85d142415f857c5310f3bbbe7cdd787cce4b985acedd585266f"
-        == sha256(a_str).hexdigest()
-    )
-    assert (
-        "8113ebf33c97daa9998762aacafe750c7cefc2b2f173c90c59663a57fe626f21"
-        == sha256(a_str * 7).hexdigest()
-    )
-
-    s = sha256(a_str)
-    s.update(a_str)
-    assert "03d9963e05a094593190b6fc794cb1a3e1ac7d7883f0b5855268afeccc70d461" == s.hexdigest()
-
-
-if __name__ == "__main__":
-    test()
diff --git a/python-stdlib/hashlib/hashlib/_sha384.py b/python-stdlib/hashlib/hashlib/_sha384.py
deleted file mode 100644
index 20f09ff00..000000000
--- a/python-stdlib/hashlib/hashlib/_sha384.py
+++ /dev/null
@@ -1 +0,0 @@
-from ._sha512 import sha384
diff --git a/python-stdlib/hashlib/hashlib/_sha512.py b/python-stdlib/hashlib/hashlib/_sha512.py
deleted file mode 100644
index 726fbb5f2..000000000
--- a/python-stdlib/hashlib/hashlib/_sha512.py
+++ /dev/null
@@ -1,519 +0,0 @@
-"""
-This code was Ported from CPython's sha512module.c
-"""
-
-SHA_BLOCKSIZE = 128
-SHA_DIGESTSIZE = 64
-
-
-def new_shaobject():
-    return {
-        "digest": [0] * 8,
-        "count_lo": 0,
-        "count_hi": 0,
-        "data": [0] * SHA_BLOCKSIZE,
-        "local": 0,
-        "digestsize": 0,
-    }
-
-
-ROR64 = (
-    lambda x, y: (((x & 0xFFFFFFFFFFFFFFFF) >> (y & 63)) | (x << (64 - (y & 63))))
-    & 0xFFFFFFFFFFFFFFFF
-)
-Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
-Maj = lambda x, y, z: (((x | y) & z) | (x & y))
-S = lambda x, n: ROR64(x, n)
-R = lambda x, n: (x & 0xFFFFFFFFFFFFFFFF) >> n
-Sigma0 = lambda x: (S(x, 28) ^ S(x, 34) ^ S(x, 39))
-Sigma1 = lambda x: (S(x, 14) ^ S(x, 18) ^ S(x, 41))
-Gamma0 = lambda x: (S(x, 1) ^ S(x, 8) ^ R(x, 7))
-Gamma1 = lambda x: (S(x, 19) ^ S(x, 61) ^ R(x, 6))
-
-
-def sha_transform(sha_info):
-    W = []
-
-    d = sha_info["data"]
-    for i in range(0, 16):
-        W.append(
-            (d[8 * i] << 56)
-            + (d[8 * i + 1] << 48)
-            + (d[8 * i + 2] << 40)
-            + (d[8 * i + 3] << 32)
-            + (d[8 * i + 4] << 24)
-            + (d[8 * i + 5] << 16)
-            + (d[8 * i + 6] << 8)
-            + d[8 * i + 7]
-        )
-
-    for i in range(16, 80):
-        W.append(
-            (Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xFFFFFFFFFFFFFFFF
-        )
-
-    ss = sha_info["digest"][:]
-
-    def RND(a, b, c, d, e, f, g, h, i, ki):
-        t0 = (h + Sigma1(e) + Ch(e, f, g) + ki + W[i]) & 0xFFFFFFFFFFFFFFFF
-        t1 = (Sigma0(a) + Maj(a, b, c)) & 0xFFFFFFFFFFFFFFFF
-        d = (d + t0) & 0xFFFFFFFFFFFFFFFF
-        h = (t0 + t1) & 0xFFFFFFFFFFFFFFFF
-        return d & 0xFFFFFFFFFFFFFFFF, h & 0xFFFFFFFFFFFFFFFF
-
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 0, 0x428A2F98D728AE22
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 1, 0x7137449123EF65CD
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 2, 0xB5C0FBCFEC4D3B2F
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 3, 0xE9B5DBA58189DBBC
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 4, 0x3956C25BF348B538
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 5, 0x59F111F1B605D019
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 6, 0x923F82A4AF194F9B
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 7, 0xAB1C5ED5DA6D8118
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 8, 0xD807AA98A3030242
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 9, 0x12835B0145706FBE
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 10, 0x243185BE4EE4B28C
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 11, 0x550C7DC3D5FFB4E2
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 12, 0x72BE5D74F27B896F
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 13, 0x80DEB1FE3B1696B1
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 14, 0x9BDC06A725C71235
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 15, 0xC19BF174CF692694
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 16, 0xE49B69C19EF14AD2
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 17, 0xEFBE4786384F25E3
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 18, 0x0FC19DC68B8CD5B5
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 19, 0x240CA1CC77AC9C65
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 20, 0x2DE92C6F592B0275
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 21, 0x4A7484AA6EA6E483
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 22, 0x5CB0A9DCBD41FBD4
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 23, 0x76F988DA831153B5
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 24, 0x983E5152EE66DFAB
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 25, 0xA831C66D2DB43210
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 26, 0xB00327C898FB213F
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 27, 0xBF597FC7BEEF0EE4
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 28, 0xC6E00BF33DA88FC2
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 29, 0xD5A79147930AA725
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 30, 0x06CA6351E003826F
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 31, 0x142929670A0E6E70
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 32, 0x27B70A8546D22FFC
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 33, 0x2E1B21385C26C926
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 34, 0x4D2C6DFC5AC42AED
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 35, 0x53380D139D95B3DF
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 36, 0x650A73548BAF63DE
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 37, 0x766A0ABB3C77B2A8
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 38, 0x81C2C92E47EDAEE6
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 39, 0x92722C851482353B
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 40, 0xA2BFE8A14CF10364
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 41, 0xA81A664BBC423001
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 42, 0xC24B8B70D0F89791
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 43, 0xC76C51A30654BE30
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 44, 0xD192E819D6EF5218
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 45, 0xD69906245565A910
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 46, 0xF40E35855771202A
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 47, 0x106AA07032BBD1B8
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 48, 0x19A4C116B8D2D0C8
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 49, 0x1E376C085141AB53
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 50, 0x2748774CDF8EEB99
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 51, 0x34B0BCB5E19B48A8
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 52, 0x391C0CB3C5C95A63
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 53, 0x4ED8AA4AE3418ACB
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 54, 0x5B9CCA4F7763E373
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 55, 0x682E6FF3D6B2B8A3
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 56, 0x748F82EE5DEFB2FC
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 57, 0x78A5636F43172F60
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 58, 0x84C87814A1F0AB72
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 59, 0x8CC702081A6439EC
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 60, 0x90BEFFFA23631E28
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 61, 0xA4506CEBDE82BDE9
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 62, 0xBEF9A3F7B2C67915
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 63, 0xC67178F2E372532B
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 64, 0xCA273ECEEA26619C
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 65, 0xD186B8C721C0C207
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 66, 0xEADA7DD6CDE0EB1E
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 67, 0xF57D4F7FEE6ED178
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 68, 0x06F067AA72176FBA
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 69, 0x0A637DC5A2C898A6
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 70, 0x113F9804BEF90DAE
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 71, 0x1B710B35131C471B
-    )
-    ss[3], ss[7] = RND(
-        ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], 72, 0x28DB77F523047D84
-    )
-    ss[2], ss[6] = RND(
-        ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], 73, 0x32CAAB7B40C72493
-    )
-    ss[1], ss[5] = RND(
-        ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], 74, 0x3C9EBE0A15C9BEBC
-    )
-    ss[0], ss[4] = RND(
-        ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], ss[4], 75, 0x431D67C49C100D4C
-    )
-    ss[7], ss[3] = RND(
-        ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], ss[3], 76, 0x4CC5D4BECB3E42B6
-    )
-    ss[6], ss[2] = RND(
-        ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], ss[2], 77, 0x597F299CFC657E2A
-    )
-    ss[5], ss[1] = RND(
-        ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], ss[1], 78, 0x5FCB6FAB3AD6FAEC
-    )
-    ss[4], ss[0] = RND(
-        ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7], ss[0], 79, 0x6C44198C4A475817
-    )
-
-    dig = []
-    for i, x in enumerate(sha_info["digest"]):
-        dig.append((x + ss[i]) & 0xFFFFFFFFFFFFFFFF)
-    sha_info["digest"] = dig
-
-
-def sha_init():
-    sha_info = new_shaobject()
-    sha_info["digest"] = [
-        0x6A09E667F3BCC908,
-        0xBB67AE8584CAA73B,
-        0x3C6EF372FE94F82B,
-        0xA54FF53A5F1D36F1,
-        0x510E527FADE682D1,
-        0x9B05688C2B3E6C1F,
-        0x1F83D9ABFB41BD6B,
-        0x5BE0CD19137E2179,
-    ]
-    sha_info["count_lo"] = 0
-    sha_info["count_hi"] = 0
-    sha_info["local"] = 0
-    sha_info["digestsize"] = 64
-    return sha_info
-
-
-def sha384_init():
-    sha_info = new_shaobject()
-    sha_info["digest"] = [
-        0xCBBB9D5DC1059ED8,
-        0x629A292A367CD507,
-        0x9159015A3070DD17,
-        0x152FECD8F70E5939,
-        0x67332667FFC00B31,
-        0x8EB44A8768581511,
-        0xDB0C2E0D64F98FA7,
-        0x47B5481DBEFA4FA4,
-    ]
-    sha_info["count_lo"] = 0
-    sha_info["count_hi"] = 0
-    sha_info["local"] = 0
-    sha_info["digestsize"] = 48
-    return sha_info
-
-
-def getbuf(s):
-    if isinstance(s, str):
-        return s.encode("ascii")
-    else:
-        return bytes(s)
-
-
-def sha_update(sha_info, buffer):
-    if isinstance(buffer, str):
-        raise TypeError("Unicode strings must be encoded before hashing")
-    count = len(buffer)
-    buffer_idx = 0
-    clo = (sha_info["count_lo"] + (count << 3)) & 0xFFFFFFFF
-    if clo < sha_info["count_lo"]:
-        sha_info["count_hi"] += 1
-    sha_info["count_lo"] = clo
-
-    sha_info["count_hi"] += count >> 29
-
-    if sha_info["local"]:
-        i = SHA_BLOCKSIZE - sha_info["local"]
-        if i > count:
-            i = count
-
-        # copy buffer
-        for x in enumerate(buffer[buffer_idx : buffer_idx + i]):
-            sha_info["data"][sha_info["local"] + x[0]] = x[1]
-
-        count -= i
-        buffer_idx += i
-
-        sha_info["local"] += i
-        if sha_info["local"] == SHA_BLOCKSIZE:
-            sha_transform(sha_info)
-            sha_info["local"] = 0
-        else:
-            return
-
-    while count >= SHA_BLOCKSIZE:
-        # copy buffer
-        sha_info["data"] = list(buffer[buffer_idx : buffer_idx + SHA_BLOCKSIZE])
-        count -= SHA_BLOCKSIZE
-        buffer_idx += SHA_BLOCKSIZE
-        sha_transform(sha_info)
-
-    # copy buffer
-    pos = sha_info["local"]
-    sha_info["data"][pos : pos + count] = list(buffer[buffer_idx : buffer_idx + count])
-    sha_info["local"] = count
-
-
-def sha_final(sha_info):
-    lo_bit_count = sha_info["count_lo"]
-    hi_bit_count = sha_info["count_hi"]
-    count = (lo_bit_count >> 3) & 0x7F
-    sha_info["data"][count] = 0x80
-    count += 1
-    if count > SHA_BLOCKSIZE - 16:
-        # zero the bytes in data after the count
-        sha_info["data"] = sha_info["data"][:count] + ([0] * (SHA_BLOCKSIZE - count))
-        sha_transform(sha_info)
-        # zero bytes in data
-        sha_info["data"] = [0] * SHA_BLOCKSIZE
-    else:
-        sha_info["data"] = sha_info["data"][:count] + ([0] * (SHA_BLOCKSIZE - count))
-
-    sha_info["data"][112] = 0
-    sha_info["data"][113] = 0
-    sha_info["data"][114] = 0
-    sha_info["data"][115] = 0
-    sha_info["data"][116] = 0
-    sha_info["data"][117] = 0
-    sha_info["data"][118] = 0
-    sha_info["data"][119] = 0
-
-    sha_info["data"][120] = (hi_bit_count >> 24) & 0xFF
-    sha_info["data"][121] = (hi_bit_count >> 16) & 0xFF
-    sha_info["data"][122] = (hi_bit_count >> 8) & 0xFF
-    sha_info["data"][123] = (hi_bit_count >> 0) & 0xFF
-    sha_info["data"][124] = (lo_bit_count >> 24) & 0xFF
-    sha_info["data"][125] = (lo_bit_count >> 16) & 0xFF
-    sha_info["data"][126] = (lo_bit_count >> 8) & 0xFF
-    sha_info["data"][127] = (lo_bit_count >> 0) & 0xFF
-
-    sha_transform(sha_info)
-
-    dig = []
-    for i in sha_info["digest"]:
-        dig.extend(
-            [
-                ((i >> 56) & 0xFF),
-                ((i >> 48) & 0xFF),
-                ((i >> 40) & 0xFF),
-                ((i >> 32) & 0xFF),
-                ((i >> 24) & 0xFF),
-                ((i >> 16) & 0xFF),
-                ((i >> 8) & 0xFF),
-                (i & 0xFF),
-            ]
-        )
-    return bytes(dig)
-
-
-class sha512(object):
-    digest_size = digestsize = SHA_DIGESTSIZE
-    block_size = SHA_BLOCKSIZE
-
-    def __init__(self, s=None):
-        self._sha = sha_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def update(self, s):
-        sha_update(self._sha, getbuf(s))
-
-    def digest(self):
-        return sha_final(self._sha.copy())[: self._sha["digestsize"]]
-
-    def hexdigest(self):
-        return "".join(["%.2x" % i for i in self.digest()])
-
-    def copy(self):
-        new = sha512()
-        new._sha = self._sha.copy()
-        return new
-
-
-class sha384(sha512):
-    digest_size = digestsize = 48
-
-    def __init__(self, s=None):
-        self._sha = sha384_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def copy(self):
-        new = sha384()
-        new._sha = self._sha.copy()
-        return new
-
-
-def test():
-    a_str = "just a test string"
-
-    assert (
-        sha512().digest()
-        == b"\xcf\x83\xe15~\xef\xb8\xbd\xf1T(P\xd6m\x80\x07\xd6 \xe4\x05\x0bW\x15\xdc\x83\xf4\xa9!\xd3l\xe9\xceG\xd0\xd1<]\x85\xf2\xb0\xff\x83\x18\xd2\x87~\xec/c\xb91\xbdGAz\x81\xa582z\xf9'\xda>"
-    )
-    assert (
-        sha512().hexdigest()
-        == "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
-    )
-    assert (
-        sha512(a_str).hexdigest()
-        == "68be4c6664af867dd1d01c8d77e963d87d77b702400c8fabae355a41b8927a5a5533a7f1c28509bbd65c5f3ac716f33be271fbda0ca018b71a84708c9fae8a53"
-    )
-    assert (
-        sha512(a_str * 7).hexdigest()
-        == "3233acdbfcfff9bff9fc72401d31dbffa62bd24e9ec846f0578d647da73258d9f0879f7fde01fe2cc6516af3f343807fdef79e23d696c923d79931db46bf1819"
-    )
-
-    s = sha512(a_str)
-    s.update(a_str)
-    assert (
-        s.hexdigest()
-        == "341aeb668730bbb48127d5531115f3c39d12cb9586a6ca770898398aff2411087cfe0b570689adf328cddeb1f00803acce6737a19f310b53bbdb0320828f75bb"
-    )
-
-
-if __name__ == "__main__":
-    test()
diff --git a/python-stdlib/hashlib/manifest.py b/python-stdlib/hashlib/manifest.py
index 106168bab..01f745e14 100644
--- a/python-stdlib/hashlib/manifest.py
+++ b/python-stdlib/hashlib/manifest.py
@@ -1,3 +1,8 @@
-metadata(version="2.4.0-4")
+metadata(version="2.5.0")
 
-package("hashlib")
+# This is a collection package that gets all hash functions. To save code and
+# memory size, prefer to install just the algorithm you need.
+require("hashlib-sha224")
+require("hashlib-sha256")
+require("hashlib-sha384")
+require("hashlib-sha512")
diff --git a/python-stdlib/hashlib/test_hashlib.py b/python-stdlib/hashlib/test_hashlib.py
deleted file mode 100644
index 6cb687399..000000000
--- a/python-stdlib/hashlib/test_hashlib.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from hashlib._sha256 import test as sha256_test
-from hashlib._sha512 import test as sha512_test
-
-
-sha256_test()
-sha512_test()
-
-
-import hashlib
-
-patterns = [
-    (
-        "sha224",
-        b"1234",
-        b"\x99\xfb/H\xc6\xafGa\xf9\x04\xfc\x85\xf9^\xb5a\x90\xe5\xd4\x0b\x1fD\xec:\x9c\x1f\xa3\x19",
-    ),
-    (
-        "sha256",
-        b"1234",
-        b"\x03\xacgB\x16\xf3\xe1\\v\x1e\xe1\xa5\xe2U\xf0g\x956#\xc8\xb3\x88\xb4E\x9e\x13\xf9x\xd7\xc8F\xf4",
-    ),
-    (
-        "sha384",
-        b"1234",
-        b"PO\x00\x8c\x8f\xcf\x8b.\xd5\xdf\xcd\xe7R\xfcTd\xab\x8b\xa0d!]\x9c[_\xc4\x86\xaf=\x9a\xb8\xc8\x1b\x14xQ\x80\xd2\xad|\xee\x1a\xb7\x92\xadDy\x8c",
-    ),
-    (
-        "sha512",
-        b"1234",
-        b"\xd4\x04U\x9f`.\xabo\xd6\x02\xacv\x80\xda\xcb\xfa\xad\xd1603^\x95\x1f\tz\xf3\x90\x0e\x9d\xe1v\xb6\xdb(Q/.\x00\x0b\x9d\x04\xfb\xa5\x13>\x8b\x1cn\x8d\xf5\x9d\xb3\xa8\xab\x9d`\xbeK\x97\xcc\x9e\x81\xdb",
-    ),
-]
-
-for algo, input, output in patterns:
-    assert hashlib.new(algo, input).digest() == output
diff --git a/python-stdlib/hashlib/tests/test_new.py b/python-stdlib/hashlib/tests/test_new.py
new file mode 100644
index 000000000..f844a1ccd
--- /dev/null
+++ b/python-stdlib/hashlib/tests/test_new.py
@@ -0,0 +1,32 @@
+import unittest
+import hashlib
+
+
+class TestNew(unittest.TestCase):
+    def test_sha224(self):
+        self.assertEqual(
+            hashlib.new("sha224", b"1234").digest(),
+            b"\x99\xfb/H\xc6\xafGa\xf9\x04\xfc\x85\xf9^\xb5a\x90\xe5\xd4\x0b\x1fD\xec:\x9c\x1f\xa3\x19",
+        )
+
+    def test_sha256(self):
+        self.assertEqual(
+            hashlib.new("sha256", b"1234").digest(),
+            b"\x03\xacgB\x16\xf3\xe1\\v\x1e\xe1\xa5\xe2U\xf0g\x956#\xc8\xb3\x88\xb4E\x9e\x13\xf9x\xd7\xc8F\xf4",
+        )
+
+    def test_sha384(self):
+        self.assertEqual(
+            hashlib.new("sha384", b"1234").digest(),
+            b"PO\x00\x8c\x8f\xcf\x8b.\xd5\xdf\xcd\xe7R\xfcTd\xab\x8b\xa0d!]\x9c[_\xc4\x86\xaf=\x9a\xb8\xc8\x1b\x14xQ\x80\xd2\xad|\xee\x1a\xb7\x92\xadDy\x8c",
+        )
+
+    def test_sha512(self):
+        self.assertEqual(
+            hashlib.new("sha512", b"1234").digest(),
+            b"\xd4\x04U\x9f`.\xabo\xd6\x02\xacv\x80\xda\xcb\xfa\xad\xd1603^\x95\x1f\tz\xf3\x90\x0e\x9d\xe1v\xb6\xdb(Q/.\x00\x0b\x9d\x04\xfb\xa5\x13>\x8b\x1cn\x8d\xf5\x9d\xb3\xa8\xab\x9d`\xbeK\x97\xcc\x9e\x81\xdb",
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/python-stdlib/hashlib/tests/test_sha256.py b/python-stdlib/hashlib/tests/test_sha256.py
new file mode 100644
index 000000000..024821b06
--- /dev/null
+++ b/python-stdlib/hashlib/tests/test_sha256.py
@@ -0,0 +1,83 @@
+import unittest
+from hashlib import sha256
+
+
+class TestSha256(unittest.TestCase):
+    a_str = b"just a test string"
+    b_str = b"some other string for testing"
+    c_str = b"nothing to see here"
+
+    def test_empty(self):
+        self.assertEqual(
+            b"\xe3\xb0\xc4B\x98\xfc\x1c\x14\x9a\xfb\xf4\xc8\x99o\xb9$'\xaeA\xe4d\x9b\x93L\xa4\x95\x99\x1bxR\xb8U",
+            sha256().digest(),
+        )
+
+    def test_empty_hex(self):
+        self.assertEqual(
+            "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+            sha256().hexdigest(),
+        )
+
+    def test_str(self):
+        self.assertEqual(
+            b"\xd7\xb5S\xc6\xf0\x9a\xc8]\x14$\x15\xf8W\xc51\x0f;\xbb\xe7\xcd\xd7\x87\xcc\xe4\xb9\x85\xac\xed\xd5\x85&o",
+            sha256(self.a_str).digest(),
+        )
+        self.assertEqual(
+            b'|\x80Q\xb2\xa0u\xf0g\xe3\xc45\xce1p\xc6I\xb6r\x19J&\x8b\xdc\xa5"\x00?A\x90\xba\xbd,',
+            sha256(self.b_str).digest(),
+        )
+
+    def test_str_hex(self):
+        self.assertEqual(
+            "d7b553c6f09ac85d142415f857c5310f3bbbe7cdd787cce4b985acedd585266f",
+            sha256(self.a_str).hexdigest(),
+        )
+        self.assertEqual(
+            "7c8051b2a075f067e3c435ce3170c649b672194a268bdca522003f4190babd2c",
+            sha256(self.b_str).hexdigest(),
+        )
+
+    def test_long_str(self):
+        self.assertEqual(
+            "f1f1af5d66ba1789f8214354c0ed04856bbe43c01aa392c584ef1ec3dbf45482",
+            sha256(self.a_str * 123).hexdigest(),
+        )
+
+    def test_update(self):
+        s = sha256(self.a_str)
+        s.update(self.b_str)
+        self.assertEqual(
+            "fc7f204eb969ca3f10488731fa63910486adda7c2ae2ee2142e85414454c6d42", s.hexdigest()
+        )
+
+    def test_repeat_final(self):
+        s = sha256(self.a_str)
+        s.update(self.b_str)
+        self.assertEqual(
+            "fc7f204eb969ca3f10488731fa63910486adda7c2ae2ee2142e85414454c6d42", s.hexdigest()
+        )
+        self.assertEqual(
+            "fc7f204eb969ca3f10488731fa63910486adda7c2ae2ee2142e85414454c6d42", s.hexdigest()
+        )
+        s.update(self.c_str)
+        self.assertEqual(
+            "b707db9ae915b0f6f9a67ded8c9932999ee7e9dfb33513b084ea9384f5ffb082", s.hexdigest()
+        )
+
+    def test_copy(self):
+        s = sha256(self.a_str)
+        s2 = s.copy()
+        s.update(self.b_str)
+        s2.update(self.c_str)
+        self.assertEqual(
+            "fc7f204eb969ca3f10488731fa63910486adda7c2ae2ee2142e85414454c6d42", s.hexdigest()
+        )
+        self.assertEqual(
+            "6a340b2bd2b63f4a0f9bb7566c26831354ee6ed17d1187d3a53627181fcb2907", s2.hexdigest()
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/python-stdlib/hashlib/tests/test_sha512.py b/python-stdlib/hashlib/tests/test_sha512.py
new file mode 100644
index 000000000..9f80606f3
--- /dev/null
+++ b/python-stdlib/hashlib/tests/test_sha512.py
@@ -0,0 +1,89 @@
+import unittest
+from hashlib import sha512
+
+
+class Testsha512(unittest.TestCase):
+    a_str = b"just a test string"
+    b_str = b"some other string for testing"
+    c_str = b"nothing to see here"
+
+    def test_empty(self):
+        self.assertEqual(
+            b"\xcf\x83\xe15~\xef\xb8\xbd\xf1T(P\xd6m\x80\x07\xd6 \xe4\x05\x0bW\x15\xdc\x83\xf4\xa9!\xd3l\xe9\xceG\xd0\xd1<]\x85\xf2\xb0\xff\x83\x18\xd2\x87~\xec/c\xb91\xbdGAz\x81\xa582z\xf9'\xda>",
+            sha512().digest(),
+        )
+
+    def test_empty_hex(self):
+        self.assertEqual(
+            "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
+            sha512().hexdigest(),
+        )
+
+    def test_str(self):
+        self.assertEqual(
+            b"h\xbeLfd\xaf\x86}\xd1\xd0\x1c\x8dw\xe9c\xd8}w\xb7\x02@\x0c\x8f\xab\xae5ZA\xb8\x92zZU3\xa7\xf1\xc2\x85\t\xbb\xd6\\_:\xc7\x16\xf3;\xe2q\xfb\xda\x0c\xa0\x18\xb7\x1a\x84p\x8c\x9f\xae\x8aS",
+            sha512(self.a_str).digest(),
+        )
+        self.assertEqual(
+            b"Tt\xd1\xf8\x1fh\x14\xba\x85\x1a\x84\x15\x9b(\x812\x8er\x8d\xdeN\xc0\xe2\xff\xbb\xcc$i\x18gh\x18\xc4\xcb?\xc0\xa0\nTl\x0f\x01J\x07eP\x19\x98\xd9\xebZ\xd2?\x1cj\xa8Q)!\x18\xab!!~",
+            sha512(self.b_str).digest(),
+        )
+
+    def test_str_hex(self):
+        self.assertEqual(
+            "68be4c6664af867dd1d01c8d77e963d87d77b702400c8fabae355a41b8927a5a5533a7f1c28509bbd65c5f3ac716f33be271fbda0ca018b71a84708c9fae8a53",
+            sha512(self.a_str).hexdigest(),
+        )
+        self.assertEqual(
+            "5474d1f81f6814ba851a84159b2881328e728dde4ec0e2ffbbcc246918676818c4cb3fc0a00a546c0f014a0765501998d9eb5ad23f1c6aa851292118ab21217e",
+            sha512(self.b_str).hexdigest(),
+        )
+
+    def test_long_str(self):
+        self.assertEqual(
+            "8ee045cd8faf900bb23d13754d65723404a224030af827897cde92a40f7a1202405bc3efe5466c7e4833e7a9a5b9f9278ebe4c968e7fa662d8addc17ba95cc73",
+            sha512(self.a_str * 123).hexdigest(),
+        )
+
+    def test_update(self):
+        s = sha512(self.a_str)
+        s.update(self.b_str)
+        self.assertEqual(
+            "3fa253e7b093d5bc7b31f613f03833a4d39341cf73642349a46f26b39b5d95c97bb4e16fc588bda81d5c7a2db62cfca5c4c71a142cf02fd78409bffe5e4f408c",
+            s.hexdigest(),
+        )
+
+    def test_repeat_final(self):
+        s = sha512(self.a_str)
+        s.update(self.b_str)
+        self.assertEqual(
+            "3fa253e7b093d5bc7b31f613f03833a4d39341cf73642349a46f26b39b5d95c97bb4e16fc588bda81d5c7a2db62cfca5c4c71a142cf02fd78409bffe5e4f408c",
+            s.hexdigest(),
+        )
+        self.assertEqual(
+            "3fa253e7b093d5bc7b31f613f03833a4d39341cf73642349a46f26b39b5d95c97bb4e16fc588bda81d5c7a2db62cfca5c4c71a142cf02fd78409bffe5e4f408c",
+            s.hexdigest(),
+        )
+        s.update(self.c_str)
+        self.assertEqual(
+            "4b0827d5a28eeb2ebbeec270d7c775e78d5a76251753b8242327ffa2b1e5662a655be44bc09e41fcc0805bccd79cee13f4c41c40acff6fc1cf69b311d9b08f55",
+            s.hexdigest(),
+        )
+
+    def test_copy(self):
+        s = sha512(self.a_str)
+        s2 = s.copy()
+        s.update(self.b_str)
+        s2.update(self.c_str)
+        self.assertEqual(
+            "3fa253e7b093d5bc7b31f613f03833a4d39341cf73642349a46f26b39b5d95c97bb4e16fc588bda81d5c7a2db62cfca5c4c71a142cf02fd78409bffe5e4f408c",
+            s.hexdigest(),
+        )
+        self.assertEqual(
+            "2e4d68ec2d2836f24718b24442db027141fd2f7e06fb11c1460b013017feb0e74dea9d9415abe51b729ad86792bd5cd2cec9567d58a47a03785028376e7a5cc1",
+            s2.hexdigest(),
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

From 0a5b63559421a791083cdfadfdba2633f34f4d65 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jul 2023 12:57:08 +1000
Subject: [PATCH 166/343] utarfile: Fix read/write handling of nulls in tar
 header.

For reading, the size is always terminated by a null, so just ignore it by
using 11 for the uctypes entry (this fixes a regression introduced in
7128d423c2e7c0309ac17a1e6ba873b909b24fcc).

For writing, the size must always be terminated by a null.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/utarfile-write/manifest.py       |  2 +-
 micropython/utarfile-write/utarfile/write.py | 30 ++++++++------------
 micropython/utarfile/manifest.py             |  2 +-
 micropython/utarfile/utarfile/__init__.py    |  3 +-
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/micropython/utarfile-write/manifest.py b/micropython/utarfile-write/manifest.py
index a0c95a46f..bd120ef51 100644
--- a/micropython/utarfile-write/manifest.py
+++ b/micropython/utarfile-write/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Adds write (create/append) support to utarfile.", version="0.1")
+metadata(description="Adds write (create/append) support to utarfile.", version="0.1.1")
 
 require("utarfile")
 package("utarfile")
diff --git a/micropython/utarfile-write/utarfile/write.py b/micropython/utarfile-write/utarfile/write.py
index 8999bd913..2bae38a54 100644
--- a/micropython/utarfile-write/utarfile/write.py
+++ b/micropython/utarfile-write/utarfile/write.py
@@ -11,9 +11,9 @@
 # http://www.gnu.org/software/tar/manual/html_node/Standard.html
 _TAR_HEADER = {
     "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
-    "mode": (uctypes.ARRAY | 100, uctypes.UINT8 | 7),
-    "uid": (uctypes.ARRAY | 108, uctypes.UINT8 | 7),
-    "gid": (uctypes.ARRAY | 116, uctypes.UINT8 | 7),
+    "mode": (uctypes.ARRAY | 100, uctypes.UINT8 | 8),
+    "uid": (uctypes.ARRAY | 108, uctypes.UINT8 | 8),
+    "gid": (uctypes.ARRAY | 116, uctypes.UINT8 | 8),
     "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 12),
     "mtime": (uctypes.ARRAY | 136, uctypes.UINT8 | 12),
     "chksum": (uctypes.ARRAY | 148, uctypes.UINT8 | 8),
@@ -26,12 +26,6 @@
 _RECORDSIZE = const(_BLOCKSIZE * 20)  # length of records
 
 
-# Write a string into a bytearray by copying each byte.
-def _setstring(b, s, maxlen):
-    for i, c in enumerate(s.encode("utf-8")[:maxlen]):
-        b[i] = c
-
-
 def _open_write(self, name, mode, fileobj):
     if mode == "w":
         if not fileobj:
@@ -72,18 +66,18 @@ def addfile(self, tarinfo, fileobj=None):
         if not name.endswith("/"):
             name += "/"
     hdr = uctypes.struct(uctypes.addressof(buf), _TAR_HEADER, uctypes.LITTLE_ENDIAN)
-    _setstring(hdr.name, name, 100)
-    _setstring(hdr.mode, "%06o " % (tarinfo.mode & 0o7777), 7)
-    _setstring(hdr.uid, "%06o " % tarinfo.uid, 7)
-    _setstring(hdr.gid, "%06o " % tarinfo.gid, 7)
-    _setstring(hdr.size, "%011o " % size, 12)
-    _setstring(hdr.mtime, "%011o " % tarinfo.mtime, 12)
-    _setstring(hdr.typeflag, "5" if tarinfo.isdir() else "0", 1)
+    hdr.name[:] = name.encode("utf-8")[:100]
+    hdr.mode[:] = b"%07o\0" % (tarinfo.mode & 0o7777)
+    hdr.uid[:] = b"%07o\0" % tarinfo.uid
+    hdr.gid[:] = b"%07o\0" % tarinfo.gid
+    hdr.size[:] = b"%011o\0" % size
+    hdr.mtime[:] = b"%011o\0" % tarinfo.mtime
+    hdr.typeflag[:] = b"5" if tarinfo.isdir() else b"0"
     # Checksum is calculated with checksum field all blanks.
-    _setstring(hdr.chksum, " " * 8, 8)
+    hdr.chksum[:] = b"        "
     # Calculate and insert the actual checksum.
     chksum = sum(buf)
-    _setstring(hdr.chksum, "%06o\0" % chksum, 7)
+    hdr.chksum[:] = b"%06o\0 " % chksum
     # Emit the header.
     self.f.write(buf)
     self.offset += len(buf)
diff --git a/micropython/utarfile/manifest.py b/micropython/utarfile/manifest.py
index 3e6ac576f..68f88e330 100644
--- a/micropython/utarfile/manifest.py
+++ b/micropython/utarfile/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Read-only implementation of Python's tarfile.", version="0.4.0")
+metadata(description="Read-only implementation of Python's tarfile.", version="0.4.1")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/utarfile/utarfile/__init__.py b/micropython/utarfile/utarfile/__init__.py
index 524207aa0..c367b2b36 100644
--- a/micropython/utarfile/utarfile/__init__.py
+++ b/micropython/utarfile/utarfile/__init__.py
@@ -4,9 +4,10 @@
 
 # Minimal set of tar header fields for reading.
 # http://www.gnu.org/software/tar/manual/html_node/Standard.html
+# The "size" entry is 11 (not 12) to implicitly cut off the null terminator.
 _TAR_HEADER = {
     "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
-    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 12),
+    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 11),
 }
 
 DIRTYPE = const("dir")

From fe3e0a2fae01bc8fc71b8ba56b476284170a547c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 15:26:16 +1000
Subject: [PATCH 167/343] cmd: Remove comments about using the string module.

Even though we now have a `string` module, just keep the existing
IDENTCHARS definition.

- If someone doesn't already have string installed (or aren't otherwise
  importing it), this would add an extra dependency and more memory used.

- If they do, then the resulting concatenated string has to be allocated
  separately, so there's no gain from using the string.x components.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/cmd/cmd.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/cmd/cmd.py b/python-stdlib/cmd/cmd.py
index 9d46a8a7d..447ea1489 100644
--- a/python-stdlib/cmd/cmd.py
+++ b/python-stdlib/cmd/cmd.py
@@ -51,13 +51,12 @@
 completions have also been stripped out.
 """
 
-# import string, sys
-import sys  # MiroPython doesn't yet have a string module
+import sys
 
 __all__ = ["Cmd"]
 
 PROMPT = "(Cmd) "
-# IDENTCHARS = string.ascii_letters + string.digits + '_'
+# This is equivalent to string.ascii_letters + string.digits + '_'
 IDENTCHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
 
 

From 66924d9fa18787f22595141f22fd9bdea20c1210 Mon Sep 17 00:00:00 2001
From: ThunderEX <thunderex@gmail.com>
Date: Wed, 3 Feb 2021 09:34:28 +0800
Subject: [PATCH 168/343] xmltok: Change StopIteration to EOFError due to
 PEP-479.

Due to changes in MicroPython to support PEP-479, StopIteration has been
deprecated for return.  This results in xmltok to raise RuntimeError every
time.  This commit is a simple fix to just change from StopIteration to
EOFError and then return it in the generator.
---
 micropython/xmltok/xmltok.py | 63 +++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/micropython/xmltok/xmltok.py b/micropython/xmltok/xmltok.py
index 53435d073..9711b7ff2 100644
--- a/micropython/xmltok/xmltok.py
+++ b/micropython/xmltok/xmltok.py
@@ -31,7 +31,7 @@ def eof(self):
     def nextch(self):
         self.c = self.f.read(1)
         if not self.c:
-            raise StopIteration
+            raise EOFError
         return self.c
 
     def skip_ws(self):
@@ -87,36 +87,39 @@ def lex_attrs_till(self):
 
     def tokenize(self):
         while not self.eof():
-            if self.match("<"):
-                if self.match("/"):
-                    yield (END_TAG, self.getnsident())
-                    self.expect(">")
-                elif self.match("?"):
-                    yield (PI, self.getident())
-                    yield from self.lex_attrs_till()
-                    self.expect("?")
-                    self.expect(">")
-                elif self.match("!"):
-                    self.expect("-")
-                    self.expect("-")
-                    last3 = ""
-                    while True:
-                        last3 = last3[-2:] + self.getch()
-                        if last3 == "-->":
-                            break
-                else:
-                    tag = self.getnsident()
-                    yield (START_TAG, tag)
-                    yield from self.lex_attrs_till()
+            try:
+                if self.match("<"):
                     if self.match("/"):
-                        yield (END_TAG, tag)
-                    self.expect(">")
-            else:
-                text = ""
-                while self.curch() != "<":
-                    text += self.getch()
-                if text:
-                    yield (TEXT, text)
+                        yield (END_TAG, self.getnsident())
+                        self.expect(">")
+                    elif self.match("?"):
+                        yield (PI, self.getident())
+                        yield from self.lex_attrs_till()
+                        self.expect("?")
+                        self.expect(">")
+                    elif self.match("!"):
+                        self.expect("-")
+                        self.expect("-")
+                        last3 = ""
+                        while True:
+                            last3 = last3[-2:] + self.getch()
+                            if last3 == "-->":
+                                break
+                    else:
+                        tag = self.getnsident()
+                        yield (START_TAG, tag)
+                        yield from self.lex_attrs_till()
+                        if self.match("/"):
+                            yield (END_TAG, tag)
+                        self.expect(">")
+                else:
+                    text = ""
+                    while self.curch() != "<":
+                        text += self.getch()
+                    if text:
+                        yield (TEXT, text)
+            except EOFError:
+                pass
 
 
 def gfind(gen, pred):

From c48b17dd17d3104d397fa779e41a94098f32734f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 16:06:41 +1000
Subject: [PATCH 169/343] aiorepl/README.md: More info about globals.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aiorepl/README.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/micropython/aiorepl/README.md b/micropython/aiorepl/README.md
index 2c3ed843f..4bb11083f 100644
--- a/micropython/aiorepl/README.md
+++ b/micropython/aiorepl/README.md
@@ -50,11 +50,17 @@ async def main():
 asyncio.run(main())
 ```
 
-The optional globals passed to `task([globals])` allows you to specify what
-will be in scope for the REPL. By default it uses `__main__`, which is the
-same scope as the regular REPL (and `main.py`). In the example above, the
-REPL will be able to call the `demo()` function as well as get/set the
-`state` variable.
+An optional globals dictionary can be passed to `aiorepl.task()`, which allows
+you to specify what will be in scope for the REPL. By default it uses the
+globals dictionary from the `__main__` module, which is the same scope as the
+regular REPL (and `main.py`). In the example above, the REPL will be able to
+call the `demo()` function as well as get/set the `state` variable.
+
+You can also provide your own dictionary, e.g. `aiorepl.task({"obj": obj })`,
+or use the globals dict from the current module, e.g.
+`aiorepl.task(globals())`. Note that you cannot use a class instance's members
+dictionary, e.g. `aiorepl.task(obj.__dict__)`, as this is read-only in
+MicroPython.
 
 Instead of the regular `>>> ` prompt, the asyncio REPL will show `--> `.
 

From c2b44ea83b1cb930e91ddc1f81ffb426846acdd0 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 20 Apr 2023 09:37:33 +1000
Subject: [PATCH 170/343] types: Add manifest file.

---
 python-stdlib/types/manifest.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 python-stdlib/types/manifest.py

diff --git a/python-stdlib/types/manifest.py b/python-stdlib/types/manifest.py
new file mode 100644
index 000000000..35a47d86c
--- /dev/null
+++ b/python-stdlib/types/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.1")
+
+module("types.py")

From 0f768c9af71b69b5f4e81f0cab8aaa403c820c2e Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 20 Apr 2023 10:21:25 +1000
Subject: [PATCH 171/343] bisect: Add manifest file.

---
 python-stdlib/bisect/manifest.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 python-stdlib/bisect/manifest.py

diff --git a/python-stdlib/bisect/manifest.py b/python-stdlib/bisect/manifest.py
new file mode 100644
index 000000000..2a1cb60e1
--- /dev/null
+++ b/python-stdlib/bisect/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5")
+
+module("bisect.py")

From b95deb31e51c017fd62971fb7c2a050a70be1ba3 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 20 Apr 2023 10:21:46 +1000
Subject: [PATCH 172/343] json: Add manifest file.

---
 python-stdlib/json/manifest.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 python-stdlib/json/manifest.py

diff --git a/python-stdlib/json/manifest.py b/python-stdlib/json/manifest.py
new file mode 100644
index 000000000..7ce66f4b9
--- /dev/null
+++ b/python-stdlib/json/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+package("json")

From 028a369f903fa395e8ed57dcaf8fba98f684cecc Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 20 Apr 2023 10:21:59 +1000
Subject: [PATCH 173/343] keyword: Add manifest file.

---
 python-stdlib/keyword/manifest.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 python-stdlib/keyword/manifest.py

diff --git a/python-stdlib/keyword/manifest.py b/python-stdlib/keyword/manifest.py
new file mode 100644
index 000000000..aad27ec89
--- /dev/null
+++ b/python-stdlib/keyword/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.1")
+
+module("keyword.py")

From 5329ef5301263258159ec310bdddda1a6e910484 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 18 May 2023 17:15:46 +1000
Subject: [PATCH 174/343] logging: Add full support for logging exception
 tracebacks.

This commit allows you to pass an exception object in as the exc_info kwarg
(CPython allows this), so logging exceptions can work even if the
MICROPY_PY_SYS_EXC_INFO option is disabled in the firmware.

Separately to that, currently even when sys.exc_info() is enabled, it's
only printing the traceback to _stream = sys.stderr - not to the configured
logging handlers.  This means for instance if you've got a file log
handler it misses out on the tracebacks.  That's also fixed in this commit.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 python-stdlib/logging/logging.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/python-stdlib/logging/logging.py b/python-stdlib/logging/logging.py
index 1a5668476..d17e42c4f 100644
--- a/python-stdlib/logging/logging.py
+++ b/python-stdlib/logging/logging.py
@@ -1,5 +1,5 @@
 from micropython import const
-
+import io
 import sys
 import time
 
@@ -148,10 +148,17 @@ def error(self, msg, *args):
     def critical(self, msg, *args):
         self.log(CRITICAL, msg, *args)
 
-    def exception(self, msg, *args):
+    def exception(self, msg, *args, exc_info=True):
         self.log(ERROR, msg, *args)
-        if hasattr(sys, "exc_info"):
-            sys.print_exception(sys.exc_info()[1], _stream)
+        tb = None
+        if isinstance(exc_info, BaseException):
+            tb = exc_info
+        elif hasattr(sys, "exc_info"):
+            tb = sys.exc_info()[1]
+        if tb:
+            buf = io.StringIO()
+            sys.print_exception(tb, buf)
+            self.log(ERROR, buf.getvalue())
 
     def addHandler(self, handler):
         self.handlers.append(handler)

From 0e68c7d5181d5c62716e4affe30cd76824ffc0eb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 14 Jun 2023 09:11:18 +1000
Subject: [PATCH 175/343] copy: Declare dependency on types.

---
 python-stdlib/copy/manifest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python-stdlib/copy/manifest.py b/python-stdlib/copy/manifest.py
index 909ac2054..d11e94774 100644
--- a/python-stdlib/copy/manifest.py
+++ b/python-stdlib/copy/manifest.py
@@ -1,3 +1,5 @@
 metadata(version="3.3.3-2")
 
+require("types")
+
 module("copy.py")

From ff842310de5a3c9ea5a5aa5cbaa52e06e5f2952b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 20 Jun 2023 10:06:54 +1000
Subject: [PATCH 176/343] aiorepl: Replace f-string with str.format.

f-strings aren't enabled on all builds (e.g. low-flash ESP8266).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aiorepl/aiorepl.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 62f54c5c9..8ebaef079 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -26,19 +26,21 @@ async def execute(code, g, s):
         if "await " in code:
             # Execute the code snippet in an async context.
             if m := _RE_IMPORT.match(code) or _RE_FROM_IMPORT.match(code):
-                code = f"global {m.group(3) or m.group(1)}\n    {code}"
+                code = "global {}\n    {}".format(m.group(3) or m.group(1), code)
             elif m := _RE_GLOBAL.match(code):
-                code = f"global {m.group(1)}\n    {code}"
+                code = "global {}\n    {}".format(m.group(1), code)
             elif not _RE_ASSIGN.search(code):
-                code = f"return {code}"
+                code = "return {}".format(code)
 
-            code = f"""
+            code = """
 import uasyncio as asyncio
 async def __code():
-    {code}
+    {}
 
 __exec_task = asyncio.create_task(__code())
-"""
+""".format(
+                code
+            )
 
             async def kbd_intr_task(exec_task, s):
                 while True:
@@ -81,7 +83,7 @@ async def kbd_intr_task(exec_task, s):
                 micropython.kbd_intr(-1)
 
     except Exception as err:
-        print(f"{type(err).__name__}: {err}")
+        print("{}: {}".format(type(err).__name__, err))
 
 
 # REPL task. Invoke this with an optional mutable globals dict.

From 6103823b1b2fd2292caf3a9f16c6e2a5891a29ef Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 22 Jun 2023 12:55:58 +1000
Subject: [PATCH 177/343] all: Remove __version__ from .py files.

It is inserted automatically during publish/freezing and having them in the
code prevents the automatic process from happening.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/datetime/datetime.py  | 2 --
 python-stdlib/json/json/__init__.py | 2 +-
 unix-ffi/cgi/cgi.py                 | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/python-stdlib/datetime/datetime.py b/python-stdlib/datetime/datetime.py
index b3cd9b94f..0f2a89105 100644
--- a/python-stdlib/datetime/datetime.py
+++ b/python-stdlib/datetime/datetime.py
@@ -2,8 +2,6 @@
 
 import time as _tmod
 
-__version__ = "2.0.0"
-
 _DBM = (0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334)
 _DIM = (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
 _TIME_SPEC = ("auto", "hours", "minutes", "seconds", "milliseconds", "microseconds")
diff --git a/python-stdlib/json/json/__init__.py b/python-stdlib/json/json/__init__.py
index eb9493edb..69a045563 100644
--- a/python-stdlib/json/json/__init__.py
+++ b/python-stdlib/json/json/__init__.py
@@ -99,7 +99,7 @@
     $ echo '{ 1.2:3.4}' | python -m json.tool
     Expecting property name enclosed in double quotes: line 1 column 3 (char 2)
 """
-__version__ = "2.0.9"
+
 __all__ = [
     "dump",
     "dumps",
diff --git a/unix-ffi/cgi/cgi.py b/unix-ffi/cgi/cgi.py
index 79cc4a738..550f70713 100644
--- a/unix-ffi/cgi/cgi.py
+++ b/unix-ffi/cgi/cgi.py
@@ -25,9 +25,6 @@
 # responsible for its maintenance.
 #
 
-__version__ = "2.6"
-
-
 # Imports
 # =======
 

From e45a7f6c185f65b7179e71ad1a3b7e25fd1c3441 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 6 Jul 2023 13:53:43 +1000
Subject: [PATCH 178/343] fnmatch: Fix compatibility with ure -> re.

With the recent MicroPython change to remove the u prefix by default on
builtins (micropython/micropython#11740) the format checker in fnmatch
which was detecting ure no longer works.

This commit updates the module to filter the regex automatically as needed.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 python-stdlib/fnmatch/fnmatch.py  | 12 ++++++++----
 python-stdlib/fnmatch/manifest.py |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/python-stdlib/fnmatch/fnmatch.py b/python-stdlib/fnmatch/fnmatch.py
index 71009afa2..2b42c3be4 100644
--- a/python-stdlib/fnmatch/fnmatch.py
+++ b/python-stdlib/fnmatch/fnmatch.py
@@ -27,8 +27,6 @@ def normcase(s):
 
 __all__ = ["filter", "fnmatch", "fnmatchcase", "translate"]
 
-COMPAT = re.__name__ == "ure"
-
 
 def fnmatch(name, pat):
     """Test whether FILENAME matches PATTERN.
@@ -58,12 +56,18 @@ def _compile_pattern(pat):
         res = bytes(res_str, "ISO-8859-1")
     else:
         res = translate(pat)
-    if COMPAT:
+
+    try:
+        ptn = re.compile(res)
+    except ValueError:
+        # re1.5 doesn't support all regex features
         if res.startswith("(?ms)"):
             res = res[5:]
         if res.endswith("\\Z"):
             res = res[:-2] + "$"
-    return re.compile(res).match
+        ptn = re.compile(res)
+
+    return ptn.match
 
 
 def filter(names, pat):
diff --git a/python-stdlib/fnmatch/manifest.py b/python-stdlib/fnmatch/manifest.py
index 8f19bb8f4..f4318b374 100644
--- a/python-stdlib/fnmatch/manifest.py
+++ b/python-stdlib/fnmatch/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.6.0")
+metadata(version="0.6.1")
 
 module("fnmatch.py")

From 5004436164b0789c9733a8e0cab87a9cb6301bda Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 16:21:11 +1000
Subject: [PATCH 179/343] tarfile: Rename from utarfile.

This is compatible with the CPython module, so should
be named tarfile.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/utarfile-write/manifest.py                      | 4 ----
 .../tarfile-write}/example-append.py                        | 4 ++--
 .../tarfile-write}/example-create.py                        | 4 ++--
 python-stdlib/tarfile-write/manifest.py                     | 4 ++++
 .../tarfile-write/tarfile}/write.py                         | 2 +-
 .../utarfile => python-stdlib/tarfile}/example-extract.py   | 6 +++---
 {micropython/utarfile => python-stdlib/tarfile}/manifest.py | 2 +-
 .../utarfile => python-stdlib/tarfile/tarfile}/__init__.py  | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 micropython/utarfile-write/manifest.py
 rename {micropython/utarfile-write => python-stdlib/tarfile-write}/example-append.py (86%)
 rename {micropython/utarfile-write => python-stdlib/tarfile-write}/example-create.py (85%)
 create mode 100644 python-stdlib/tarfile-write/manifest.py
 rename {micropython/utarfile-write/utarfile => python-stdlib/tarfile-write/tarfile}/write.py (99%)
 rename {micropython/utarfile => python-stdlib/tarfile}/example-extract.py (76%)
 rename {micropython/utarfile => python-stdlib/tarfile}/manifest.py (86%)
 rename {micropython/utarfile/utarfile => python-stdlib/tarfile/tarfile}/__init__.py (96%)

diff --git a/micropython/utarfile-write/manifest.py b/micropython/utarfile-write/manifest.py
deleted file mode 100644
index bd120ef51..000000000
--- a/micropython/utarfile-write/manifest.py
+++ /dev/null
@@ -1,4 +0,0 @@
-metadata(description="Adds write (create/append) support to utarfile.", version="0.1.1")
-
-require("utarfile")
-package("utarfile")
diff --git a/micropython/utarfile-write/example-append.py b/python-stdlib/tarfile-write/example-append.py
similarity index 86%
rename from micropython/utarfile-write/example-append.py
rename to python-stdlib/tarfile-write/example-append.py
index 9adf34d13..f496eb3aa 100644
--- a/micropython/utarfile-write/example-append.py
+++ b/python-stdlib/tarfile-write/example-append.py
@@ -1,7 +1,7 @@
 """ tar append writes additional files to the end of an existing tar file."""
 import os
 import sys
-import utarfile
+import tarfile
 
 if len(sys.argv) < 2:
     raise ValueError("Usage: %s appendfile.tar newinputfile1 ..." % sys.argv[0])
@@ -10,6 +10,6 @@
 if not tarfile.endswith(".tar"):
     raise ValueError("Filename %s does not end with .tar" % tarfile)
 
-with utarfile.TarFile(sys.argv[1], "a") as t:
+with tarfile.TarFile(sys.argv[1], "a") as t:
     for filename in sys.argv[2:]:
         t.add(filename)
diff --git a/micropython/utarfile-write/example-create.py b/python-stdlib/tarfile-write/example-create.py
similarity index 85%
rename from micropython/utarfile-write/example-create.py
rename to python-stdlib/tarfile-write/example-create.py
index f0c9b206a..ee6ec6255 100644
--- a/micropython/utarfile-write/example-create.py
+++ b/python-stdlib/tarfile-write/example-create.py
@@ -1,6 +1,6 @@
 """ tar create writes a new tar file containing the specified files."""
 import sys
-import utarfile
+import tarfile
 
 if len(sys.argv) < 2:
     raise ValueError("Usage: %s outputfile.tar inputfile1 ..." % sys.argv[0])
@@ -9,6 +9,6 @@
 if not tarfile.endswith(".tar"):
     raise ValueError("Filename %s does not end with .tar" % tarfile)
 
-with utarfile.TarFile(sys.argv[1], "w") as t:
+with tarfile.TarFile(sys.argv[1], "w") as t:
     for filename in sys.argv[2:]:
         t.add(filename)
diff --git a/python-stdlib/tarfile-write/manifest.py b/python-stdlib/tarfile-write/manifest.py
new file mode 100644
index 000000000..248f7da60
--- /dev/null
+++ b/python-stdlib/tarfile-write/manifest.py
@@ -0,0 +1,4 @@
+metadata(description="Adds write (create/append) support to tarfile.", version="0.1.1")
+
+require("tarfile")
+package("tarfile")
diff --git a/micropython/utarfile-write/utarfile/write.py b/python-stdlib/tarfile-write/tarfile/write.py
similarity index 99%
rename from micropython/utarfile-write/utarfile/write.py
rename to python-stdlib/tarfile-write/tarfile/write.py
index 2bae38a54..062b8ae6b 100644
--- a/micropython/utarfile-write/utarfile/write.py
+++ b/python-stdlib/tarfile-write/tarfile/write.py
@@ -1,7 +1,7 @@
 """Additions to the TarFile class to support creating and appending tar files.
 
 The methods defined below in are injected into the TarFile class in the
-utarfile package.
+tarfile package.
 """
 
 import uctypes
diff --git a/micropython/utarfile/example-extract.py b/python-stdlib/tarfile/example-extract.py
similarity index 76%
rename from micropython/utarfile/example-extract.py
rename to python-stdlib/tarfile/example-extract.py
index a8a05d5bc..94ce829ce 100644
--- a/micropython/utarfile/example-extract.py
+++ b/python-stdlib/tarfile/example-extract.py
@@ -1,14 +1,14 @@
 import sys
 import os
-import utarfile
+import tarfile
 
 if len(sys.argv) < 2:
     raise ValueError("Usage: %s inputfile.tar" % sys.argv[0])
 
-t = utarfile.TarFile(sys.argv[1])
+t = tarfile.TarFile(sys.argv[1])
 for i in t:
     print(i.name)
-    if i.type == utarfile.DIRTYPE:
+    if i.type == tarfile.DIRTYPE:
         os.mkdir(i.name)
     else:
         f = t.extractfile(i)
diff --git a/micropython/utarfile/manifest.py b/python-stdlib/tarfile/manifest.py
similarity index 86%
rename from micropython/utarfile/manifest.py
rename to python-stdlib/tarfile/manifest.py
index 68f88e330..9940bb051 100644
--- a/micropython/utarfile/manifest.py
+++ b/python-stdlib/tarfile/manifest.py
@@ -2,4 +2,4 @@
 
 # Originally written by Paul Sokolovsky.
 
-package("utarfile")
+package("tarfile")
diff --git a/micropython/utarfile/utarfile/__init__.py b/python-stdlib/tarfile/tarfile/__init__.py
similarity index 96%
rename from micropython/utarfile/utarfile/__init__.py
rename to python-stdlib/tarfile/tarfile/__init__.py
index c367b2b36..4bb95af30 100644
--- a/micropython/utarfile/utarfile/__init__.py
+++ b/python-stdlib/tarfile/tarfile/__init__.py
@@ -93,7 +93,7 @@ def __init__(self, name=None, mode="r", fileobj=None):
             try:
                 self._open_write(name=name, mode=mode, fileobj=fileobj)
             except AttributeError:
-                raise NotImplementedError("Install utarfile-write")
+                raise NotImplementedError("Install tarfile-write")
 
     def __enter__(self):
         return self
@@ -141,7 +141,7 @@ def close(self):
             pass
         self.f.close()
 
-    # Add additional methods to support write/append from the utarfile-write package.
+    # Add additional methods to support write/append from the tarfile-write package.
     try:
         from .write import _open_write, _close_write, addfile, add
     except ImportError:

From 8513bfbe9d6d6337a9e90f4ae1dfd89d3e28aa12 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 16:39:28 +1000
Subject: [PATCH 180/343] requests: Rename urequests to requests.

This module implements a subset of the Python requests module, and so
it should have the same name.

Added a backwards-compatibility wrapper to allow people to continue to use
`import urequests`. This lives in micropython/urequests.

Changed requests to be a package, so that we can implement extension
packages in the future for optional functionality.

Added a basic README.md to both.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../bundles/bundle-networking/manifest.py        |  6 +++++-
 micropython/mip/manifest.py                      |  2 +-
 micropython/mip/mip/__init__.py                  |  2 +-
 micropython/urequests/README.md                  |  9 +++++++++
 micropython/urequests/manifest.py                |  5 +++++
 micropython/urequests/urequests.py               |  8 ++++++++
 python-ecosys/requests/README.md                 | 16 ++++++++++++++++
 .../{urequests => requests}/example_xively.py    |  5 +----
 python-ecosys/requests/manifest.py               |  3 +++
 .../requests/__init__.py}                        |  0
 python-ecosys/urequests/manifest.py              |  3 ---
 11 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 micropython/urequests/README.md
 create mode 100644 micropython/urequests/manifest.py
 create mode 100644 micropython/urequests/urequests.py
 create mode 100644 python-ecosys/requests/README.md
 rename python-ecosys/{urequests => requests}/example_xively.py (80%)
 create mode 100644 python-ecosys/requests/manifest.py
 rename python-ecosys/{urequests/urequests.py => requests/requests/__init__.py} (100%)
 delete mode 100644 python-ecosys/urequests/manifest.py

diff --git a/micropython/bundles/bundle-networking/manifest.py b/micropython/bundles/bundle-networking/manifest.py
index 1db1b08cd..79d5e9d9d 100644
--- a/micropython/bundles/bundle-networking/manifest.py
+++ b/micropython/bundles/bundle-networking/manifest.py
@@ -5,5 +5,9 @@
 
 require("mip")
 require("ntptime")
-require("urequests")
+require("requests")
 require("webrepl")
+
+# Provide urequests (which just forwards to requests) for backwards
+# compatibility.
+require("urequests")
diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
index f6d47e228..00efa5454 100644
--- a/micropython/mip/manifest.py
+++ b/micropython/mip/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="0.2.0", description="On-device package installer for network-capable boards")
 
-require("urequests")
+require("requests")
 
 package("mip", opt=3)
diff --git a/micropython/mip/mip/__init__.py b/micropython/mip/mip/__init__.py
index 0593e2e0f..5f6f4fcd6 100644
--- a/micropython/mip/mip/__init__.py
+++ b/micropython/mip/mip/__init__.py
@@ -1,7 +1,7 @@
 # MicroPython package installer
 # MIT license; Copyright (c) 2022 Jim Mussared
 
-import urequests as requests
+import requests
 import sys
 
 
diff --git a/micropython/urequests/README.md b/micropython/urequests/README.md
new file mode 100644
index 000000000..f6612b356
--- /dev/null
+++ b/micropython/urequests/README.md
@@ -0,0 +1,9 @@
+## urequests compatibility
+
+The MicroPython version of
+[requests](https://requests.readthedocs.io/en/latest/) was previously called
+`urequests` and a lot of existing code depends on being able to still
+import the module by that name.
+
+This package provides a wrapper to allow this. Prefer to install and use the
+`requests` package instead.
diff --git a/micropython/urequests/manifest.py b/micropython/urequests/manifest.py
new file mode 100644
index 000000000..3fbe61c25
--- /dev/null
+++ b/micropython/urequests/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.8.0", pypi="requests")
+
+require("requests")
+
+module("urequests.py")
diff --git a/micropython/urequests/urequests.py b/micropython/urequests/urequests.py
new file mode 100644
index 000000000..227a1ae5c
--- /dev/null
+++ b/micropython/urequests/urequests.py
@@ -0,0 +1,8 @@
+# This module provides a backwards-compatble import for `urequests`.
+# It lazy-loads from `requests` without duplicating its globals dict.
+
+
+def __getattr__(attr):
+    import requests
+
+    return getattr(requests, attr)
diff --git a/python-ecosys/requests/README.md b/python-ecosys/requests/README.md
new file mode 100644
index 000000000..d6ceaadc5
--- /dev/null
+++ b/python-ecosys/requests/README.md
@@ -0,0 +1,16 @@
+## requests
+
+This module provides a lightweight version of the Python
+[requests](https://requests.readthedocs.io/en/latest/) library.
+
+It includes support for all HTTP verbs, https, json decoding of responses,
+redirects, basic authentication.
+
+### Limitations
+
+* Certificate validation is not currently supported.
+* A dictionary passed as post data will not do automatic JSON or
+  multipart-form encoding of post data (this can be done manually).
+* Compressed requests/responses are not currently supported.
+* File upload is not supported.
+* Chunked encoding in responses is not supported.
diff --git a/python-ecosys/urequests/example_xively.py b/python-ecosys/requests/example_xively.py
similarity index 80%
rename from python-ecosys/urequests/example_xively.py
rename to python-ecosys/requests/example_xively.py
index 88b890cbc..60e139b98 100644
--- a/python-ecosys/urequests/example_xively.py
+++ b/python-ecosys/requests/example_xively.py
@@ -1,7 +1,4 @@
-try:
-    import urequests as requests
-except ImportError:
-    import requests
+import requests
 
 r = requests.get("http://api.xively.com/")
 print(r)
diff --git a/python-ecosys/requests/manifest.py b/python-ecosys/requests/manifest.py
new file mode 100644
index 000000000..7fc2d63bd
--- /dev/null
+++ b/python-ecosys/requests/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.8.0", pypi="requests")
+
+package("requests")
diff --git a/python-ecosys/urequests/urequests.py b/python-ecosys/requests/requests/__init__.py
similarity index 100%
rename from python-ecosys/urequests/urequests.py
rename to python-ecosys/requests/requests/__init__.py
diff --git a/python-ecosys/urequests/manifest.py b/python-ecosys/urequests/manifest.py
deleted file mode 100644
index 4c134081c..000000000
--- a/python-ecosys/urequests/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-metadata(version="0.7.0", pypi="requests")
-
-module("urequests.py")

From 87b4cdae2fdb0f7975c823f471baa65951fae3ce Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 21:24:36 +1000
Subject: [PATCH 181/343] aiorepl: Bump patch version.

For changes in ff842310de5a3c9ea5a5aa5cbaa52e06e5f2952b.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aiorepl/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/aiorepl/manifest.py b/micropython/aiorepl/manifest.py
index 5cce6c796..ca88bb359 100644
--- a/micropython/aiorepl/manifest.py
+++ b/micropython/aiorepl/manifest.py
@@ -1,5 +1,5 @@
 metadata(
-    version="0.1",
+    version="0.1.1",
     description="Provides an asynchronous REPL that can run concurrently with an asyncio, also allowing await expressions.",
 )
 

From 97b7a30ab954d8ca1ee94089650e610a720420a2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 21:24:48 +1000
Subject: [PATCH 182/343] xmltok: Bump patch version.

For changes in 66924d9fa18787f22595141f22fd9bdea20c1210.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/xmltok/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/xmltok/manifest.py b/micropython/xmltok/manifest.py
index efbe41cc4..70d5556bf 100644
--- a/micropython/xmltok/manifest.py
+++ b/micropython/xmltok/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Simple XML tokenizer", version="0.2")
+metadata(description="Simple XML tokenizer", version="0.2.1")
 
 # Originally written by Paul Sokolovsky.
 

From a19d2a35964b8f733fe515f7c043d9e9f4cfca65 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 21:24:56 +1000
Subject: [PATCH 183/343] copy: Bump patch version.

For changes in 0e68c7d5181d5c62716e4affe30cd76824ffc0eb.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/copy/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/copy/manifest.py b/python-stdlib/copy/manifest.py
index d11e94774..b22ebeb90 100644
--- a/python-stdlib/copy/manifest.py
+++ b/python-stdlib/copy/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-2")
+metadata(version="3.3.4")
 
 require("types")
 

From ebbb78e8e43ef88ae97beb61799890deca19c603 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 21:25:06 +1000
Subject: [PATCH 184/343] logging: Bump minor version.

For changes in 5329ef5301263258159ec310bdddda1a6e910484.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/logging/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
index 68fc2db09..daf5d9c94 100644
--- a/python-stdlib/logging/manifest.py
+++ b/python-stdlib/logging/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.5")
+metadata(version="0.6.0")
 
 module("logging.py")

From 8fc9edabf3119855b7ec2b6f59821ab332a0a835 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 21 Jul 2023 21:43:21 +1000
Subject: [PATCH 185/343] all: Standardise x.y.z versioning for all packages.

- For packages that were just x.y, update to x.y.0.
- For that were x.y.z-n, update to x.y.(z+1)

From now on we'll apply semver rules:
- MAJOR version when you make incompatible API changes
- MINOR version when you add functionality in a backward compatible manner
- PATCH version when you make backward compatible bug fixes

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/aioespnow/manifest.py                 | 2 +-
 micropython/espflash/manifest.py                  | 2 +-
 micropython/lora/lora-async/manifest.py           | 2 +-
 micropython/lora/lora-sx126x/manifest.py          | 2 +-
 micropython/lora/lora-sx127x/manifest.py          | 2 +-
 micropython/lora/lora-sync/manifest.py            | 2 +-
 micropython/lora/lora/manifest.py                 | 2 +-
 micropython/udnspkt/manifest.py                   | 2 +-
 micropython/urllib.urequest/manifest.py           | 2 +-
 python-ecosys/pyjwt/manifest.py                   | 2 +-
 python-stdlib/argparse/manifest.py                | 2 +-
 python-stdlib/base64/manifest.py                  | 2 +-
 python-stdlib/binascii/manifest.py                | 2 +-
 python-stdlib/bisect/manifest.py                  | 2 +-
 python-stdlib/cmd/manifest.py                     | 2 +-
 python-stdlib/collections-defaultdict/manifest.py | 2 +-
 python-stdlib/contextlib/manifest.py              | 2 +-
 python-stdlib/curses.ascii/manifest.py            | 2 +-
 python-stdlib/hashlib-core/manifest.py            | 2 +-
 python-stdlib/hashlib-sha224/manifest.py          | 2 +-
 python-stdlib/hashlib-sha256/manifest.py          | 2 +-
 python-stdlib/hashlib-sha384/manifest.py          | 2 +-
 python-stdlib/hashlib-sha512/manifest.py          | 2 +-
 python-stdlib/hmac/manifest.py                    | 2 +-
 python-stdlib/html/manifest.py                    | 2 +-
 python-stdlib/io/manifest.py                      | 2 +-
 python-stdlib/json/manifest.py                    | 2 +-
 python-stdlib/os/manifest.py                      | 2 +-
 python-stdlib/pickle/manifest.py                  | 2 +-
 python-stdlib/random/manifest.py                  | 2 +-
 python-stdlib/ssl/manifest.py                     | 2 +-
 python-stdlib/textwrap/manifest.py                | 2 +-
 python-stdlib/threading/manifest.py               | 2 +-
 python-stdlib/time/manifest.py                    | 2 +-
 python-stdlib/traceback/manifest.py               | 2 +-
 unix-ffi/_markupbase/manifest.py                  | 2 +-
 unix-ffi/cgi/manifest.py                          | 2 +-
 unix-ffi/email.utils/manifest.py                  | 2 +-
 unix-ffi/getopt/manifest.py                       | 2 +-
 unix-ffi/gettext/manifest.py                      | 2 +-
 unix-ffi/html.entities/manifest.py                | 2 +-
 unix-ffi/html.parser/manifest.py                  | 2 +-
 unix-ffi/os/manifest.py                           | 2 +-
 unix-ffi/pwd/manifest.py                          | 2 +-
 unix-ffi/select/manifest.py                       | 2 +-
 unix-ffi/time/manifest.py                         | 2 +-
 unix-ffi/timeit/manifest.py                       | 2 +-
 47 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/micropython/aioespnow/manifest.py b/micropython/aioespnow/manifest.py
index bfacc9e96..a91e48da6 100644
--- a/micropython/aioespnow/manifest.py
+++ b/micropython/aioespnow/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="Extends the micropython espnow module with methods to support asyncio.",
-    version="0.1",
+    version="0.1.0",
 )
 
 module("aioespnow.py")
diff --git a/micropython/espflash/manifest.py b/micropython/espflash/manifest.py
index 19ad98c96..e6b639924 100644
--- a/micropython/espflash/manifest.py
+++ b/micropython/espflash/manifest.py
@@ -1,5 +1,5 @@
 metadata(
-    version="0.1",
+    version="0.1.0",
     description="Provides a minimal ESP32 bootloader protocol implementation.",
 )
 
diff --git a/micropython/lora/lora-async/manifest.py b/micropython/lora/lora-async/manifest.py
index ebd665332..57b9d21d8 100644
--- a/micropython/lora/lora-async/manifest.py
+++ b/micropython/lora/lora-async/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 require("lora")
 package("lora")
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
index ebd665332..57b9d21d8 100644
--- a/micropython/lora/lora-sx126x/manifest.py
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 require("lora")
 package("lora")
diff --git a/micropython/lora/lora-sx127x/manifest.py b/micropython/lora/lora-sx127x/manifest.py
index ebd665332..57b9d21d8 100644
--- a/micropython/lora/lora-sx127x/manifest.py
+++ b/micropython/lora/lora-sx127x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 require("lora")
 package("lora")
diff --git a/micropython/lora/lora-sync/manifest.py b/micropython/lora/lora-sync/manifest.py
index ebd665332..57b9d21d8 100644
--- a/micropython/lora/lora-sync/manifest.py
+++ b/micropython/lora/lora-sync/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 require("lora")
 package("lora")
diff --git a/micropython/lora/lora/manifest.py b/micropython/lora/lora/manifest.py
index cb9c5d5aa..b4312a0e2 100644
--- a/micropython/lora/lora/manifest.py
+++ b/micropython/lora/lora/manifest.py
@@ -1,2 +1,2 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 package("lora")
diff --git a/micropython/udnspkt/manifest.py b/micropython/udnspkt/manifest.py
index 382b8dd74..2c2a78d2b 100644
--- a/micropython/udnspkt/manifest.py
+++ b/micropython/udnspkt/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Make and parse DNS packets (Sans I/O approach).", version="0.1")
+metadata(description="Make and parse DNS packets (Sans I/O approach).", version="0.1.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/urllib.urequest/manifest.py b/micropython/urllib.urequest/manifest.py
index cb4c1569c..e3e8f13f4 100644
--- a/micropython/urllib.urequest/manifest.py
+++ b/micropython/urllib.urequest/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.6")
+metadata(version="0.6.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/python-ecosys/pyjwt/manifest.py b/python-ecosys/pyjwt/manifest.py
index e04433280..b3de5efc9 100644
--- a/python-ecosys/pyjwt/manifest.py
+++ b/python-ecosys/pyjwt/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1", pypi="pyjwt")
+metadata(version="0.1.0", pypi="pyjwt")
 
 require("hmac")
 
diff --git a/python-stdlib/argparse/manifest.py b/python-stdlib/argparse/manifest.py
index 034d73c7d..02bf1a22c 100644
--- a/python-stdlib/argparse/manifest.py
+++ b/python-stdlib/argparse/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.4")
+metadata(version="0.4.0")
 
 # Originally written by Damien George.
 
diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
index 59d39f78b..2a0ebba51 100644
--- a/python-stdlib/base64/manifest.py
+++ b/python-stdlib/base64/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-4")
+metadata(version="3.3.4")
 
 require("binascii")
 require("struct")
diff --git a/python-stdlib/binascii/manifest.py b/python-stdlib/binascii/manifest.py
index 4a478f262..c637678a1 100644
--- a/python-stdlib/binascii/manifest.py
+++ b/python-stdlib/binascii/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="2.4.0-5")
+metadata(version="2.4.1")
 
 module("binascii.py")
diff --git a/python-stdlib/bisect/manifest.py b/python-stdlib/bisect/manifest.py
index 2a1cb60e1..5ba5a9a6b 100644
--- a/python-stdlib/bisect/manifest.py
+++ b/python-stdlib/bisect/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.5")
+metadata(version="0.5.0")
 
 module("bisect.py")
diff --git a/python-stdlib/cmd/manifest.py b/python-stdlib/cmd/manifest.py
index 572f97df6..910352ee7 100644
--- a/python-stdlib/cmd/manifest.py
+++ b/python-stdlib/cmd/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.4.0-2")
+metadata(version="3.4.1")
 
 module("cmd.py")
diff --git a/python-stdlib/collections-defaultdict/manifest.py b/python-stdlib/collections-defaultdict/manifest.py
index f8d566aba..e5c06e668 100644
--- a/python-stdlib/collections-defaultdict/manifest.py
+++ b/python-stdlib/collections-defaultdict/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.3")
+metadata(version="0.3.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/python-stdlib/contextlib/manifest.py b/python-stdlib/contextlib/manifest.py
index ab7ae5775..2894ec5c4 100644
--- a/python-stdlib/contextlib/manifest.py
+++ b/python-stdlib/contextlib/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Port of contextlib for micropython", version="3.4.2-4")
+metadata(description="Port of contextlib for micropython", version="3.4.3")
 
 require("ucontextlib")
 require("collections")
diff --git a/python-stdlib/curses.ascii/manifest.py b/python-stdlib/curses.ascii/manifest.py
index 6a6518089..643e3d49a 100644
--- a/python-stdlib/curses.ascii/manifest.py
+++ b/python-stdlib/curses.ascii/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.4.2-1")
+metadata(version="3.4.3")
 
 package("curses")
diff --git a/python-stdlib/hashlib-core/manifest.py b/python-stdlib/hashlib-core/manifest.py
index 21f2c2674..db8d42482 100644
--- a/python-stdlib/hashlib-core/manifest.py
+++ b/python-stdlib/hashlib-core/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="1.0")
+metadata(version="1.0.0")
 
 package("hashlib")
diff --git a/python-stdlib/hashlib-sha224/manifest.py b/python-stdlib/hashlib-sha224/manifest.py
index d329c8c41..30a2c2531 100644
--- a/python-stdlib/hashlib-sha224/manifest.py
+++ b/python-stdlib/hashlib-sha224/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="1.0", description="Adds the SHA224 hash algorithm to hashlib.")
+metadata(version="1.0.0", description="Adds the SHA224 hash algorithm to hashlib.")
 
 require("hashlib-sha256")
 package("hashlib")
diff --git a/python-stdlib/hashlib-sha256/manifest.py b/python-stdlib/hashlib-sha256/manifest.py
index 7790ff6a2..42a859e1d 100644
--- a/python-stdlib/hashlib-sha256/manifest.py
+++ b/python-stdlib/hashlib-sha256/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="1.0", description="Adds the SHA256 hash algorithm to hashlib.")
+metadata(version="1.0.0", description="Adds the SHA256 hash algorithm to hashlib.")
 
 require("hashlib-core")
 package("hashlib")
diff --git a/python-stdlib/hashlib-sha384/manifest.py b/python-stdlib/hashlib-sha384/manifest.py
index aaf9b247b..6791eb56c 100644
--- a/python-stdlib/hashlib-sha384/manifest.py
+++ b/python-stdlib/hashlib-sha384/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="1.0", description="Adds the SHA384 hash algorithm to hashlib.")
+metadata(version="1.0.0", description="Adds the SHA384 hash algorithm to hashlib.")
 
 require("hashlib-sha512")
 package("hashlib")
diff --git a/python-stdlib/hashlib-sha512/manifest.py b/python-stdlib/hashlib-sha512/manifest.py
index 118eb085f..1d84f025a 100644
--- a/python-stdlib/hashlib-sha512/manifest.py
+++ b/python-stdlib/hashlib-sha512/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="1.0", description="Adds the SHA512 hash algorithm to hashlib.")
+metadata(version="1.0.0", description="Adds the SHA512 hash algorithm to hashlib.")
 
 require("hashlib-core")
 package("hashlib")
diff --git a/python-stdlib/hmac/manifest.py b/python-stdlib/hmac/manifest.py
index 92b8b18e4..28d78988d 100644
--- a/python-stdlib/hmac/manifest.py
+++ b/python-stdlib/hmac/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.4.2-3")
+metadata(version="3.4.3")
 
 module("hmac.py")
diff --git a/python-stdlib/html/manifest.py b/python-stdlib/html/manifest.py
index 2f0dcec77..c5705dd4b 100644
--- a/python-stdlib/html/manifest.py
+++ b/python-stdlib/html/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-2")
+metadata(version="3.3.4")
 
 require("string")
 
diff --git a/python-stdlib/io/manifest.py b/python-stdlib/io/manifest.py
index ba1659ce0..62c0a5147 100644
--- a/python-stdlib/io/manifest.py
+++ b/python-stdlib/io/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 module("io.py")
diff --git a/python-stdlib/json/manifest.py b/python-stdlib/json/manifest.py
index 7ce66f4b9..87999e5f1 100644
--- a/python-stdlib/json/manifest.py
+++ b/python-stdlib/json/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 package("json")
diff --git a/python-stdlib/os/manifest.py b/python-stdlib/os/manifest.py
index 7cdeee65a..cd59f0c91 100644
--- a/python-stdlib/os/manifest.py
+++ b/python-stdlib/os/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.6")
+metadata(version="0.6.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/python-stdlib/pickle/manifest.py b/python-stdlib/pickle/manifest.py
index 0f6fbf766..412373a33 100644
--- a/python-stdlib/pickle/manifest.py
+++ b/python-stdlib/pickle/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 module("pickle.py")
diff --git a/python-stdlib/random/manifest.py b/python-stdlib/random/manifest.py
index fcd10007d..e09c8b0f7 100644
--- a/python-stdlib/random/manifest.py
+++ b/python-stdlib/random/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.2")
+metadata(version="0.2.0")
 
 module("random.py")
diff --git a/python-stdlib/ssl/manifest.py b/python-stdlib/ssl/manifest.py
index fb92cdf48..1dae2f6e7 100644
--- a/python-stdlib/ssl/manifest.py
+++ b/python-stdlib/ssl/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 module("ssl.py")
diff --git a/python-stdlib/textwrap/manifest.py b/python-stdlib/textwrap/manifest.py
index d43a54bba..e287ac395 100644
--- a/python-stdlib/textwrap/manifest.py
+++ b/python-stdlib/textwrap/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.4.2-1")
+metadata(version="3.4.3")
 
 module("textwrap.py")
diff --git a/python-stdlib/threading/manifest.py b/python-stdlib/threading/manifest.py
index 4db21dd1d..8106584be 100644
--- a/python-stdlib/threading/manifest.py
+++ b/python-stdlib/threading/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 module("threading.py")
diff --git a/python-stdlib/time/manifest.py b/python-stdlib/time/manifest.py
index 052ed4a17..71af915c4 100644
--- a/python-stdlib/time/manifest.py
+++ b/python-stdlib/time/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 module("time.py")
diff --git a/python-stdlib/traceback/manifest.py b/python-stdlib/traceback/manifest.py
index 65b3cdaa5..b3ef8343c 100644
--- a/python-stdlib/traceback/manifest.py
+++ b/python-stdlib/traceback/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.3")
+metadata(version="0.3.0")
 
 module("traceback.py")
diff --git a/unix-ffi/_markupbase/manifest.py b/unix-ffi/_markupbase/manifest.py
index 983b57995..ec576c28f 100644
--- a/unix-ffi/_markupbase/manifest.py
+++ b/unix-ffi/_markupbase/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-1")
+metadata(version="3.3.4")
 
 require("re", unix_ffi=True)
 
diff --git a/unix-ffi/cgi/manifest.py b/unix-ffi/cgi/manifest.py
index b1db6ce30..29732c939 100644
--- a/unix-ffi/cgi/manifest.py
+++ b/unix-ffi/cgi/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.3.3-2")
+metadata(version="3.3.4")
 
 module("cgi.py")
diff --git a/unix-ffi/email.utils/manifest.py b/unix-ffi/email.utils/manifest.py
index be6e33183..20b21b406 100644
--- a/unix-ffi/email.utils/manifest.py
+++ b/unix-ffi/email.utils/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-2")
+metadata(version="3.3.4")
 
 require("os", unix_ffi=True)
 require("re", unix_ffi=True)
diff --git a/unix-ffi/getopt/manifest.py b/unix-ffi/getopt/manifest.py
index 2038e7504..ae28ffd7f 100644
--- a/unix-ffi/getopt/manifest.py
+++ b/unix-ffi/getopt/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-1")
+metadata(version="3.3.4")
 
 require("os", unix_ffi=True)
 
diff --git a/unix-ffi/gettext/manifest.py b/unix-ffi/gettext/manifest.py
index 527330e92..94b58b2e4 100644
--- a/unix-ffi/gettext/manifest.py
+++ b/unix-ffi/gettext/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 # Originally written by Riccardo Magliocchetti.
 
diff --git a/unix-ffi/html.entities/manifest.py b/unix-ffi/html.entities/manifest.py
index 0a612905f..a985d2821 100644
--- a/unix-ffi/html.entities/manifest.py
+++ b/unix-ffi/html.entities/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.3.3-1")
+metadata(version="3.3.4")
 
 package("html")
diff --git a/unix-ffi/html.parser/manifest.py b/unix-ffi/html.parser/manifest.py
index 9c82a7833..a0a5bc4f4 100644
--- a/unix-ffi/html.parser/manifest.py
+++ b/unix-ffi/html.parser/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-2")
+metadata(version="3.3.4")
 
 require("_markupbase", unix_ffi=True)
 require("warnings")
diff --git a/unix-ffi/os/manifest.py b/unix-ffi/os/manifest.py
index 38cb87d5a..0dce28e0b 100644
--- a/unix-ffi/os/manifest.py
+++ b/unix-ffi/os/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.6")
+metadata(version="0.6.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/unix-ffi/pwd/manifest.py b/unix-ffi/pwd/manifest.py
index 7db3213f5..49bfb403e 100644
--- a/unix-ffi/pwd/manifest.py
+++ b/unix-ffi/pwd/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1")
+metadata(version="0.1.0")
 
 # Originally written by Riccardo Magliocchetti.
 
diff --git a/unix-ffi/select/manifest.py b/unix-ffi/select/manifest.py
index cadfd4e96..ef2778ed7 100644
--- a/unix-ffi/select/manifest.py
+++ b/unix-ffi/select/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.3")
+metadata(version="0.3.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/unix-ffi/time/manifest.py b/unix-ffi/time/manifest.py
index fcaaf7275..d13942cd6 100644
--- a/unix-ffi/time/manifest.py
+++ b/unix-ffi/time/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.5")
+metadata(version="0.5.0")
 
 require("ffilib", unix_ffi=True)
 
diff --git a/unix-ffi/timeit/manifest.py b/unix-ffi/timeit/manifest.py
index 82689bb8d..94b6a5fe9 100644
--- a/unix-ffi/timeit/manifest.py
+++ b/unix-ffi/timeit/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.3-3")
+metadata(version="3.3.4")
 
 require("getopt", unix_ffi=True)
 require("itertools")

From 752ce66c2435699cb3ceeeccda6ba67a7848968f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Jul 2023 10:26:05 +1000
Subject: [PATCH 186/343] github/workflows: Build all example .py files as part
 of CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/build_packages.yml | 2 ++
 tools/ci.sh                          | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index b6781be44..7ac4403b6 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -17,6 +17,8 @@ jobs:
       run: source tools/ci.sh && ci_build_packages_check_manifest
     - name: Compile package index
       run: source tools/ci.sh && ci_build_packages_compile_index
+    - name: Compile package examples
+      run: source tools/ci.sh && ci_build_packages_examples
     - name: Publish packages for branch
       if: vars.MICROPY_PUBLISH_MIP_INDEX && github.event_name == 'push' && ! github.event.deleted
       run: source tools/ci.sh && ci_push_package_index
diff --git a/tools/ci.sh b/tools/ci.sh
index 6490a95c0..81ec641f2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -41,6 +41,12 @@ function ci_build_packages_compile_index {
     python3 tools/build.py --micropython /tmp/micropython --output $PACKAGE_INDEX_PATH
 }
 
+function ci_build_packages_examples {
+    for example in $(find -path \*example\*.py); do
+        /tmp/micropython/mpy-cross/build/mpy-cross $example
+    done
+}
+
 function ci_push_package_index {
     set -euo pipefail
 

From 4da6e6f1b2791dd77da1287f355360be700d4f8c Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Wed, 3 May 2023 00:39:46 +0200
Subject: [PATCH 187/343] all: Lint Python code with ruff.

Signed-off-by: Christian Clauss <cclauss@me.com>
---
 .github/workflows/build_packages.yml          |  4 +-
 .../workflows/cleanup_published_packages.yml  |  2 +-
 .github/workflows/code_formatting.yml         |  6 +-
 micropython/aioespnow/aioespnow.py            |  6 +-
 .../aioble/examples/l2cap_file_client.py      |  2 +-
 .../aioble/examples/l2cap_file_server.py      |  2 +-
 micropython/drivers/codec/wm8960/wm8960.py    |  8 +-
 micropython/drivers/imu/bmi270/bmi270.py      |  8 +-
 micropython/drivers/imu/bmm150/bmm150.py      |  2 +-
 micropython/drivers/imu/lsm6dsox/lsm6dsox.py  | 10 +-
 .../drivers/imu/lsm6dsox/lsm6dsox_mlc.py      |  4 +-
 micropython/drivers/imu/lsm9ds1/lsm9ds1.py    | 12 +--
 .../lora/examples/simple_rxtx/simple_rxtx.py  |  2 +-
 .../examples/simple_rxtx/simple_rxtx_async.py |  2 +-
 micropython/lora/lora-sx126x/lora/sx126x.py   |  2 +-
 micropython/lora/lora/lora/modem.py           |  2 +-
 micropython/senml/examples/custom_record.py   |  2 +-
 .../senml/examples/gateway_actuators.py       |  2 +-
 micropython/senml/senml/senml_pack.py         |  6 +-
 micropython/senml/senml/senml_record.py       |  4 +-
 pyproject.toml                                | 93 +++++++++++++++++++
 python-ecosys/cbor2/cbor2/encoder.py          |  1 -
 python-ecosys/iperf3/iperf3.py                |  1 -
 python-ecosys/requests/requests/__init__.py   |  2 +-
 24 files changed, 139 insertions(+), 46 deletions(-)
 create mode 100644 pyproject.toml

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index 7ac4403b6..8854a7307 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -9,8 +9,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
     - name: Setup environment
       run: source tools/ci.sh && ci_build_packages_setup
     - name: Check manifest files
diff --git a/.github/workflows/cleanup_published_packages.yml b/.github/workflows/cleanup_published_packages.yml
index c6a33cece..040b09ff4 100644
--- a/.github/workflows/cleanup_published_packages.yml
+++ b/.github/workflows/cleanup_published_packages.yml
@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     if: vars.MICROPY_PUBLISH_MIP_INDEX
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Clean up published files
       run: source tools/ci.sh && ci_cleanup_package_index ${{ github.event.ref }}
diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index aab347d78..7e74776af 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -6,8 +6,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v3
+    - run: pip install --user ruff
+    - run: ruff --format=github .
+    - uses: actions/setup-python@v4
     - name: Install packages
       run: source tools/ci.sh && ci_code_formatting_setup
     - name: Run code formatting
diff --git a/micropython/aioespnow/aioespnow.py b/micropython/aioespnow/aioespnow.py
index fb27ad7ad..c00c6fb2b 100644
--- a/micropython/aioespnow/aioespnow.py
+++ b/micropython/aioespnow/aioespnow.py
@@ -11,17 +11,17 @@ class AIOESPNow(espnow.ESPNow):
     # Read one ESPNow message
     async def arecv(self):
         yield asyncio.core._io_queue.queue_read(self)
-        return self.recv(0)  # type: ignore
+        return self.recv(0)  # type: ignore[misc]
 
     async def airecv(self):
         yield asyncio.core._io_queue.queue_read(self)
-        return self.irecv(0)  # type: ignore
+        return self.irecv(0)  # type: ignore[misc]
 
     async def asend(self, mac, msg=None, sync=None):
         if msg is None:
             msg, mac = mac, None  # If msg is None: swap mac and msg
         yield asyncio.core._io_queue.queue_write(self)
-        return self.send(mac, msg, sync)  # type: ignore
+        return self.send(mac, msg, sync)  # type: ignore[misc]
 
     # "async for" support
     def __aiter__(self):
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_client.py b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
index 02d9f6d9b..68770f043 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_client.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
@@ -87,7 +87,7 @@ async def download(self, path, dest):
 
         send_seq = await self._command(_COMMAND_SEND, path.encode())
 
-        with open(dest, "wb") as f:
+        with open(dest, "wb") as f:  # noqa: ASYNC101
             total = 0
             buf = bytearray(self._channel.our_mtu)
             mv = memoryview(buf)
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_server.py b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
index b5ba27995..c3730ffd0 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_server.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
@@ -82,7 +82,7 @@ async def l2cap_task(connection):
 
             if send_file:
                 print("Sending:", send_file)
-                with open(send_file, "rb") as f:
+                with open(send_file, "rb") as f:  # noqa: ASYNC101
                     buf = bytearray(channel.peer_mtu)
                     mv = memoryview(buf)
                     while n := f.readinto(buf):
diff --git a/micropython/drivers/codec/wm8960/wm8960.py b/micropython/drivers/codec/wm8960/wm8960.py
index d1670220f..573fce5e9 100644
--- a/micropython/drivers/codec/wm8960/wm8960.py
+++ b/micropython/drivers/codec/wm8960/wm8960.py
@@ -578,7 +578,7 @@ def set_data_route(self, route):
             raise ValueError("Invalid route")
 
     def set_left_input(self, input):
-        if not input in self._input_config_table.keys():
+        if input not in self._input_config_table:
             raise ValueError("Invalid input")
 
         input = self._input_config_table[input]
@@ -595,7 +595,7 @@ def set_left_input(self, input):
             regs[_LINVOL] = input[1]
 
     def set_right_input(self, input):
-        if not input in self._input_config_table.keys():
+        if input not in self._input_config_table:
             raise ValueError("Invalid input name")
 
         input = self._input_config_table[input]
@@ -629,7 +629,7 @@ def config_data_format(self, sysclk, sample_rate, bits):
         self.regs[_IFACE1] = (_IFACE1_WL_MASK, wl << _IFACE1_WL_SHIFT)
 
     def volume(self, module, volume_l=None, volume_r=None):
-        if not module in self._volume_config_table.keys():
+        if module not in self._volume_config_table:
             raise ValueError("Invalid module")
 
         if volume_l is None:  # get volume
@@ -644,7 +644,7 @@ def volume(self, module, volume_l=None, volume_r=None):
 
             if not ((0 <= volume_l <= 100) and (0 <= volume_r <= 100)):
                 raise ValueError("Invalid value for volume")
-            elif not module in self._volume_config_table.keys():
+            elif module not in self._volume_config_table:
                 raise ValueError("Invalid module")
 
             vol_max, regnum, flags = self._volume_config_table[module]
diff --git a/micropython/drivers/imu/bmi270/bmi270.py b/micropython/drivers/imu/bmi270/bmi270.py
index 9e21b7395..db95658ff 100644
--- a/micropython/drivers/imu/bmi270/bmi270.py
+++ b/micropython/drivers/imu/bmi270/bmi270.py
@@ -524,13 +524,13 @@ def __init__(
         # Sanity checks
         if not self._use_i2c:
             raise ValueError("SPI mode is not supported")
-        if not gyro_odr in ODR:
+        if gyro_odr not in ODR:
             raise ValueError("Invalid gyro sampling rate: %d" % gyro_odr)
-        if not gyro_scale in GYRO_SCALE:
+        if gyro_scale not in GYRO_SCALE:
             raise ValueError("Invalid gyro scaling: %d" % gyro_scale)
-        if not accel_odr in ODR:
+        if accel_odr not in ODR:
             raise ValueError("Invalid accelerometer sampling rate: %d" % accel_odr)
-        if not accel_scale in ACCEL_SCALE:
+        if accel_scale not in ACCEL_SCALE:
             raise ValueError("Invalid accelerometer scaling: %d" % accel_scale)
         if self._read_reg(_CHIP_ID) != 0x24:
             raise OSError("No BMI270 device was found at address 0x%x" % (self.address))
diff --git a/micropython/drivers/imu/bmm150/bmm150.py b/micropython/drivers/imu/bmm150/bmm150.py
index 12220f643..b7b4aad30 100644
--- a/micropython/drivers/imu/bmm150/bmm150.py
+++ b/micropython/drivers/imu/bmm150/bmm150.py
@@ -80,7 +80,7 @@ def __init__(
         # Sanity checks
         if not self._use_i2c:
             raise ValueError("SPI mode is not supported")
-        if not magnet_odr in _ODR:
+        if magnet_odr not in _ODR:
             raise ValueError("Invalid sampling rate: %d" % magnet_odr)
 
         # Perform soft reset, and power on.
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
index 2e043f24c..1e4267ae7 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
@@ -130,20 +130,20 @@ def __init__(
         accel_odr = round(accel_odr, 2)
 
         # Sanity checks
-        if not gyro_odr in ODR:
+        if gyro_odr not in ODR:
             raise ValueError("Invalid sampling rate: %d" % gyro_odr)
-        if not gyro_scale in SCALE_GYRO:
+        if gyro_scale not in SCALE_GYRO:
             raise ValueError("invalid gyro scaling: %d" % gyro_scale)
-        if not accel_odr in ODR:
+        if accel_odr not in ODR:
             raise ValueError("Invalid sampling rate: %d" % accel_odr)
-        if not accel_scale in SCALE_ACCEL:
+        if accel_scale not in SCALE_ACCEL:
             raise ValueError("invalid accelerometer scaling: %d" % accel_scale)
 
         # Soft-reset the device.
         self.reset()
 
         # Load and configure MLC if UCF file is provided
-        if ucf != None:
+        if ucf is not None:
             self.load_mlc(ucf)
 
         # Set Gyroscope datarate and scale.
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
index ce3ff8e92..2a53b9402 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox_mlc.py
@@ -17,7 +17,7 @@ def imu_int_handler(pin):
     INT_FLAG = True
 
 
-if INT_MODE == True:
+if INT_MODE is True:
     int_pin = Pin(24)
     int_pin.irq(handler=imu_int_handler, trigger=Pin.IRQ_RISING)
 
@@ -44,5 +44,5 @@ def imu_int_handler(pin):
             print(UCF_LABELS[lsm.mlc_output()[0]])
     else:
         buf = lsm.mlc_output()
-        if buf != None:
+        if buf is not None:
             print(UCF_LABELS[buf[0]])
diff --git a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
index 8042ecc6f..7123a574b 100644
--- a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
+++ b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
@@ -95,19 +95,19 @@ def __init__(
         self.address_magnet = address_magnet
 
         # Sanity checks
-        if not gyro_odr in _ODR_IMU:
+        if gyro_odr not in _ODR_IMU:
             raise ValueError("Invalid gyro sampling rate: %d" % gyro_odr)
-        if not gyro_scale in _GYRO_SCALE:
+        if gyro_scale not in _GYRO_SCALE:
             raise ValueError("Invalid gyro scaling: %d" % gyro_scale)
 
-        if not accel_odr in _ODR_IMU:
+        if accel_odr not in _ODR_IMU:
             raise ValueError("Invalid accelerometer sampling rate: %d" % accel_odr)
-        if not accel_scale in _ACCEL_SCALE:
+        if accel_scale not in _ACCEL_SCALE:
             raise ValueError("Invalid accelerometer scaling: %d" % accel_scale)
 
-        if not magnet_odr in _ODR_MAGNET:
+        if magnet_odr not in _ODR_MAGNET:
             raise ValueError("Invalid magnet sampling rate: %d" % magnet_odr)
-        if not magnet_scale in _MAGNET_SCALE:
+        if magnet_scale not in _MAGNET_SCALE:
             raise ValueError("Invalid magnet scaling: %d" % magnet_scale)
 
         if (self.magent_id() != b"=") or (self.gyro_id() != b"h"):
diff --git a/micropython/lora/examples/simple_rxtx/simple_rxtx.py b/micropython/lora/examples/simple_rxtx/simple_rxtx.py
index 858570bc1..a5602b655 100644
--- a/micropython/lora/examples/simple_rxtx/simple_rxtx.py
+++ b/micropython/lora/examples/simple_rxtx/simple_rxtx.py
@@ -40,7 +40,7 @@ def main():
         print("Receiving...")
         rx = modem.recv(timeout_ms=5000)
         if rx:
-            print(f"Received: {repr(rx)}")
+            print(f"Received: {rx!r}")
         else:
             print("Timeout!")
         time.sleep(2)
diff --git a/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py b/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py
index f297059a5..9504aad48 100644
--- a/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py
+++ b/micropython/lora/examples/simple_rxtx/simple_rxtx_async.py
@@ -41,7 +41,7 @@ async def recv_coro(modem):
         print("Receiving...")
         rx = await modem.recv(2000)
         if rx:
-            print(f"Received: {repr(rx)}")
+            print(f"Received: {rx!r}")
         else:
             print("Receive timeout!")
 
diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index ada3616c6..7fbcce2f5 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -487,7 +487,7 @@ def calibrate_image(self):
         else:
             # DS says "Contact your Semtech representative for the other optimal
             # calibration settings outside of the given frequency bands"
-            raise ValueError()
+            raise ValueError
 
         self._cmd(">BH", _CMD_CALIBRATE_IMAGE, args)
 
diff --git a/micropython/lora/lora/lora/modem.py b/micropython/lora/lora/lora/modem.py
index 62313dc04..bb9b0c07d 100644
--- a/micropython/lora/lora/lora/modem.py
+++ b/micropython/lora/lora/lora/modem.py
@@ -282,7 +282,7 @@ def start_recv(self, timeout_ms=None, continuous=False, rx_length=0xFF):
         #
         # Part of common low-level modem API, see README.md for usage.
         if continuous and timeout_ms is not None:
-            raise ValueError()  # these two options are mutually exclusive
+            raise ValueError  # these two options are mutually exclusive
 
         if timeout_ms is not None:
             self._rx = time.ticks_add(time.ticks_ms(), timeout_ms)
diff --git a/micropython/senml/examples/custom_record.py b/micropython/senml/examples/custom_record.py
index e754c897c..e68d05f5b 100644
--- a/micropython/senml/examples/custom_record.py
+++ b/micropython/senml/examples/custom_record.py
@@ -43,7 +43,7 @@ def __init__(self, name, **kwargs):
 
     def _check_value_type(self, value):
         """overriding the check on value type to make certain that only an array with 3 values is assigned: lat,lon/alt"""
-        if not value == None:
+        if value is not None:
             if not isinstance(value, list):
                 raise Exception("invalid data type: array with 3 elements expected lat, lon, alt")
 
diff --git a/micropython/senml/examples/gateway_actuators.py b/micropython/senml/examples/gateway_actuators.py
index ae8514395..add5ed24c 100644
--- a/micropython/senml/examples/gateway_actuators.py
+++ b/micropython/senml/examples/gateway_actuators.py
@@ -56,7 +56,7 @@ def gateway_callback(record, **kwargs):
     :param kwargs: optional extra parameters (device can be found here)
     :return: None
     """
-    if "device" in kwargs and kwargs["device"] != None:
+    if "device" in kwargs and kwargs["device"] is not None:
         print("for device: " + kwargs["device"].name)
     else:
         print("for gateway: ")
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
index d528911ff..85b26d40b 100644
--- a/micropython/senml/senml/senml_pack.py
+++ b/micropython/senml/senml/senml_pack.py
@@ -47,7 +47,7 @@ def __next__(self):
             self._index += 1
             return res
         else:
-            raise StopIteration()
+            raise StopIteration
 
 
 class SenmlPack(SenmlBase):
@@ -156,7 +156,7 @@ def _check_value_type(self, value, field_name):
         checks if the type of value is allowed for senml
         :return: None, raisee exception if not ok.
         """
-        if not value == None:
+        if value is not None:
             if not (isinstance(value, int) or isinstance(value, float)):
                 raise Exception("invalid type for " + field_name + ", only numbers allowed")
 
@@ -330,7 +330,7 @@ def add(self, item):
         """
         if not (isinstance(item, SenmlBase)):
             raise Exception("invalid type of param, SenmlRecord or SenmlPack expected")
-        if not item._parent == None:
+        if item._parent is not None:
             raise Exception("item is already part of a pack")
 
         self._data.append(item)
diff --git a/micropython/senml/senml/senml_record.py b/micropython/senml/senml/senml_record.py
index fe7c56c46..9dfe22873 100644
--- a/micropython/senml/senml/senml_record.py
+++ b/micropython/senml/senml/senml_record.py
@@ -79,7 +79,7 @@ def _check_value_type(self, value):
         checks if the type of value is allowed for senml
         :return: None, raisee exception if not ok.
         """
-        if not value == None:
+        if value is not None:
             if not (
                 isinstance(value, bool)
                 or isinstance(value, int)
@@ -96,7 +96,7 @@ def _check_number_type(self, value, field_name):
         checks if the type of value is allowed for senml
         :return: None, raisee exception if not ok.
         """
-        if not value == None:
+        if value is not None:
             if not (isinstance(value, int) or isinstance(value, float)):
                 raise Exception("invalid type for " + field_name + ", only numbers allowed")
 
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..6828563c9
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,93 @@
+[tool.ruff]
+exclude = [
+  "python-stdlib",
+  "unix-ffi",
+]
+select = [
+  "ASYNC",  # flake8-comprehensions
+  "C4",     # flake8-comprehensions
+  "C90",    # McCabe cyclomatic complexity
+  "DTZ",    # flake8-datetimez
+  "E",      # pycodestyle
+  "EXE",    # flake8-executable
+  "F",      # Pyflakes
+  "G",      # flake8-logging-format
+  "ICN",    # flake8-import-conventions
+  "INT",    # flake8-gettext
+  "ISC",    # flake8-implicit-str-concat
+  "PGH",    # pygrep-hooks
+  "PIE",    # flake8-pie
+  "PL",     # Pylint
+  "PYI",    # flake8-pyi
+  "RSE",    # flake8-raise
+  "RUF",    # Ruff-specific rules
+  "T10",    # flake8-debugger
+  "TCH",    # flake8-type-checking
+  "W",      # pycodestyle
+  "YTT",    # flake8-2020
+  # "A",    # flake8-builtins
+  # "ANN",  # flake8-annotations
+  # "ARG",  # flake8-unused-arguments
+  # "B",    # flake8-bugbear
+  # "BLE",  # flake8-blind-except
+  # "COM",  # flake8-commas
+  # "D",    # pydocstyle
+  # "DJ",   # flake8-django
+  # "EM",   # flake8-errmsg
+  # "ERA",  # eradicate
+  # "FBT",  # flake8-boolean-trap
+  # "I",    # isort
+  # "INP",  # flake8-no-pep420
+  # "N",    # pep8-naming
+  # "NPY",  # NumPy-specific rules
+  # "PD",   # pandas-vet
+  # "PT",   # flake8-pytest-style
+  # "PTH",  # flake8-use-pathlib
+  # "Q",    # flake8-quotes
+  # "RET",  # flake8-return
+  # "S",    # flake8-bandit
+  # "SIM",  # flake8-simplify
+  # "SLF",  # flake8-self
+  # "T20",  # flake8-print
+  # "TID",  # flake8-tidy-imports
+  # "TRY",  # tryceratops
+  # "UP",   # pyupgrade
+]
+ignore = [
+  "E401",
+  "E402",
+  "E722",
+  "E741",
+  "F401",
+  "F403",
+  "F405",
+  "F541",
+  "F821",
+  "F841",
+  "ISC003",  # micropython does not support implicit concatenation of f-strings
+  "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
+  "PLC1901",
+  "PLR1701",
+  "PLR1714",
+  "PLR5501",
+  "PLW0602",
+  "PLW0603",
+  "PLW2901",
+  "RUF012",
+  "RUF100",
+]
+line-length = 260
+target-version = "py37"
+
+[tool.ruff.mccabe]
+max-complexity = 61
+
+[tool.ruff.pylint]
+allow-magic-value-types = ["bytes", "int", "str"]
+max-args = 14
+max-branches = 58
+max-returns = 13
+max-statements = 166
+
+[tool.ruff.per-file-ignores]
+"micropython/aiorepl/aiorepl.py" = ["PGH001"]
diff --git a/python-ecosys/cbor2/cbor2/encoder.py b/python-ecosys/cbor2/cbor2/encoder.py
index d739cea40..80a4ac022 100644
--- a/python-ecosys/cbor2/cbor2/encoder.py
+++ b/python-ecosys/cbor2/cbor2/encoder.py
@@ -25,7 +25,6 @@
 
 
 import io
-import math
 import struct
 
 
diff --git a/python-ecosys/iperf3/iperf3.py b/python-ecosys/iperf3/iperf3.py
index 614bc6193..71e4dae17 100644
--- a/python-ecosys/iperf3/iperf3.py
+++ b/python-ecosys/iperf3/iperf3.py
@@ -156,7 +156,6 @@ def report_receiver(self, stats):
             st["errors"],
             "  receiver",
         )
-        return
 
 
 def recvn(s, n):
diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index e1998711d..56b4a4f49 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -92,7 +92,7 @@ def request(
         if proto == "https:":
             s = ussl.wrap_socket(s, server_hostname=host)
         s.write(b"%s /%s HTTP/1.0\r\n" % (method, path))
-        if not "Host" in headers:
+        if "Host" not in headers:
             s.write(b"Host: %s\r\n" % host)
         # Iterate over keys to avoid tuple alloc
         for k in headers:

From 36e74c1b57e56a45fbe6713aa5a90e7c0a0f2ae0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 27 Jun 2023 00:30:45 +1000
Subject: [PATCH 188/343] zlib: Add zlib module.

This is a replacement for the `zlib` module that used to be built-in and
has been replaced by the MicroPython-specific `deflate` module.

Also updates the `gzip` module in a similar fashion and provide the
`gzip.GzipFile` class and `gzip.open` function.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/gzip/gzip.py     | 50 +++++++++++++++++-----------------
 python-stdlib/gzip/manifest.py |  2 +-
 python-stdlib/zlib/manifest.py |  3 ++
 python-stdlib/zlib/zlib.py     | 39 ++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 26 deletions(-)
 create mode 100644 python-stdlib/zlib/manifest.py
 create mode 100644 python-stdlib/zlib/zlib.py

diff --git a/python-stdlib/gzip/gzip.py b/python-stdlib/gzip/gzip.py
index 6d6c967a6..c4473becb 100644
--- a/python-stdlib/gzip/gzip.py
+++ b/python-stdlib/gzip/gzip.py
@@ -1,29 +1,29 @@
-# import zlib
-import uzlib as zlib
+# MicroPython gzip module
+# MIT license; Copyright (c) 2023 Jim Mussared
 
-FTEXT = 1
-FHCRC = 2
-FEXTRA = 4
-FNAME = 8
-FCOMMENT = 16
+_WBITS = const(15)
+
+import io, deflate
+
+
+def GzipFile(fileobj):
+    return deflate.DeflateIO(fileobj, deflate.GZIP, _WBITS)
+
+
+def open(filename, mode):
+    return deflate.DeflateIO(open(filename, mode), deflate.GZIP, _WBITS, True)
+
+
+if hasattr(deflate.DeflateIO, "write"):
+
+    def compress(data):
+        f = io.BytesIO()
+        with GzipFile(fileobj=f) as g:
+            g.write(data)
+        return f.getvalue()
 
 
 def decompress(data):
-    assert data[0] == 0x1F and data[1] == 0x8B
-    assert data[2] == 8
-    flg = data[3]
-    assert flg & 0xE0 == 0
-    i = 10
-    if flg & FEXTRA:
-        i += data[11] << 8 + data[10] + 2
-    if flg & FNAME:
-        while data[i]:
-            i += 1
-        i += 1
-    if flg & FCOMMENT:
-        while data[i]:
-            i += 1
-        i += 1
-    if flg & FHCRC:
-        i += 2
-    return zlib.decompress(memoryview(data)[i:], -15)
+    f = io.BytesIO(data)
+    with GzipFile(fileobj=f) as g:
+        return g.read()
diff --git a/python-stdlib/gzip/manifest.py b/python-stdlib/gzip/manifest.py
index eab70e56b..006b538c5 100644
--- a/python-stdlib/gzip/manifest.py
+++ b/python-stdlib/gzip/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.1")
+metadata(version="1.0.0")
 
 module("gzip.py")
diff --git a/python-stdlib/zlib/manifest.py b/python-stdlib/zlib/manifest.py
new file mode 100644
index 000000000..f95602f25
--- /dev/null
+++ b/python-stdlib/zlib/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="1.0.0", description="Compression and decompression using the deflate algorithm")
+
+module("zlib.py")
diff --git a/python-stdlib/zlib/zlib.py b/python-stdlib/zlib/zlib.py
new file mode 100644
index 000000000..e6c342ef7
--- /dev/null
+++ b/python-stdlib/zlib/zlib.py
@@ -0,0 +1,39 @@
+# MicroPython zlib module
+# MIT license; Copyright (c) 2023 Jim Mussared
+
+import io, deflate
+
+_MAX_WBITS = const(15)
+
+
+def _decode_wbits(wbits, decompress):
+    if -15 <= wbits <= -5:
+        return (
+            deflate.RAW,
+            -wbits,
+        )
+    elif 5 <= wbits <= 15:
+        return (deflate.ZLIB, wbits)
+    elif decompress and wbits == 0:
+        return (deflate.ZLIB,)
+    elif 21 <= wbits <= 31:
+        return (deflate.GZIP, wbits - 16)
+    elif decompress and 35 <= wbits <= 47:
+        return (deflate.AUTO, wbits - 32)
+    else:
+        raise ValueError("wbits")
+
+
+if hasattr(deflate.DeflateIO, "write"):
+
+    def compress(data, wbits=_MAX_WBITS):
+        f = io.BytesIO()
+        with deflate.DeflateIO(f, *_decode_wbits(wbits, False)) as g:
+            g.write(data)
+        return f.getvalue()
+
+
+def decompress(data, wbits=_MAX_WBITS):
+    f = io.BytesIO(data)
+    with deflate.DeflateIO(f, *_decode_wbits(wbits, True)) as g:
+        return g.read()

From 232859250c915a33349e7a25b7fdb1c6883b61bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 12:33:28 +1000
Subject: [PATCH 189/343] tools/codeformat.py: Remove git state detection.

This was added to speed up running codeformat.py when only a small number
of files are changed, but it breaks running the tool on the master branch.
The pre-commit tool handles this correctly, and it's working well in the
main repo, so we can remove the special handling.

This makes codeformat.py behave identically to the main repository, but
without additional code for handling .c/.h files.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/codeformat.py | 167 +++++++-------------------------------------
 1 file changed, 26 insertions(+), 141 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 63c9c5988..ebcb22416 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -5,7 +5,7 @@
 # The MIT License (MIT)
 #
 # Copyright (c) 2020 Damien P. George
-# Copyright (c) 2020 Jim Mussared
+# Copyright (c) 2023 Jim Mussared
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+# This is based on tools/codeformat.py from the main micropython/micropython
+# repository but without support for .c/.h files.
+
 import argparse
 import glob
 import itertools
@@ -34,9 +37,6 @@
 
 # Relative to top-level repo dir.
 PATHS = [
-    # C
-    "**/*.[ch]",
-    # Python
     "**/*.py",
 ]
 
@@ -45,19 +45,9 @@
 # Path to repo top-level dir.
 TOP = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 
-UNCRUSTIFY_CFG = os.path.join(TOP, "tools/uncrustify.cfg")
-
-C_EXTS = (
-    ".c",
-    ".h",
-)
 PY_EXTS = (".py",)
 
 
-MAIN_BRANCH = "master"
-BASE_BRANCH = os.environ.get("GITHUB_BASE_REF", MAIN_BRANCH)
-
-
 def list_files(paths, exclusions=None, prefix=""):
     files = set()
     for pattern in paths:
@@ -67,128 +57,33 @@ def list_files(paths, exclusions=None, prefix=""):
     return sorted(files)
 
 
-def fixup_c(filename):
-    # Read file.
-    with open(filename) as f:
-        lines = f.readlines()
-
-    # Write out file with fixups.
-    with open(filename, "w", newline="") as f:
-        dedent_stack = []
-        while lines:
-            # Get next line.
-            l = lines.pop(0)
-
-            # Dedent #'s to match indent of following line (not previous line).
-            m = re.match(r"( +)#(if |ifdef |ifndef |elif |else|endif)", l)
-            if m:
-                indent = len(m.group(1))
-                directive = m.group(2)
-                if directive in ("if ", "ifdef ", "ifndef "):
-                    l_next = lines[0]
-                    indent_next = len(re.match(r"( *)", l_next).group(1))
-                    if indent - 4 == indent_next and re.match(r" +(} else |case )", l_next):
-                        # This #-line (and all associated ones) needs dedenting by 4 spaces.
-                        l = l[4:]
-                        dedent_stack.append(indent - 4)
-                    else:
-                        # This #-line does not need dedenting.
-                        dedent_stack.append(-1)
-                else:
-                    if dedent_stack[-1] >= 0:
-                        # This associated #-line needs dedenting to match the #if.
-                        indent_diff = indent - dedent_stack[-1]
-                        assert indent_diff >= 0
-                        l = l[indent_diff:]
-                    if directive == "endif":
-                        dedent_stack.pop()
-
-            # Write out line.
-            f.write(l)
-
-        assert not dedent_stack, filename
-
-
-def query_git_files(verbose):
-    def cmd_result_set(cmd):
-        ret = subprocess.run(cmd, capture_output=True).stdout.strip().decode()
-        if not ret:
-            return set()
-        return {f.strip() for f in ret.split("\n")}
-
-    def rel_paths(files, root):
-        return {os.path.relpath(os.path.join(root, f.strip()), ".") for f in files}
-
-    try:
-        ret = set()
-
-        # get path to root of repository
-        root_dir = (
-            subprocess.run(["git", "rev-parse", "--show-toplevel"], capture_output=True)
-            .stdout.strip()
-            .decode()
-        )
-
-        # Check locally modified files
-        status = cmd_result_set(["git", "status", "--porcelain"])
-        dirty_files = rel_paths({line.split(" ", 1)[-1] for line in status}, root_dir)
-        ret |= dirty_files
-
-        # Current commit and branch
-        current_commit = (
-            subprocess.run(["git", "rev-parse", "HEAD"], capture_output=True)
-            .stdout.strip()
-            .decode()
-        )
-        current_branches = cmd_result_set(["git", "branch", "--contains", current_commit])
-        if MAIN_BRANCH in current_branches:
-            if ret:
-                if verbose:
-                    print("Local changes detected, only scanning them.")
-                return ret
-
-            # We're on clean master, run on entire repo
-            if verbose:
-                print("Scanning whole repository")
-            return None
-
-        # List the files modified on current branch
-        if verbose:
-            print("Scanning changes from current branch and any local changes")
-        files_on_branch = rel_paths(
-            cmd_result_set(["git", "diff", "--name-only", BASE_BRANCH]), root_dir
-        )
-        ret |= files_on_branch
-        return ret
-    except:
-        # Git not available, run on entire repo
-        return None
-
-
 def main():
-    cmd_parser = argparse.ArgumentParser(description="Auto-format C and Python files.")
-    cmd_parser.add_argument("-c", action="store_true", help="Format C code only")
-    cmd_parser.add_argument("-p", action="store_true", help="Format Python code only")
+    cmd_parser = argparse.ArgumentParser(description="Auto-format Python files.")
     cmd_parser.add_argument("-v", action="store_true", help="Enable verbose output")
     cmd_parser.add_argument(
-        "files",
-        nargs="*",
-        help="Run on specific globs. If not specied current branch changes will be used",
+        "-f",
+        action="store_true",
+        help="Filter files provided on the command line against the default list of files to check.",
     )
+    cmd_parser.add_argument("files", nargs="*", help="Run on specific globs")
     args = cmd_parser.parse_args()
 
-    # Setting only one of -c or -p disables the other. If both or neither are set, then do both.
-    format_c = args.c or not args.p
-    format_py = args.p or not args.c
-
     # Expand the globs passed on the command line, or use the default globs above.
     files = []
     if args.files:
         files = list_files(args.files)
+        if args.f:
+            # Filter against the default list of files. This is a little fiddly
+            # because we need to apply both the inclusion globs given in PATHS
+            # as well as the EXCLUSIONS, and use absolute paths
+            files = set(os.path.abspath(f) for f in files)
+            all_files = set(list_files(PATHS, EXCLUSIONS, TOP))
+            if args.v:  # In verbose mode, log any files we're skipping
+                for f in files - all_files:
+                    print("Not checking: {}".format(f))
+            files = list(files & all_files)
     else:
-        files = query_git_files(verbose=args.v)
-        if not files:
-            files = list_files(PATHS, EXCLUSIONS, TOP)
+        files = list_files(PATHS, EXCLUSIONS, TOP)
 
     # Extract files matching a specific language.
     def lang_files(exts):
@@ -204,23 +99,13 @@ def batch(cmd, files, N=200):
                 break
             subprocess.check_call(cmd + file_args)
 
-    # Format C files with uncrustify.
-    if format_c:
-        command = ["uncrustify", "-c", UNCRUSTIFY_CFG, "-lC", "--no-backup"]
-        if not args.v:
-            command.append("-q")
-        batch(command, lang_files(C_EXTS))
-        for file in lang_files(C_EXTS):
-            fixup_c(file)
-
     # Format Python files with black.
-    if format_py:
-        command = ["black", "--fast", "--line-length=99"]
-        if args.v:
-            command.append("-v")
-        else:
-            command.append("-q")
-        batch(command, lang_files(PY_EXTS))
+    command = ["black", "--fast", "--line-length=99"]
+    if args.v:
+        command.append("-v")
+    else:
+        command.append("-q")
+    batch(command, lang_files(PY_EXTS))
 
 
 if __name__ == "__main__":

From 5cdfe715364844ad783d4ad63394099b7dc33109 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 12:37:06 +1000
Subject: [PATCH 190/343] top: Add pre-commit config.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .pre-commit-config.yaml | 11 +++++++++++
 CONTRIBUTING.md         | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..e017b86e8
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,11 @@
+repos:
+  - repo: local
+    hooks:
+      - id: codeformat
+        name: MicroPython codeformat.py for changed files
+        entry: tools/codeformat.py -v -f
+        language: python
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.280
+    hooks:
+      - id: ruff
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 804a26bef..d590754e9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,11 +25,21 @@ or packages from micropython-lib, please post at the
 ### Pull requests
 
 The same rules for commit messages, signing-off commits, and commit structure
-apply as for the main MicroPython repository. All Python code is formatted
-using `black`. See [`tools/codeformat.py`](tools/codeformat.py) to apply
-`black` automatically before submitting a PR.
+apply [as for the main MicroPython repository](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
 
-There are some specific conventions and guidelines for micropython-lib:
+All Python code is formatted using the [black](https://github.com/psf/black)
+tool. You can run [`tools/codeformat.py`](tools/codeformat.py) to apply
+`black` automatically before submitting a PR. The GitHub CI will also run the
+[ruff](https://github.com/astral-sh/ruff) tool to apply further "linting"
+checks.
+
+Similar to the main repository, a configuration is provided for the
+[pre-commit](https://pre-commit.com/) tool to apply `black` code formatting
+rules and run `ruff` automatically. See the documentation for using pre-commit
+in [the code conventions document](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md#automatic-pre-commit-hooks)
+
+In addition to the conventions from the main repository, there are some
+specific conventions and guidelines for micropython-lib:
 
 * The first line of the commit message should start with the name of the
   package, followed by a short description of the commit. Package names are

From efa04028466b8aae30adb63a215b6c4f52c52d0f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 12:46:49 +1000
Subject: [PATCH 191/343] tools/codeformat.py: Fix ruff warnings.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/codeformat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index ebcb22416..2bc0c7f44 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -76,7 +76,7 @@ def main():
             # Filter against the default list of files. This is a little fiddly
             # because we need to apply both the inclusion globs given in PATHS
             # as well as the EXCLUSIONS, and use absolute paths
-            files = set(os.path.abspath(f) for f in files)
+            files = {os.path.abspath(f) for f in files}
             all_files = set(list_files(PATHS, EXCLUSIONS, TOP))
             if args.v:  # In verbose mode, log any files we're skipping
                 for f in files - all_files:

From ce3f282967ded48d21bf6588834893c066e4be8b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 25 Jul 2023 12:53:15 +1000
Subject: [PATCH 192/343] github/workflows: Split ruff into its own action.

This matches the main repo, and conceputually ruff is not strictly doing
"code formatting".

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/code_formatting.yml |  2 --
 .github/workflows/ruff.yml            | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/ruff.yml

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 7e74776af..71c50aa1b 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -7,8 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - run: pip install --user ruff
-    - run: ruff --format=github .
     - uses: actions/setup-python@v4
     - name: Install packages
       run: source tools/ci.sh && ci_code_formatting_setup
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
new file mode 100644
index 000000000..b8e43dc78
--- /dev/null
+++ b/.github/workflows/ruff.yml
@@ -0,0 +1,10 @@
+# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+name: Python code lint with ruff
+on: [push, pull_request]
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - run: pip install --user ruff
+    - run: ruff --format=github .

From 01ab7ba6e27e0b7350e9f6da5b7096fa0a7b0d70 Mon Sep 17 00:00:00 2001
From: Graeme Winter <graeme.winter@gmail.com>
Date: Sun, 21 May 2023 21:32:42 +0100
Subject: [PATCH 193/343] iperf3: Add compatibility for servers pre version
 3.2.

Result message from servers pre version 3.2 do not encode start or end
time, so workaround this by using the t3, t0 timestamps used elsewhere for
sending.

Fixes issue #665.
---
 python-ecosys/iperf3/iperf3.py   | 10 +++++++---
 python-ecosys/iperf3/manifest.py |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/python-ecosys/iperf3/iperf3.py b/python-ecosys/iperf3/iperf3.py
index 71e4dae17..62ee01683 100644
--- a/python-ecosys/iperf3/iperf3.py
+++ b/python-ecosys/iperf3/iperf3.py
@@ -147,10 +147,14 @@ def stop(self):
 
     def report_receiver(self, stats):
         st = stats["streams"][0]
-        dt = st["end_time"] - st["start_time"]
+
+        # iperf servers pre 3.2 do not transmit start or end time,
+        # so use local as fallback if not available.
+        dt = ticks_diff(self.t3, self.t0)
+
         self.print_line(
-            st["start_time"],
-            st["end_time"],
+            st.get("start_time", 0.0),
+            st.get("end_time", dt * 1e-6),
             st["bytes"],
             st["packets"],
             st["errors"],
diff --git a/python-ecosys/iperf3/manifest.py b/python-ecosys/iperf3/manifest.py
index 3f2e26237..06964ce2a 100644
--- a/python-ecosys/iperf3/manifest.py
+++ b/python-ecosys/iperf3/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.3", pypi="iperf3", pypi_publish="uiperf3")
+metadata(version="0.1.4", pypi="iperf3", pypi_publish="uiperf3")
 
 module("iperf3.py")

From 674e734a1cc1f3ea66b24d3fa490a01a94ed6d08 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:59:03 +1000
Subject: [PATCH 194/343] drivers/display/lcd160cr: Use isinstance() for type
 checking.

Fixes linter warning E721, expanded in Ruff 823 to include
direct comparison against built-in types.
---
 micropython/drivers/display/lcd160cr/lcd160cr_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/drivers/display/lcd160cr/lcd160cr_test.py b/micropython/drivers/display/lcd160cr/lcd160cr_test.py
index 883c7d3b7..c717a3fd5 100644
--- a/micropython/drivers/display/lcd160cr/lcd160cr_test.py
+++ b/micropython/drivers/display/lcd160cr/lcd160cr_test.py
@@ -5,7 +5,7 @@
 
 
 def get_lcd(lcd):
-    if type(lcd) is str:
+    if isinstance(lcd, str):
         lcd = lcd160cr.LCD160CR(lcd)
     return lcd
 

From 86050c3d7a2db936339ce4bfbd062c3eda7bb193 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:51:11 +1000
Subject: [PATCH 195/343] bmm150: Remove broken reset function.

Looks like copy-pasta from bmi270 driver.

There is a soft reset capability documented in the BMM150 datasheet, but it
uses different register bits and I don't have a BMM150 at hand to test it.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/drivers/imu/bmm150/bmm150.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/micropython/drivers/imu/bmm150/bmm150.py b/micropython/drivers/imu/bmm150/bmm150.py
index b7b4aad30..036b2b258 100644
--- a/micropython/drivers/imu/bmm150/bmm150.py
+++ b/micropython/drivers/imu/bmm150/bmm150.py
@@ -165,9 +165,6 @@ def _compensate_z(self, raw, hall):
             z = (z5 / (z4 * 4)) / 16
         return z
 
-    def reset(self):
-        self._write_reg(_CMD, 0xB6)
-
     def magnet_raw(self):
         for i in range(0, 10):
             self._read_reg_into(_DATA, self.scratch)

From 2d16f210b96c48a598b3595ad55313c21deac06e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:52:15 +1000
Subject: [PATCH 196/343] lsm6dsox: Add missing time import.

Driver calls time.sleep_ms() in one place.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/drivers/imu/lsm6dsox/lsm6dsox.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
index 1e4267ae7..1952c5bb1 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
@@ -46,6 +46,7 @@
 
 import array
 from micropython import const
+import time
 
 _CTRL3_C = const(0x12)
 _CTRL1_XL = const(0x10)

From 1f3002b53731de7658f98d74a4d4fe7d47eb7ac9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:52:50 +1000
Subject: [PATCH 197/343] wm8960: Add missing self reference for sample table.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/drivers/codec/wm8960/wm8960.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/drivers/codec/wm8960/wm8960.py b/micropython/drivers/codec/wm8960/wm8960.py
index 573fce5e9..dc0dd655d 100644
--- a/micropython/drivers/codec/wm8960/wm8960.py
+++ b/micropython/drivers/codec/wm8960/wm8960.py
@@ -683,7 +683,7 @@ def alc_mode(self, channel, mode=ALC_MODE):
         )
         self.regs[_ALC3] = (_ALC_MODE_MASK, mode << _ALC_MODE_SHIFT)
         try:
-            rate = _alc_sample_rate_table[self.sample_rate]
+            rate = self._alc_sample_rate_table[self.sample_rate]
         except:
             rate = 0
         self.regs[_ADDCTL3] = (_DACCTL3_ALCSR_MASK, rate)

From 786c0ea895ffebdd7a40dd0d5ec1a0515edd4a25 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:50:57 +1000
Subject: [PATCH 198/343] all: Add missing const imports

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/aiorepl/aiorepl.py              | 1 +
 micropython/drivers/imu/lsm9ds1/lsm9ds1.py  | 1 +
 micropython/drivers/sensor/lps22h/lps22h.py | 1 +
 micropython/mip/mip/__init__.py             | 1 +
 micropython/net/webrepl/webrepl.py          | 1 +
 5 files changed, 5 insertions(+)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 8ebaef079..8b3ce4f8c 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -1,6 +1,7 @@
 # MIT license; Copyright (c) 2022 Jim Mussared
 
 import micropython
+from micropython import const
 import re
 import sys
 import time
diff --git a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
index 7123a574b..e3d46429d 100644
--- a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
+++ b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
@@ -44,6 +44,7 @@
     time.sleep_ms(100)
 """
 import array
+from micropython import const
 
 
 _WHO_AM_I = const(0xF)
diff --git a/micropython/drivers/sensor/lps22h/lps22h.py b/micropython/drivers/sensor/lps22h/lps22h.py
index ca29efce2..1e7f4ec3e 100644
--- a/micropython/drivers/sensor/lps22h/lps22h.py
+++ b/micropython/drivers/sensor/lps22h/lps22h.py
@@ -38,6 +38,7 @@
     time.sleep_ms(10)
 """
 import machine
+from micropython import const
 
 _LPS22_CTRL_REG1 = const(0x10)
 _LPS22_CTRL_REG2 = const(0x11)
diff --git a/micropython/mip/mip/__init__.py b/micropython/mip/mip/__init__.py
index 5f6f4fcd6..68daf32fe 100644
--- a/micropython/mip/mip/__init__.py
+++ b/micropython/mip/mip/__init__.py
@@ -1,6 +1,7 @@
 # MicroPython package installer
 # MIT license; Copyright (c) 2022 Jim Mussared
 
+from micropython import const
 import requests
 import sys
 
diff --git a/micropython/net/webrepl/webrepl.py b/micropython/net/webrepl/webrepl.py
index 56767d8b7..48c181968 100644
--- a/micropython/net/webrepl/webrepl.py
+++ b/micropython/net/webrepl/webrepl.py
@@ -1,6 +1,7 @@
 # This module should be imported from REPL, not run from command line.
 import binascii
 import hashlib
+from micropython import const
 import network
 import os
 import socket

From c6a72c70b9bb516bdc9fd234b321b5b20ac7bf90 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:53:18 +1000
Subject: [PATCH 199/343] cbor2: Improve decoder to pass Ruff F821
 undefined-name.

These were probably intentional missing names, however raising
NotImplementedError or KeyError is more explicit than trying to call an
unknown function.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 python-ecosys/cbor2/cbor2/decoder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-ecosys/cbor2/cbor2/decoder.py b/python-ecosys/cbor2/cbor2/decoder.py
index f0784d4be..48ff02d89 100644
--- a/python-ecosys/cbor2/cbor2/decoder.py
+++ b/python-ecosys/cbor2/cbor2/decoder.py
@@ -160,7 +160,7 @@ def decode_simple_value(decoder):
 
 def decode_float16(decoder):
     payload = decoder.read(2)
-    return unpack_float16(payload)
+    raise NotImplementedError  # no float16 unpack function
 
 
 def decode_float32(decoder):
@@ -185,7 +185,7 @@ def decode_float64(decoder):
     20: lambda self: False,
     21: lambda self: True,
     22: lambda self: None,
-    23: lambda self: undefined,
+    # 23 is undefined
     24: decode_simple_value,
     25: decode_float16,
     26: decode_float32,

From 991ac986fd45781f99e9de36fefdc5c4838b99f0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:54:20 +1000
Subject: [PATCH 200/343] iperf3: Pre-declare some variables set in the loop.

This is a change just to make the linter happy, the code
probably would have run OK without it.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 python-ecosys/iperf3/iperf3.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python-ecosys/iperf3/iperf3.py b/python-ecosys/iperf3/iperf3.py
index 62ee01683..a5c54445d 100644
--- a/python-ecosys/iperf3/iperf3.py
+++ b/python-ecosys/iperf3/iperf3.py
@@ -380,9 +380,11 @@ def client(host, udp=False, reverse=False, bandwidth=10 * 1024 * 1024):
     ticks_us_end = param["time"] * 1000000
     poll = select.poll()
     poll.register(s_ctrl, select.POLLIN)
+    buf = None
     s_data = None
     start = None
     udp_packet_id = 0
+    udp_last_send = None
     while True:
         for pollable in poll.poll(stats.max_dt_ms()):
             if pollable_is_sock(pollable, s_data):

From b46306cc5a7ce9332407345025cba4afca6ca967 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:54:57 +1000
Subject: [PATCH 201/343] uaiohttpclient: Fix missing name in unreachable
 example code.

As-written this code is unreachable (return statement two line above),
so this change is really just to make the linter happy.

Found by Ruff checking F821.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/uaiohttpclient/example.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/uaiohttpclient/example.py b/micropython/uaiohttpclient/example.py
index 4134c7ee7..5c03ee29f 100644
--- a/micropython/uaiohttpclient/example.py
+++ b/micropython/uaiohttpclient/example.py
@@ -9,7 +9,7 @@ def print_stream(resp):
     print((yield from resp.read()))
     return
     while True:
-        line = yield from reader.readline()
+        line = yield from resp.readline()
         if not line:
             break
         print(line.rstrip())

From 5b6fb2bc565315a0ce3470bf6b4bdbcd70b0df7a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 18:55:48 +1000
Subject: [PATCH 202/343] top: Enable Ruff linter to check undefined-name
 (F821).

Also adds some global ignores for manifest files (which have implicit
imports) and the multitests (which have the same).

Other F821 fixes or accommodations are in the parent commits to this
commit.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 pyproject.toml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6828563c9..1aa9c1122 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,6 @@ ignore = [
   "F403",
   "F405",
   "F541",
-  "F821",
   "F841",
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
@@ -91,3 +90,10 @@ max-statements = 166
 
 [tool.ruff.per-file-ignores]
 "micropython/aiorepl/aiorepl.py" = ["PGH001"]
+
+# manifest.py files are evaluated with some global names pre-defined
+"**/manifest.py" = ["F821"]
+"ports/**/boards/manifest*.py" = ["F821"]
+
+# ble multitests are evaluated with some names pre-defined
+"micropython/bluetooth/aioble/multitests/*" = ["F821"]

From 1b557eee5c887dc9edd770c86fad7491f7a61b31 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Aug 2023 11:41:22 +1000
Subject: [PATCH 203/343] lsm6dsox: Bump patch version.

For changes in 2d16f210b96c48a598b3595ad55313c21deac06e.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/drivers/imu/lsm6dsox/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/drivers/imu/lsm6dsox/manifest.py b/micropython/drivers/imu/lsm6dsox/manifest.py
index 3bf037679..346255fe7 100644
--- a/micropython/drivers/imu/lsm6dsox/manifest.py
+++ b/micropython/drivers/imu/lsm6dsox/manifest.py
@@ -1,2 +1,2 @@
-metadata(description="ST LSM6DSOX imu driver.", version="1.0.0")
+metadata(description="ST LSM6DSOX imu driver.", version="1.0.1")
 module("lsm6dsox.py", opt=3)

From dc765ad82266365b5e141f30e7fe1fcfca67685a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Aug 2023 11:42:00 +1000
Subject: [PATCH 204/343] wm8960: Bump patch version.

For changes in 1f3002b53731de7658f98d74a4d4fe7d47eb7ac9.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/drivers/codec/wm8960/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/drivers/codec/wm8960/manifest.py b/micropython/drivers/codec/wm8960/manifest.py
index 2184ba547..3c8922645 100644
--- a/micropython/drivers/codec/wm8960/manifest.py
+++ b/micropython/drivers/codec/wm8960/manifest.py
@@ -1,3 +1,3 @@
-metadata(description="WM8960 codec.", version="0.1.0")
+metadata(description="WM8960 codec.", version="0.1.1")
 
 module("wm8960.py", opt=3)

From 93bf707d6f233fc06f88c63c3f66f08c9568f577 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 8 Aug 2023 16:46:52 +1000
Subject: [PATCH 205/343] lora: Remove the pin parameter from IRQ callback.

It's not necessary to know which pin triggered the IRQ, and it saves some
code size.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/README.md                    | 14 +++++++-----
 .../lora/lora-async/lora/async_modem.py       |  5 ++---
 micropython/lora/lora-async/manifest.py       |  2 +-
 micropython/lora/lora/lora/modem.py           | 22 +++++--------------
 micropython/lora/lora/manifest.py             |  2 +-
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/micropython/lora/README.md b/micropython/lora/README.md
index f4786afd4..fdb83638d 100644
--- a/micropython/lora/README.md
+++ b/micropython/lora/README.md
@@ -1028,12 +1028,12 @@ following different approaches:
   `poll_send()` now?" check function if there's no easy way to determine
   which interrupt has woken the board up.
 * Implement a custom interrupt callback function and call
-  `modem.set_irq_callback()` to install it. The function will be called with a
-  single argument, which is either the `Pin` that triggered a hardware interrupt
-  or `None` for a soft interrupt. Refer to the documentation about [writing interrupt
-  handlers](https://docs.micropython.org/en/latest/reference/isr_rules.html) for
-  more information. The `lora-async` modem classes install their own callback here,
-  so it's not possible to mix this approach with the provided asynchronous API.
+  `modem.set_irq_callback()` to install it. The function will be called if a
+  hardware interrupt occurs, possibly in hard interrupt context. Refer to the
+  documentation about [writing interrupt handlers][isr_rules] for more
+  information. It may also be called if the driver triggers a soft interrupt.
+  The `lora-async` modem classes install their own callback here, so it's not
+  possible to mix this approach with the provided asynchronous API.
 * Call `modem.poll_recv()` or `modem.poll_send()`. This takes more time
   and uses more power as it reads the modem IRQ status directly from the modem
   via SPI, but it also give the most definite result.
@@ -1154,3 +1154,5 @@ Usually, this means the constructor parameter `dio3_tcxo_millivolts` (see above)
 must be set as the SX126x chip DIO3 output pin is the power source for the TCXO
 connected to the modem.  Often this parameter should be set to `3300` (3.3V) but
 it may be another value, consult the documentation for your LoRa modem module.
+
+[isr_rules]: https://docs.micropython.org/en/latest/reference/isr_rules.html
diff --git a/micropython/lora/lora-async/lora/async_modem.py b/micropython/lora/lora-async/lora/async_modem.py
index e21f2f522..e46d625fb 100644
--- a/micropython/lora/lora-async/lora/async_modem.py
+++ b/micropython/lora/lora-async/lora/async_modem.py
@@ -111,9 +111,8 @@ async def _wait(self, will_irq, idx, timeout_ms):
         if _DEBUG:
             print(f"wait complete")
 
-    def _callback(self, _):
-        # IRQ callback from BaseModem._radio_isr. Hard IRQ context unless _DEBUG
-        # is on.
+    def _callback(self):
+        # IRQ callback from BaseModem._radio_isr. May be in Hard IRQ context.
         #
         # Set both RX & TX flag. This isn't necessary for "real" interrupts, but may be necessary
         # to wake both for the case of a "soft" interrupt triggered by sleep() or standby(), where
diff --git a/micropython/lora/lora-async/manifest.py b/micropython/lora/lora-async/manifest.py
index 57b9d21d8..1936a50e4 100644
--- a/micropython/lora/lora-async/manifest.py
+++ b/micropython/lora/lora-async/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("lora")
 package("lora")
diff --git a/micropython/lora/lora/lora/modem.py b/micropython/lora/lora/lora/modem.py
index bb9b0c07d..e71d4ec72 100644
--- a/micropython/lora/lora/lora/modem.py
+++ b/micropython/lora/lora/lora/modem.py
@@ -233,25 +233,16 @@ def get_time_on_air_us(self, payload_len):
     #
     # ISR implementation is relatively simple, just exists to signal an optional
     # callback, record a timestamp, and wake up the hardware if
-    # needed. ppplication code is expected to call poll_send() or
+    # needed. Application code is expected to call poll_send() or
     # poll_recv() as applicable in order to confirm the modem state.
     #
-    # This is a MP hard irq in some configurations, meaning no memory allocation is possible.
-    #
-    # 'pin' may also be None if this is a "soft" IRQ triggered after a receive
-    # timed out during a send (meaning no receive IRQ will fire, but the
-    # receiver should wake up and move on anyhow.)
-    def _radio_isr(self, pin):
+    # This is a MP hard irq in some configurations.
+    def _radio_isr(self, _):
         self._last_irq = time.ticks_ms()
         if self._irq_callback:
-            self._irq_callback(pin)
+            self._irq_callback()
         if _DEBUG:
-            # Note: this may cause a MemoryError and fail if _DEBUG is enabled in this base class
-            # but disabled in the subclass, meaning this is a hard irq handler
-            try:
-                print("_radio_isr pin={}".format(pin))
-            except MemoryError:
-                pass
+            print("_radio_isr")
 
     def irq_triggered(self):
         # Returns True if the ISR has executed since the last time a send or a receive
@@ -264,8 +255,7 @@ def set_irq_callback(self, callback):
         # This is used by the AsyncModem implementation, but can be called in
         # other circumstances to implement custom ISR logic.
         #
-        # Note that callback may be called in hard ISR context, meaning no
-        # memory allocation is possible.
+        # Note that callback may be called in hard ISR context.
         self._irq_callback = callback
 
     def _get_last_irq(self):
diff --git a/micropython/lora/lora/manifest.py b/micropython/lora/lora/manifest.py
index b4312a0e2..e4e325aba 100644
--- a/micropython/lora/lora/manifest.py
+++ b/micropython/lora/lora/manifest.py
@@ -1,2 +1,2 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 package("lora")

From ed688cf01950cb0e7ceeb6482495909e6103d453 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Thu, 10 Nov 2022 12:55:49 +1100
Subject: [PATCH 206/343] lora: Add STM32WL55 subghz LoRa modem class.

Support depends on hardware support in MicroPython.

Also includes some tweaks in the SX126x base class, to deal with slightly
different platform configuration on STM32WL55, longer timeouts, tx_ant
options, etc.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/README.md                    |  89 +++++++++---
 .../lora/lora-stm32wl5/lora/stm32wl5.py       | 134 ++++++++++++++++++
 micropython/lora/lora-stm32wl5/manifest.py    |   3 +
 micropython/lora/lora-sx126x/lora/sx126x.py   |  20 +--
 micropython/lora/lora-sx126x/manifest.py      |   2 +-
 micropython/lora/lora/lora/__init__.py        |  11 ++
 micropython/lora/lora/manifest.py             |   2 +-
 7 files changed, 233 insertions(+), 28 deletions(-)
 create mode 100644 micropython/lora/lora-stm32wl5/lora/stm32wl5.py
 create mode 100644 micropython/lora/lora-stm32wl5/manifest.py

diff --git a/micropython/lora/README.md b/micropython/lora/README.md
index fdb83638d..c32ae9158 100644
--- a/micropython/lora/README.md
+++ b/micropython/lora/README.md
@@ -16,6 +16,7 @@ Currently these radio modem chipsets are supported:
 * SX1277
 * SX1278
 * SX1279
+* STM32WL55 "sub-GHz radio" peripheral
 
 Most radio configuration features are supported, as well as transmitting or
 receiving packets.
@@ -37,6 +38,7 @@ modem model that matches your hardware:
 
 - `lora-sx126x` for SX1261 & SX1262 support.
 - `lora-sx127x` for SX1276-SX1279 support.
+- `lora-stm32wl5` for STM32WL55 support.
 
 It's recommended to install only the packages that you need, to save firmware
 size.
@@ -113,6 +115,24 @@ example: lower max frequency, lower maximum SF value) is responsibility of the
 calling code. When possible please use the correct class anyhow, as per-part
 code may be added in the future.
 
+### Creating STM32WL55
+
+```
+from lora import WL55SubGhzModem
+
+def get_modem():
+    # The LoRa configuration will depend on your board and location, see
+    # below under "Modem Configuration" for some possible examples.
+    lora_cfg = { 'freq_khz': SEE_BELOW_FOR_CORRECT_VALUE }
+    return WL55SubGhzModem(lora_cfg)
+
+modem = get_modem()
+```
+
+Note: As this is an internal peripheral of the STM32WL55 microcontroller,
+support also depends on MicroPython being built for a board based on this
+microcontroller.
+
 ### Notes about initialisation
 
 * See below for details about the `lora_cfg` structure that configures the modem's
@@ -157,6 +177,15 @@ Here is a full list of parameters that can be passed to both constructors:
 | `lora_cfg`    | No       | If set to an initial LoRa configuration then the modem is set up with this configuration. If not set here, can be set by calling `configure()` later on.                                                                                                         |   |
 | `ant`_sw      | No       | Optional antenna switch object instance, see below for description.                                                                                                                                                                                              |   |
 
+#### STM32WL55
+
+| Parameter         | Required | Description                                                                                                                                                                    |
+|-------------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `lora_cfg`        | No       | If set to an initial LoRa configuration then the modem is set up with this configuration. If not set here, can be set by calling `configure()` later on.                       |
+| `tcxo_millivolts` | No       | Defaults to 1700. The voltage supplied on pin PB0_VDDTCXO. See `dio3_tcxo_millivolts` above for details, this parameter has the same behaviour.                                |
+| ant_sw            | No       | Defaults to an instance of `lora.NucleoWL55RFConfig` class for the NUCLEO-WL55 development board. Set to `None` to disable any automatic antenna switching. See below for description.                               |
+
+
 ## Modem Configuration
 
 It is necessary to correctly configure the modem before use. At minimum, the
@@ -383,10 +412,11 @@ Type: `str`, not case sensitive
 
 Default: RFO_HF or RFO_LF (low power)
 
-SX127x modems have multiple antenna pins for different power levels and
-frequency ranges. The board/module that the LoRa modem chip is on may have
-particular antenna connections, or even an RF switch that needs to be set via a
-GPIO to connect an antenna pin to a particular output (see `ant_sw`, below).
+SX127x modems and STM32WL55 microcontrollers have multiple antenna pins for
+different power levels and frequency ranges. The board/module that the LoRa
+modem chip is on may have particular antenna connections, or even an RF switch
+that needs to be set via a GPIO to connect an antenna pin to a particular output
+(see `ant_sw`, below).
 
 The driver must configure the modem to use the correct pin for a particular
 hardware antenna connection before transmitting. When receiving, the modem
@@ -396,7 +426,7 @@ A common symptom of incorrect `tx_ant` setting is an extremely weak RF signal.
 
 Consult modem datasheet for more details.
 
-SX127x values:
+##### SX127x tx_ant
 
 | Value           | RF Transmit Pin                  |
 |-----------------|----------------------------------|
@@ -407,7 +437,15 @@ Pin "RFO_HF" is automatically used for frequencies above 862MHz, and is not
 supported on SX1278. "RFO_LF" is used for frequencies below 862MHz. Consult
 datasheet Table 32 "Frequency Bands" for more details.
 
-**Important**: If changing `tx_ant` value, configure `output_power` at the same
+##### WL55SubGhzModem tx_ant
+
+| Value           | RF Transmit Pin         |
+|-----------------|-------------------------|
+| `"PA_BOOST"`    | RFO_HP pin (high power) |
+| Any other value | RFO_LP pin (low power)  |
+
+
+**Important**: If setting `tx_ant` value, also set `output_power` at the same
 time or again before transmitting.
 
 #### `output_power` - Transmit output power level
@@ -415,15 +453,17 @@ Type: `int`
 
 Default: Depends on modem
 
-Nominal TX output power in dBm. The possible range depends on the modem and (for
-SX127x only) the `tx_ant` configuration.
+Nominal TX output power in dBm. The possible range depends on the modem and for
+some modems the `tx_ant` configuration.
 
-| Modem  | `tx_ant` value   | Range             | "Optimal"              |
-|--------|------------------|-------------------|------------------------|
-| SX1261 | N/A              | -17 to +15        | +10, +14 or +15 [*][^] |
-| SX1262 | N/A              | -9 to +22         | +14, +17, +20, +22 [*] |
-| SX127x | "PA_BOOST"       | +2 to +17, or +20 | Any                    |
-| SX127x | RFO_HF or RFO_LF | -4 to +15         | Any                    |
+| Modem           | `tx_ant` value             | Range (dBm)       | "Optimal" (dBm)        |   |
+|-----------------|----------------------------|-------------------|------------------------|---|
+| SX1261          | N/A                        | -17 to +15        | +10, +14 or +15 [*][^] |   |
+| SX1262          | N/A                        | -9 to +22         | +14, +17, +20, +22 [*] |   |
+| SX127x          | "PA_BOOST"                 | +2 to +17, or +20 | Any                    |   |
+| SX127x          | RFO_HF or RFO_LF           | -4 to +15         | Any                    |   |
+| WL55SubGhzModem | "PA_BOOST"                 | -9 to +22         | +14, +17, +20, +22 [*] |   |
+| WL55SubGhzModem | Any other value (not None) | -17 to +14        | +10, +14 or +15 [*][^] |   |
 
 Values which are out of range for the modem will be clamped at the
 minimum/maximum values shown above.
@@ -432,14 +472,14 @@ Actual radiated TX power for RF regulatory purposes depends on the RF hardware,
 antenna, and the rest of the modem configuration. It should be measured and
 tuned empirically not determined from this configuration information alone.
 
-[*] For SX1261 and SX1262 the datasheet shows "Optimal" Power Amplifier
+[*] For some modems the datasheet shows "Optimal" Power Amplifier
 configuration values for these output power levels. If setting one of these
 levels, the optimal settings from the datasheet are applied automatically by the
 driver. Therefore it is recommended to use one of these power levels if
 possible.
 
-[^] For SX1261 +15dBm is only possible with frequency above 400MHz, will be +14dBm
-otherwise.
+[^] In the marked configurations +15dBm is only possible with frequency above
+400MHz, will be +14dBm otherwise.
 
 #### `implicit_header` - Implicit/Explicit Header Mode
 Type: `bool`
@@ -1137,9 +1177,21 @@ The meaning of `tx_arg` depends on the modem:
   above), and `False` otherwise.
 * For SX1262 it is `True` (indicating High Power mode).
 * For SX1261 it is `False` (indicating Low Power mode).
+* For WL55SubGhzModem it is `True` if the `PA_BOOST` `tx_ant` setting is in use (see above), and `False` otherwise.
 
 This parameter can be ignored if it's already known what modem and antenna is being used.
 
+### WL55SubGhzModem ant_sw
+
+When instantiating the `WL55SubGhzModem` and `AsyncWL55SubGHzModem` classes, the
+default `ant_sw` parameter is not `None`. Instead, the default will instantiate
+an object of type `lora.NucleoWL55RFConfig`. This implements the antenna switch
+connections for the ST NUCLEO-WL55 development board (as connected to GPIO pins
+C4, C5 and C3). See ST document [UM2592][ST-UM2592-p27] (PDF) Figure 18 for details.
+
+When using these modem classes (only), to disable any automatic antenna
+switching behaviour it's necessary to explicitly set `ant_sw=None`.
+
 ## Troubleshooting
 
 Some common errors and their causes:
@@ -1150,9 +1202,10 @@ The SX1261/2 drivers will raise this exception if the modem's TCXO fails to
 provide the necessary clock signal when starting a transmit or receive
 operation, or moving into "standby" mode.
 
-Usually, this means the constructor parameter `dio3_tcxo_millivolts` (see above)
+Sometimes, this means the constructor parameter `dio3_tcxo_millivolts` (see above)
 must be set as the SX126x chip DIO3 output pin is the power source for the TCXO
 connected to the modem.  Often this parameter should be set to `3300` (3.3V) but
 it may be another value, consult the documentation for your LoRa modem module.
 
 [isr_rules]: https://docs.micropython.org/en/latest/reference/isr_rules.html
+[ST-UM2592-p27]: https://www.st.com/resource/en/user_manual/dm00622917-stm32wl-nucleo64-board-mb1389-stmicroelectronics.pdf#page=27
diff --git a/micropython/lora/lora-stm32wl5/lora/stm32wl5.py b/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
new file mode 100644
index 000000000..ba7128831
--- /dev/null
+++ b/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
@@ -0,0 +1,134 @@
+# MicroPython LoRa STM32WL55 embedded sub-ghz radio driver
+# MIT license; Copyright (c) 2022 Angus Gratton
+#
+# This driver is essentially an embedded SX1262 with a custom internal interface block.
+# Requires the stm module in MicroPython to be compiled with STM32WL5 subghz radio support.
+#
+# LoRa is a registered trademark or service mark of Semtech Corporation or its affiliates.
+from machine import Pin, SPI
+import stm
+from . import sx126x
+from micropython import const
+
+_CMD_CLR_ERRORS = const(0x07)
+
+_REG_OCP = const(0x8E7)
+
+# Default antenna switch config is as per Nucleo WL-55 board. See UM2592 Fig 18.
+# Possible to work with other antenna switch board configurations by passing
+# different ant_sw_class arguments to the modem, any class that creates an object with rx/tx
+
+
+class NucleoWL55RFConfig:
+    def __init__(self):
+        self._FE_CTRL = (Pin(x, mode=Pin.OUT) for x in ("C4", "C5", "C3"))
+
+    def _set_fe_ctrl(self, values):
+        for pin, val in zip(self._FE_CTRL, values):
+            pin(val)
+
+    def rx(self):
+        self._set_fe_ctrl((1, 0, 1))
+
+    def tx(self, hp):
+        self._set_fe_ctrl((0 if hp else 1, 1, 1))
+
+    def idle(self):
+        pass
+
+
+class DIO1:
+    # Dummy DIO1 "Pin" wrapper class to pass to the _SX126x class
+    def irq(self, handler, _):
+        stm.subghz_irq(handler)
+
+
+class _WL55SubGhzModem(sx126x._SX126x):
+    # Don't construct this directly, construct lora.WL55SubGhzModem or lora.AsyncWL55SubGHzModem
+    def __init__(
+        self,
+        lora_cfg=None,
+        tcxo_millivolts=1700,
+        ant_sw=NucleoWL55RFConfig,
+    ):
+        self._hp = False
+
+        if ant_sw == NucleoWL55RFConfig:
+            # To avoid the default argument being an object instance
+            ant_sw = NucleoWL55RFConfig()
+
+        super().__init__(
+            # RM0453 7.2.13 says max 16MHz, but this seems more stable
+            SPI("SUBGHZ", baudrate=8_000_000),
+            stm.subghz_cs,
+            stm.subghz_is_busy,
+            DIO1(),
+            False,  # dio2_rf_sw
+            tcxo_millivolts,  # dio3_tcxo_millivolts
+            1000,  # dio3_tcxo_start_time_us
+            None,  # reset
+            lora_cfg,
+            ant_sw,
+        )
+
+    def _clear_errors(self):
+        # A weird difference between STM32WL55 and SX1262, WL55 only takes one
+        # parameter byte for the Clr_Error() command compared to two on SX1262.
+        # The bytes are always zero in both cases.
+        #
+        # (Not clear if sending two bytes will also work always/sometimes, but
+        # sending one byte to SX1262 definitely does not work!
+        self._cmd("BB", _CMD_CLR_ERRORS, 0x00)
+
+    def _clear_irq(self, clear_bits=0xFFFF):
+        super()._clear_irq(clear_bits)
+        # SUBGHZ Radio IRQ requires manual re-enabling after interrupt
+        stm.subghz_irq(self._radio_isr)
+
+    def _tx_hp(self):
+        # STM32WL5 supports both High and Low Power antenna pins depending on tx_ant setting
+        return self._hp
+
+    def _get_pa_tx_params(self, output_power, tx_ant):
+        # Given an output power level in dBm and the tx_ant setting (if any),
+        # return settings for SetPaConfig and SetTxParams.
+        #
+        # ST document RM0453 Set_PaConfig() reference and accompanying Table 35
+        # show values that are an exact superset of the SX1261 and SX1262
+        # available values, depending on which antenna pin is to be
+        # used. Therefore, call either modem's existing _get_pa_tx_params()
+        # function depending on the current tx_ant setting (default is low
+        # power).
+
+        if tx_ant is not None:
+            self._hp = tx_ant == "PA_BOOST"
+
+        # Update the OCP register to match the maximum power level
+        self._reg_write(_REG_OCP, 0x38 if self._hp else 0x18)
+
+        if self._hp:
+            return sx126x._SX1262._get_pa_tx_params(self, output_power, tx_ant)
+        else:
+            return sx126x._SX1261._get_pa_tx_params(self, output_power, tx_ant)
+
+
+# Define the actual modem classes that use the SyncModem & AsyncModem "mixin-like" classes
+# to create sync and async variants.
+
+try:
+    from .sync_modem import SyncModem
+
+    class WL55SubGhzModem(_WL55SubGhzModem, SyncModem):
+        pass
+
+except ImportError:
+    pass
+
+try:
+    from .async_modem import AsyncModem
+
+    class AsyncWL55SubGhzModem(_WL55SubGhzModem, AsyncModem):
+        pass
+
+except ImportError:
+    pass
diff --git a/micropython/lora/lora-stm32wl5/manifest.py b/micropython/lora/lora-stm32wl5/manifest.py
new file mode 100644
index 000000000..8c6fe5c5c
--- /dev/null
+++ b/micropython/lora/lora-stm32wl5/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+require("lora-sx126x")
+package("lora")
diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index 7fbcce2f5..0e6274020 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -99,7 +99,7 @@
 # In any case, timeouts here are to catch broken/bad hardware or massive driver
 # bugs rather than commonplace issues.
 #
-_CMD_BUSY_TIMEOUT_BASE_US = const(200)
+_CMD_BUSY_TIMEOUT_BASE_US = const(3000)
 
 # Datasheet says 3.5ms needed to run a full Calibrate command (all blocks),
 # however testing shows it can be as much as as 18ms.
@@ -141,9 +141,11 @@ def __init__(
         self._sleep = True  # assume the radio is in sleep mode to start, will wake on _cmd
         self._dio1 = dio1
 
-        busy.init(Pin.IN)
-        cs.init(Pin.OUT, value=1)
-        if dio1:
+        if hasattr(busy, "init"):
+            busy.init(Pin.IN)
+        if hasattr(cs, "init"):
+            cs.init(Pin.OUT, value=1)
+        if hasattr(dio1, "init"):
             dio1.init(Pin.IN)
 
         self._busy_timeout = _CMD_BUSY_TIMEOUT_BASE_US
@@ -231,7 +233,7 @@ def __init__(
                 0x0,  # DIO2Mask, not used
                 0x0,  # DIO3Mask, not used
             )
-            dio1.irq(self._radio_isr, trigger=Pin.IRQ_RISING)
+            dio1.irq(self._radio_isr, Pin.IRQ_RISING)
 
         self._clear_irq()
 
@@ -382,7 +384,9 @@ def configure(self, lora_cfg):
             self._cmd(">BBH", _CMD_WRITE_REGISTER, _REG_LSYNCRH, syncword)
 
         if "output_power" in lora_cfg:
-            pa_config_args, self._output_power = self._get_pa_tx_params(lora_cfg["output_power"])
+            pa_config_args, self._output_power = self._get_pa_tx_params(
+                lora_cfg["output_power"], lora_cfg.get("tx_ant", None)
+            )
             self._cmd("BBBBB", _CMD_SET_PA_CONFIG, *pa_config_args)
 
         if "pa_ramp_us" in lora_cfg:
@@ -760,7 +764,7 @@ def _tx_hp(self):
         # SX1262 has High Power only (deviceSel==0)
         return True
 
-    def _get_pa_tx_params(self, output_power):
+    def _get_pa_tx_params(self, output_power, tx_ant):
         # Given an output power level in dB, return a 2-tuple:
         # - First item is the 3 arguments for SetPaConfig command
         # - Second item is the power level argument value for SetTxParams command.
@@ -831,7 +835,7 @@ def _tx_hp(self):
         # SX1261 has Low Power only (deviceSel==1)
         return False
 
-    def _get_pa_tx_params(self, output_power):
+    def _get_pa_tx_params(self, output_power, tx_ant):
         # Given an output power level in dB, return a 2-tuple:
         # - First item is the 3 arguments for SetPaConfig command
         # - Second item is the power level argument value for SetTxParams command.
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
index 57b9d21d8..1936a50e4 100644
--- a/micropython/lora/lora-sx126x/manifest.py
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("lora")
 package("lora")
diff --git a/micropython/lora/lora/lora/__init__.py b/micropython/lora/lora/lora/__init__.py
index a12ec45d7..7f8930b8c 100644
--- a/micropython/lora/lora/lora/__init__.py
+++ b/micropython/lora/lora/lora/__init__.py
@@ -23,7 +23,18 @@
     if "no module named 'lora." not in str(e):
         raise
 
+try:
+    from .stm32wl5 import *  # noqa: F401
+
+    ok = True
+except ImportError as e:
+    if "no module named 'lora." not in str(e):
+        raise
+
+
 if not ok:
     raise ImportError(
         "Incomplete lora installation. Need at least one of lora-sync, lora-async and one of lora-sx126x, lora-sx127x"
     )
+
+del ok
diff --git a/micropython/lora/lora/manifest.py b/micropython/lora/lora/manifest.py
index e4e325aba..586c47c08 100644
--- a/micropython/lora/lora/manifest.py
+++ b/micropython/lora/lora/manifest.py
@@ -1,2 +1,2 @@
-metadata(version="0.1.1")
+metadata(version="0.2.0")
 package("lora")

From 0bdecbcba17a7ecf4ff1bdd7d1730daf66fbbf5e Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 9 Aug 2023 19:17:04 +1000
Subject: [PATCH 207/343] lora: Note known issue with STM32WL5 HP antenna.

For unknown reason, power output in this configuration is lower than it
should be (including when compared to the STM32Cube C libraries running on
the same board.

Suspect either the Nucleo board antenna switch or the power amplifier
registers are being set wrong, but the actual root cause remains elusive...

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/README.md                      | 6 ++++--
 micropython/lora/lora-stm32wl5/lora/stm32wl5.py | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/micropython/lora/README.md b/micropython/lora/README.md
index c32ae9158..28a05483e 100644
--- a/micropython/lora/README.md
+++ b/micropython/lora/README.md
@@ -444,9 +444,11 @@ datasheet Table 32 "Frequency Bands" for more details.
 | `"PA_BOOST"`    | RFO_HP pin (high power) |
 | Any other value | RFO_LP pin (low power)  |
 
+**NOTE**: Currently the `PA_BOOST` HP antenna output is lower than it should be
+on this board, due to an unknown driver bug.
 
-**Important**: If setting `tx_ant` value, also set `output_power` at the same
-time or again before transmitting.
+If setting `tx_ant` value, also set `output_power` at the same time or again
+before transmitting.
 
 #### `output_power` - Transmit output power level
 Type: `int`
diff --git a/micropython/lora/lora-stm32wl5/lora/stm32wl5.py b/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
index ba7128831..07091b377 100644
--- a/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
+++ b/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
@@ -101,6 +101,8 @@ def _get_pa_tx_params(self, output_power, tx_ant):
         # power).
 
         if tx_ant is not None:
+            # Note: currently HP antenna power output is less than it should be,
+            # due to some (unknown) bug.
             self._hp = tx_ant == "PA_BOOST"
 
         # Update the OCP register to match the maximum power level

From 7fcc728db28033fade59ea37fca90d28528a69d1 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 23 Aug 2023 17:40:11 +1000
Subject: [PATCH 208/343] lora/sx126x: Fix busy timeout handling.

- If no reset pin was set, calling standby() in the constructor
  would enable the TCXO (XOSC) before the timeout was correctly set.

- This manifested as a BUSY timeout on the STM32WL5, first time after power
on reset.

- Clean up the general handling of BUSY timeouts, but also add some safety
margin to the base timeout just in case (not an issue, is only a stop-gap
to prevent the modem blocking indefinitely.)

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-stm32wl5/lora/stm32wl5.py |  2 +-
 micropython/lora/lora-sx126x/lora/sx126x.py     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/micropython/lora/lora-stm32wl5/lora/stm32wl5.py b/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
index 07091b377..726f1dd53 100644
--- a/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
+++ b/micropython/lora/lora-stm32wl5/lora/stm32wl5.py
@@ -65,7 +65,7 @@ def __init__(
             DIO1(),
             False,  # dio2_rf_sw
             tcxo_millivolts,  # dio3_tcxo_millivolts
-            1000,  # dio3_tcxo_start_time_us
+            10_000,  # dio3_tcxo_start_time_us, first time after POR is quite long
             None,  # reset
             lora_cfg,
             ant_sw,
diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index 0e6274020..f0cd42793 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -99,7 +99,7 @@
 # In any case, timeouts here are to catch broken/bad hardware or massive driver
 # bugs rather than commonplace issues.
 #
-_CMD_BUSY_TIMEOUT_BASE_US = const(3000)
+_CMD_BUSY_TIMEOUT_BASE_US = const(7000)
 
 # Datasheet says 3.5ms needed to run a full Calibrate command (all blocks),
 # however testing shows it can be as much as as 18ms.
@@ -148,7 +148,9 @@ def __init__(
         if hasattr(dio1, "init"):
             dio1.init(Pin.IN)
 
-        self._busy_timeout = _CMD_BUSY_TIMEOUT_BASE_US
+        self._busy_timeout = _CMD_BUSY_TIMEOUT_BASE_US + (
+            dio3_tcxo_start_time_us if dio3_tcxo_millivolts else 0
+        )
 
         self._buf = bytearray(9)  # shared buffer for commands
 
@@ -168,7 +170,8 @@ def __init__(
             reset(1)
             time.sleep_ms(5)
         else:
-            self.standby()  # Otherwise, at least put the radio to a known state
+            # Otherwise, at least put the radio to a known state
+            self._cmd("BB", _CMD_SET_STANDBY, 0)  # STDBY_RC mode, not ready for TCXO yet
 
         status = self._get_status()
         if (status[0] != _STATUS_MODE_STANDBY_RC and status[0] != _STATUS_MODE_STANDBY_HSE32) or (
@@ -187,7 +190,6 @@ def __init__(
             #
             # timeout register is set in units of 15.625us each, use integer math
             # to calculate and round up:
-            self._busy_timeout = (_CMD_BUSY_TIMEOUT_BASE_US + dio3_tcxo_start_time_us) * 2
             timeout = (dio3_tcxo_start_time_us * 1000 + 15624) // 15625
             if timeout < 0 or timeout > 1 << 24:
                 raise ValueError("{} out of range".format("dio3_tcxo_start_time_us"))
@@ -668,7 +670,7 @@ def _wait_not_busy(self, timeout_us):
         while self._busy():
             ticks_diff = time.ticks_diff(time.ticks_us(), start)
             if ticks_diff > timeout_us:
-                raise RuntimeError("BUSY timeout")
+                raise RuntimeError("BUSY timeout", timeout_us)
             time.sleep_us(1)
         if _DEBUG and ticks_diff > 105:
             # By default, debug log any busy time that takes longer than the

From e6b89eafa3b86d2e8e405450377d459600a30cd6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Sep 2023 00:17:28 +1000
Subject: [PATCH 209/343] all: Remove unnecessary start argument in range.

To satisfy Ruff.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/drivers/imu/bmi270/bmi270.py     | 4 ++--
 micropython/drivers/imu/bmm150/bmm150.py     | 2 +-
 micropython/drivers/imu/lsm6dsox/lsm6dsox.py | 2 +-
 micropython/espflash/espflash.py             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/micropython/drivers/imu/bmi270/bmi270.py b/micropython/drivers/imu/bmi270/bmi270.py
index db95658ff..64f819ec2 100644
--- a/micropython/drivers/imu/bmi270/bmi270.py
+++ b/micropython/drivers/imu/bmi270/bmi270.py
@@ -598,7 +598,7 @@ def _write_reg(self, reg, val):
     def _write_burst(self, reg, data, chunk=16):
         self._write_reg(_INIT_ADDR_0, 0)
         self._write_reg(_INIT_ADDR_1, 0)
-        for i in range(0, len(data) // chunk):
+        for i in range(len(data) // chunk):
             offs = i * chunk
             self._write_reg(reg, data[offs : offs + chunk])
             init_addr = ((i + 1) * chunk) // 2
@@ -606,7 +606,7 @@ def _write_burst(self, reg, data, chunk=16):
             self._write_reg(_INIT_ADDR_1, (init_addr >> 4) & 0xFF)
 
     def _poll_reg(self, reg, mask, retry=10, delay=100):
-        for i in range(0, retry):
+        for i in range(retry):
             if self._read_reg(reg) & mask:
                 return True
             time.sleep_ms(delay)
diff --git a/micropython/drivers/imu/bmm150/bmm150.py b/micropython/drivers/imu/bmm150/bmm150.py
index 036b2b258..a4845c961 100644
--- a/micropython/drivers/imu/bmm150/bmm150.py
+++ b/micropython/drivers/imu/bmm150/bmm150.py
@@ -166,7 +166,7 @@ def _compensate_z(self, raw, hall):
         return z
 
     def magnet_raw(self):
-        for i in range(0, 10):
+        for i in range(10):
             self._read_reg_into(_DATA, self.scratch)
             if self.scratch[3] & 0x1:
                 return (
diff --git a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
index 1952c5bb1..ca1397c66 100644
--- a/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
+++ b/micropython/drivers/imu/lsm6dsox/lsm6dsox.py
@@ -197,7 +197,7 @@ def _read_reg_into(self, reg, buf):
 
     def reset(self):
         self._write_reg(_CTRL3_C, self._read_reg(_CTRL3_C) | 0x1)
-        for i in range(0, 10):
+        for i in range(10):
             if (self._read_reg(_CTRL3_C) & 0x01) == 0:
                 return
             time.sleep_ms(10)
diff --git a/micropython/espflash/espflash.py b/micropython/espflash/espflash.py
index 700309bd9..cc025836c 100644
--- a/micropython/espflash/espflash.py
+++ b/micropython/espflash/espflash.py
@@ -104,7 +104,7 @@ def _write_reg(self, addr, data, mask=0xFFFFFFFF, delay=0):
             raise Exception("Command ESP_WRITE_REG failed.")
 
     def _poll_reg(self, addr, flag, retry=10, delay=0.050):
-        for i in range(0, retry):
+        for i in range(retry):
             reg = self._read_reg(addr)
             if (reg & flag) == 0:
                 break

From 55d1d23d6ff33dbb86fb7c772222c1f700a9d273 Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Mon, 25 Sep 2023 01:37:24 +0200
Subject: [PATCH 210/343] __future__: Add "annotations".

MicroPython ignores types anyway.
---
 python-stdlib/__future__/__future__.py | 1 +
 python-stdlib/__future__/manifest.py   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/__future__/__future__.py b/python-stdlib/__future__/__future__.py
index 45b935edc..178294c96 100644
--- a/python-stdlib/__future__/__future__.py
+++ b/python-stdlib/__future__/__future__.py
@@ -5,3 +5,4 @@
 with_statement = True
 print_function = True
 unicode_literals = True
+annotations = True
diff --git a/python-stdlib/__future__/manifest.py b/python-stdlib/__future__/manifest.py
index 4b4de03cb..e06f3268d 100644
--- a/python-stdlib/__future__/manifest.py
+++ b/python-stdlib/__future__/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.0.3")
+metadata(version="0.1.0")
 
 module("__future__.py")

From e5ba86447065b3094fd001ef59a66f8a4deb49af Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 14 Sep 2023 13:14:35 +1000
Subject: [PATCH 211/343] aioble/server.py: Add data arg for indicate.

In micropython/micropython#11239 we added support for passing data to
gatts_indicate (to make it match gatts_notify).

This adds the same to aioble.

Also update the documentation to mention this (and fix some mistakes and
add a few more examples).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../bluetooth/aioble-server/manifest.py       |  2 +-
 micropython/bluetooth/aioble/README.md        | 83 +++++++++++++++++--
 micropython/bluetooth/aioble/aioble/server.py |  4 +-
 micropython/bluetooth/aioble/manifest.py      |  2 +-
 4 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/micropython/bluetooth/aioble-server/manifest.py b/micropython/bluetooth/aioble-server/manifest.py
index fc51154f8..0fb18408e 100644
--- a/micropython/bluetooth/aioble-server/manifest.py
+++ b/micropython/bluetooth/aioble-server/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.3.0")
+metadata(version="0.4.0")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/README.md b/micropython/bluetooth/aioble/README.md
index 6b6b204f6..b488721c3 100644
--- a/micropython/bluetooth/aioble/README.md
+++ b/micropython/bluetooth/aioble/README.md
@@ -70,7 +70,7 @@ Alternatively, install the `aioble` package, which will install everything.
 Usage
 -----
 
-Passive scan for nearby devices for 5 seconds: (Observer)
+#### Passive scan for nearby devices for 5 seconds: (Observer)
 
 ```py
 async with aioble.scan(duration_ms=5000) as scanner:
@@ -87,7 +87,7 @@ async with aioble.scan(duration_ms=5000, interval_us=30000, window_us=30000, act
         print(result, result.name(), result.rssi, result.services())
 ```
 
-Connect to a peripheral device: (Central)
+#### Connect to a peripheral device: (Central)
 
 ```py
 # Either from scan result
@@ -101,7 +101,7 @@ except asyncio.TimeoutError:
     print('Timeout')
 ```
 
-Register services and wait for connection: (Peripheral, Server)
+#### Register services and wait for connection: (Peripheral, Server)
 
 ```py
 _ENV_SENSE_UUID = bluetooth.UUID(0x181A)
@@ -126,30 +126,95 @@ while True:
     print("Connection from", device)
 ```
 
-Update characteristic value: (Server)
+#### Update characteristic value: (Server)
 
 ```py
+# Write the local value.
 temp_char.write(b'data')
+```
+
+```py
+# Write the local value and notify/indicate subscribers.
+temp_char.write(b'data', send_update=True)
+```
+
+#### Send notifications: (Server)
 
-temp_char.notify(b'optional data')
+```py
+# Notify with the current value.
+temp_char.notify(connection)
+```
 
-await temp_char.indicate(timeout_ms=2000)
+```py
+# Notify with a custom value.
+temp_char.notify(connection, b'optional data')
 ```
 
-Query the value of a characteristic: (Client)
+#### Send indications: (Server)
+
+```py
+# Indicate with current value.
+await temp_char.indicate(connection, timeout_ms=2000)
+```
+
+```py
+# Indicate with custom value.
+await temp_char.indicate(connection, b'optional data', timeout_ms=2000)
+```
+
+This will raise `GattError` if the indication is not acknowledged.
+
+#### Wait for a write from the client: (Server)
+
+```py
+# Normal characteristic, returns the connection that did the write.
+connection = await char.written(timeout_ms=2000)
+```
+
+```py
+# Characteristic with capture enabled, also returns the value.
+char = Characteristic(..., capture=True)
+connection, data = await char.written(timeout_ms=2000)
+```
+
+#### Query the value of a characteristic: (Client)
 
 ```py
 temp_service = await connection.service(_ENV_SENSE_UUID)
 temp_char = await temp_service.characteristic(_ENV_SENSE_TEMP_UUID)
 
 data = await temp_char.read(timeout_ms=1000)
+```
+
+#### Wait for a notification/indication: (Client)
+
+```py
+# Notification
+data = await temp_char.notified(timeout_ms=1000)
+```
 
+```py
+# Indication
+data = await temp_char.indicated(timeout_ms=1000)
+```
+
+#### Subscribe to a characteristic: (Client)
+
+```py
+# Subscribe for notification.
 await temp_char.subscribe(notify=True)
 while True:
     data = await temp_char.notified()
 ```
 
-Open L2CAP channels: (Listener)
+```py
+# Subscribe for indication.
+await temp_char.subscribe(indicate=True)
+while True:
+    data = await temp_char.indicated()
+```
+
+#### Open L2CAP channels: (Listener)
 
 ```py
 channel = await connection.l2cap_accept(_L2CAP_PSN, _L2CAP_MTU)
@@ -158,7 +223,7 @@ n = channel.recvinto(buf)
 channel.send(b'response')
 ```
 
-Open L2CAP channels: (Initiator)
+#### Open L2CAP channels: (Initiator)
 
 ```py
 channel = await connection.l2cap_connect(_L2CAP_PSN, _L2CAP_MTU)
diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index b6cc4a3c2..ed3299d69 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -257,7 +257,7 @@ def notify(self, connection, data=None):
             raise ValueError("Not supported")
         ble.gatts_notify(connection._conn_handle, self._value_handle, data)
 
-    async def indicate(self, connection, timeout_ms=1000):
+    async def indicate(self, connection, data=None, timeout_ms=1000):
         if not (self.flags & _FLAG_INDICATE):
             raise ValueError("Not supported")
         if self._indicate_connection is not None:
@@ -270,7 +270,7 @@ async def indicate(self, connection, timeout_ms=1000):
 
         try:
             with connection.timeout(timeout_ms):
-                ble.gatts_indicate(connection._conn_handle, self._value_handle)
+                ble.gatts_indicate(connection._conn_handle, self._value_handle, data)
                 await self._indicate_event.wait()
                 if self._indicate_status != 0:
                     raise GattError(self._indicate_status)
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 4c0edbb57..24187afe4 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.3.1")
+metadata(version="0.4.0")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From 46748d2817d791212808337c0c708f131ec5c353 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 14 Sep 2023 15:05:02 +1000
Subject: [PATCH 212/343] aioble/server.py: Allow BufferedCharacteristic to
 support all ops.

Previously a BufferedCharacteristic could only be read by the client, where
it should have been writeable. This makes it support all ops (read / write
/ write-with-response, etc).

Adds a test to check the max_len and append functionality of
BufferedCharacteristic.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../bluetooth/aioble-server/manifest.py       |   2 +-
 micropython/bluetooth/aioble/aioble/server.py |   4 +-
 micropython/bluetooth/aioble/manifest.py      |   2 +-
 .../multitests/ble_buffered_characteristic.py | 139 ++++++++++++++++++
 .../ble_buffered_characteristic.py.exp        |  21 +++
 5 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py.exp

diff --git a/micropython/bluetooth/aioble-server/manifest.py b/micropython/bluetooth/aioble-server/manifest.py
index 0fb18408e..c5b12ffbd 100644
--- a/micropython/bluetooth/aioble-server/manifest.py
+++ b/micropython/bluetooth/aioble-server/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.4.0")
+metadata(version="0.4.1")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index ed3299d69..403700c5a 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -290,8 +290,8 @@ def _indicate_done(conn_handle, value_handle, status):
 
 
 class BufferedCharacteristic(Characteristic):
-    def __init__(self, service, uuid, max_len=20, append=False):
-        super().__init__(service, uuid, read=True)
+    def __init__(self, *args, max_len=20, append=False, **kwargs):
+        super().__init__(*args, **kwargs)
         self._max_len = max_len
         self._append = append
 
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 24187afe4..2979a726b 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.4.0")
+metadata(version="0.4.1")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.
diff --git a/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
new file mode 100644
index 000000000..18ce7da64
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
@@ -0,0 +1,139 @@
+# Test characteristic read/write/notify from both GATTS and GATTC.
+
+import sys
+
+sys.path.append("")
+
+from micropython import const
+import time, machine
+
+import uasyncio as asyncio
+import aioble
+import bluetooth
+
+TIMEOUT_MS = 5000
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR1_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR2_UUID = bluetooth.UUID("00000000-1111-2222-3333-555555555555")
+CHAR3_UUID = bluetooth.UUID("00000000-1111-2222-3333-666666666666")
+
+
+# Acting in peripheral role.
+async def instance0_task():
+    service = aioble.Service(SERVICE_UUID)
+    characteristic1 = aioble.BufferedCharacteristic(service, CHAR1_UUID, write=True)
+    characteristic2 = aioble.BufferedCharacteristic(service, CHAR2_UUID, write=True, max_len=40)
+    characteristic3 = aioble.BufferedCharacteristic(
+        service, CHAR3_UUID, write=True, max_len=80, append=True
+    )
+    aioble.register_services(service)
+
+    multitest.globals(BDADDR=aioble.config("mac"))
+    multitest.next()
+
+    # Wait for central to connect to us.
+    print("advertise")
+    connection = await aioble.advertise(
+        20_000, adv_data=b"\x02\x01\x06\x04\xffMPY", timeout_ms=TIMEOUT_MS
+    )
+    print("connected")
+
+    # The first will just see the second write (truncated).
+    await characteristic1.written(timeout_ms=TIMEOUT_MS)
+    await characteristic1.written(timeout_ms=TIMEOUT_MS)
+    print("written", characteristic1.read())
+
+    # The second will just see the second write (still truncated because MTU
+    # exchange hasn't happened).
+    await characteristic2.written(timeout_ms=TIMEOUT_MS)
+    await characteristic2.written(timeout_ms=TIMEOUT_MS)
+    print("written", characteristic2.read())
+
+    # MTU exchange should happen here.
+
+    # The second will now see the full second write.
+    await characteristic2.written(timeout_ms=TIMEOUT_MS)
+    await characteristic2.written(timeout_ms=TIMEOUT_MS)
+    print("written", characteristic2.read())
+
+    # The third will see the two full writes concatenated.
+    await characteristic3.written(timeout_ms=TIMEOUT_MS)
+    await characteristic3.written(timeout_ms=TIMEOUT_MS)
+    print("written", characteristic3.read())
+
+    # Wait for the central to disconnect.
+    await connection.disconnected(timeout_ms=TIMEOUT_MS)
+    print("disconnected")
+
+
+def instance0():
+    try:
+        asyncio.run(instance0_task())
+    finally:
+        aioble.stop()
+
+
+# Acting in central role.
+async def instance1_task():
+    multitest.next()
+
+    # Connect to peripheral and then disconnect.
+    print("connect")
+    device = aioble.Device(*BDADDR)
+    connection = await device.connect(timeout_ms=TIMEOUT_MS)
+
+    # Discover characteristics.
+    service = await connection.service(SERVICE_UUID)
+    print("service", service.uuid)
+    characteristic1 = await service.characteristic(CHAR1_UUID)
+    print("characteristic1", characteristic1.uuid)
+    characteristic2 = await service.characteristic(CHAR2_UUID)
+    print("characteristic2", characteristic2.uuid)
+    characteristic3 = await service.characteristic(CHAR3_UUID)
+    print("characteristic3", characteristic3.uuid)
+
+    # Write to each characteristic twice, with a long enough value to trigger
+    # truncation.
+    print("write1")
+    await characteristic1.write(
+        "central1-aaaaaaaaaaaaaaaaaaaaaaaaaaaaa", response=True, timeout_ms=TIMEOUT_MS
+    )
+    await characteristic1.write(
+        "central1-bbbbbbbbbbbbbbbbbbbbbbbbbbbbb", response=True, timeout_ms=TIMEOUT_MS
+    )
+    print("write2a")
+    await characteristic2.write(
+        "central2a-aaaaaaaaaaaaaaaaaaaaaaaaaaaa", response=True, timeout_ms=TIMEOUT_MS
+    )
+    await characteristic2.write(
+        "central2a-bbbbbbbbbbbbbbbbbbbbbbbbbbbb", response=True, timeout_ms=TIMEOUT_MS
+    )
+    print("exchange mtu")
+    await connection.exchange_mtu(100)
+    print("write2b")
+    await characteristic2.write(
+        "central2b-aaaaaaaaaaaaaaaaaaaaaaaaaaaa", response=True, timeout_ms=TIMEOUT_MS
+    )
+    await characteristic2.write(
+        "central2b-bbbbbbbbbbbbbbbbbbbbbbbbbbbb", response=True, timeout_ms=TIMEOUT_MS
+    )
+    print("write3")
+    await characteristic3.write(
+        "central3-aaaaaaaaaaaaaaaaaaaaaaaaaaaaa", response=True, timeout_ms=TIMEOUT_MS
+    )
+    await characteristic3.write(
+        "central3-bbbbbbbbbbbbbbbbbbbbbbbbbbbbb", response=True, timeout_ms=TIMEOUT_MS
+    )
+
+    # Disconnect from peripheral.
+    print("disconnect")
+    await connection.disconnect(timeout_ms=TIMEOUT_MS)
+    print("disconnected")
+
+
+def instance1():
+    try:
+        asyncio.run(instance1_task())
+    finally:
+        aioble.stop()
diff --git a/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py.exp b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py.exp
new file mode 100644
index 000000000..3c00eacff
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py.exp
@@ -0,0 +1,21 @@
+--- instance0 ---
+advertise
+connected
+written b'central1-bbbbbbbbbbb'
+written b'central2a-bbbbbbbbbb'
+written b'central2b-bbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+written b'central3-aaaaaaaaaaaaaaaaaaaaaaaaaaaaacentral3-bbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+disconnected
+--- instance1 ---
+connect
+service UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+characteristic1 UUID('00000000-1111-2222-3333-444444444444')
+characteristic2 UUID('00000000-1111-2222-3333-555555555555')
+characteristic3 UUID('00000000-1111-2222-3333-666666666666')
+write1
+write2a
+exchange mtu
+write2b
+write3
+disconnect
+disconnected

From e025c843b60e93689f0f991d753010bb5bd6a722 Mon Sep 17 00:00:00 2001
From: Brian Whitman <brian@variogram.com>
Date: Mon, 29 May 2023 20:27:49 -0700
Subject: [PATCH 213/343] requests: Fix detection of iterators in chunked data
 requests.

Chunked detection does not work as generators never have an `__iter__`
attribute.  They do have `__next__`.

Example that now works with this commit:

    def read_in_chunks(file_object, chunk_size=4096):
        while True:
            data = file_object.read(chunk_size)
            if not data:
                break
            yield data

    file = open(filename, "rb")
    r = requests.post(url, data=read_in_chunks(file))
---
 python-ecosys/requests/manifest.py          | 2 +-
 python-ecosys/requests/requests/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-ecosys/requests/manifest.py b/python-ecosys/requests/manifest.py
index 7fc2d63bd..1c46a7384 100644
--- a/python-ecosys/requests/manifest.py
+++ b/python-ecosys/requests/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.8.0", pypi="requests")
+metadata(version="0.8.1", pypi="requests")
 
 package("requests")
diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index 56b4a4f49..fd751e623 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -45,7 +45,7 @@ def request(
     parse_headers=True,
 ):
     redirect = None  # redirection url, None means no redirection
-    chunked_data = data and getattr(data, "__iter__", None) and not getattr(data, "__len__", None)
+    chunked_data = data and getattr(data, "__next__", None) and not getattr(data, "__len__", None)
 
     if auth is not None:
         import ubinascii

From 0620d022909c5ae7ada018671370ceb27542567b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Oct 2023 12:49:26 +1100
Subject: [PATCH 214/343] .github/workflows/ruff.yml: Pin to 0.1.0.

The `--format` flag was changed to `--output-format` in the recent update.

Pin to this version to prevent further updates from breaking (e.g. through new rules or other changes).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/ruff.yml | 6 +++---
 .pre-commit-config.yaml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index b8e43dc78..0374d766f 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -5,6 +5,6 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - run: pip install --user ruff
-    - run: ruff --format=github .
+    - uses: actions/checkout@v4
+    - run: pip install --user ruff==0.1.0
+    - run: ruff check --output-format=github .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e017b86e8..553b27381 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,6 @@ repos:
         entry: tools/codeformat.py -v -f
         language: python
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.280
+    rev: v0.1.0
     hooks:
       - id: ruff

From d8e163bb5f3ef45e71e145c27bc4f207beaad70f Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Thu, 28 Sep 2023 20:59:26 +0200
Subject: [PATCH 215/343] unix-ffi/re: Convert to PCRE2.

PCRE is marked as EOL and won't receive any new security update.

Convert the re module to PCRE2 API to enforce security.  Additional
dependency is now needed with uctypes due to changes in how PCRE2 return
the match_data in a pointer and require special handling.

The converted module is tested with the test_re.py with no regression.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 unix-ffi/re/re.py | 73 +++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 25 deletions(-)

diff --git a/unix-ffi/re/re.py b/unix-ffi/re/re.py
index d37584320..bd9566cb9 100644
--- a/unix-ffi/re/re.py
+++ b/unix-ffi/re/re.py
@@ -1,36 +1,55 @@
 import sys
 import ffilib
 import array
+import uctypes
 
+pcre2 = ffilib.open("libpcre2-8")
 
-pcre = ffilib.open("libpcre")
+#       pcre2_code *pcre2_compile(PCRE2_SPTR pattern, PCRE2_SIZE length,
+#           uint32_t options, int *errorcode, PCRE2_SIZE *erroroffset,
+#           pcre2_compile_context *ccontext);
+pcre2_compile = pcre2.func("p", "pcre2_compile_8", "siippp")
 
-#       pcre *pcre_compile(const char *pattern, int options,
-#            const char **errptr, int *erroffset,
-#            const unsigned char *tableptr);
-pcre_compile = pcre.func("p", "pcre_compile", "sipps")
+#       int pcre2_match(const pcre2_code *code, PCRE2_SPTR subject,
+#           PCRE2_SIZE length, PCRE2_SIZE startoffset, uint32_t options,
+#           pcre2_match_data *match_data, pcre2_match_context *mcontext);
+pcre2_match = pcre2.func("i", "pcre2_match_8", "Psiiipp")
 
-#       int pcre_exec(const pcre *code, const pcre_extra *extra,
-#            const char *subject, int length, int startoffset,
-#            int options, int *ovector, int ovecsize);
-pcre_exec = pcre.func("i", "pcre_exec", "PPsiiipi")
+#       int pcre2_pattern_info(const pcre2_code *code, uint32_t what,
+#           void *where);
+pcre2_pattern_info = pcre2.func("i", "pcre2_pattern_info_8", "Pip")
 
-#       int pcre_fullinfo(const pcre *code, const pcre_extra *extra,
-#            int what, void *where);
-pcre_fullinfo = pcre.func("i", "pcre_fullinfo", "PPip")
+#       PCRE2_SIZE *pcre2_get_ovector_pointer(pcre2_match_data *match_data);
+pcre2_get_ovector_pointer = pcre2.func("p", "pcre2_get_ovector_pointer_8", "p")
 
+#       pcre2_match_data *pcre2_match_data_create_from_pattern(const pcre2_code *code,
+#           pcre2_general_context *gcontext);
+pcre2_match_data_create_from_pattern = pcre2.func(
+    "p", "pcre2_match_data_create_from_pattern_8", "Pp"
+)
 
-IGNORECASE = I = 1
-MULTILINE = M = 2
-DOTALL = S = 4
-VERBOSE = X = 8
-PCRE_ANCHORED = 0x10
+# PCRE2_SIZE that is of type size_t.
+# Use ULONG as type to support both 32bit and 64bit.
+PCRE2_SIZE_SIZE = uctypes.sizeof({"field": 0 | uctypes.ULONG})
+PCRE2_SIZE_TYPE = "L"
+
+# Real value in pcre2.h is 0xFFFFFFFF for 32bit and
+# 0x0xFFFFFFFFFFFFFFFF for 64bit that is equivalent
+# to -1
+PCRE2_ZERO_TERMINATED = -1
+
+
+IGNORECASE = I = 0x8
+MULTILINE = M = 0x400
+DOTALL = S = 0x20
+VERBOSE = X = 0x80
+PCRE2_ANCHORED = 0x80000000
 
 # TODO. Note that Python3 has unicode by default
 ASCII = A = 0
 UNICODE = U = 0
 
-PCRE_INFO_CAPTURECOUNT = 2
+PCRE2_INFO_CAPTURECOUNT = 0x4
 
 
 class PCREMatch:
@@ -67,19 +86,23 @@ def __init__(self, compiled_ptn):
     def search(self, s, pos=0, endpos=-1, _flags=0):
         assert endpos == -1, "pos: %d, endpos: %d" % (pos, endpos)
         buf = array.array("i", [0])
-        pcre_fullinfo(self.obj, None, PCRE_INFO_CAPTURECOUNT, buf)
+        pcre2_pattern_info(self.obj, PCRE2_INFO_CAPTURECOUNT, buf)
         cap_count = buf[0]
-        ov = array.array("i", [0, 0, 0] * (cap_count + 1))
-        num = pcre_exec(self.obj, None, s, len(s), pos, _flags, ov, len(ov))
+        match_data = pcre2_match_data_create_from_pattern(self.obj, None)
+        num = pcre2_match(self.obj, s, len(s), pos, _flags, match_data, None)
         if num == -1:
             # No match
             return None
+        ov_ptr = pcre2_get_ovector_pointer(match_data)
+        # pcre2_get_ovector_pointer return PCRE2_SIZE
+        ov_buf = uctypes.bytearray_at(ov_ptr, PCRE2_SIZE_SIZE * (cap_count + 1) * 2)
+        ov = array.array(PCRE2_SIZE_TYPE, ov_buf)
         # We don't care how many matching subexpressions we got, we
         # care only about total # of capturing ones (including empty)
         return PCREMatch(s, cap_count + 1, ov)
 
     def match(self, s, pos=0, endpos=-1):
-        return self.search(s, pos, endpos, PCRE_ANCHORED)
+        return self.search(s, pos, endpos, PCRE2_ANCHORED)
 
     def sub(self, repl, s, count=0):
         if not callable(repl):
@@ -141,9 +164,9 @@ def findall(self, s):
 
 
 def compile(pattern, flags=0):
-    errptr = bytes(4)
+    errcode = bytes(4)
     erroffset = bytes(4)
-    regex = pcre_compile(pattern, flags, errptr, erroffset, None)
+    regex = pcre2_compile(pattern, PCRE2_ZERO_TERMINATED, flags, errcode, erroffset, None)
     assert regex
     return PCREPattern(regex)
 
@@ -154,7 +177,7 @@ def search(pattern, string, flags=0):
 
 
 def match(pattern, string, flags=0):
-    r = compile(pattern, flags | PCRE_ANCHORED)
+    r = compile(pattern, flags | PCRE2_ANCHORED)
     return r.search(string)
 
 

From ad0a2590cc38f92b3f20b16fd7418edac36413a9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 26 Oct 2023 13:46:07 +1100
Subject: [PATCH 216/343] tools/verifygitlog.py: Add git commit message
 checking.

This adds verifygitlog.py from the main repo, adds it to GitHub workflows,
and also pre-commit.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/commit_formatting.yml |  18 +++
 .pre-commit-config.yaml                 |   6 +
 tools/ci.sh                             |  12 ++
 tools/verifygitlog.py                   | 173 ++++++++++++++++++++++++
 4 files changed, 209 insertions(+)
 create mode 100644 .github/workflows/commit_formatting.yml
 create mode 100755 tools/verifygitlog.py

diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
new file mode 100644
index 000000000..a651f8a13
--- /dev/null
+++ b/.github/workflows/commit_formatting.yml
@@ -0,0 +1,18 @@
+name: Check commit message formatting
+
+on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: '100'
+    - uses: actions/setup-python@v4
+    - name: Check commit message formatting
+      run: source tools/ci.sh && ci_commit_formatting_run
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 553b27381..bfce6a246 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,12 @@ repos:
         name: MicroPython codeformat.py for changed files
         entry: tools/codeformat.py -v -f
         language: python
+      - id: verifygitlog
+        name: MicroPython git commit message format checker
+        entry: tools/verifygitlog.py --check-file --ignore-rebase
+        language: python
+        verbose: true
+        stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     rev: v0.1.0
     hooks:
diff --git a/tools/ci.sh b/tools/ci.sh
index 81ec641f2..139894780 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -15,6 +15,18 @@ function ci_code_formatting_run {
     tools/codeformat.py -v
 }
 
+########################################################################################
+# commit formatting
+
+function ci_commit_formatting_run {
+    git remote add upstream https://github.com/micropython/micropython-lib.git
+    git fetch --depth=100 upstream master
+    # If the common ancestor commit hasn't been found, fetch more.
+    git merge-base upstream/master HEAD || git fetch --unshallow upstream master
+    # For a PR, upstream/master..HEAD ends with a merge commit into master, exclude that one.
+    tools/verifygitlog.py -v upstream/master..HEAD --no-merges
+}
+
 ########################################################################################
 # build packages
 
diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
new file mode 100755
index 000000000..20be794f8
--- /dev/null
+++ b/tools/verifygitlog.py
@@ -0,0 +1,173 @@
+#!/usr/bin/env python3
+
+# This is an exact duplicate of verifygitlog.py from the main repo.
+
+import re
+import subprocess
+import sys
+
+verbosity = 0  # Show what's going on, 0 1 or 2.
+suggestions = 1  # Set to 0 to not include lengthy suggestions in error messages.
+
+ignore_prefixes = []
+
+
+def verbose(*args):
+    if verbosity:
+        print(*args)
+
+
+def very_verbose(*args):
+    if verbosity > 1:
+        print(*args)
+
+
+class ErrorCollection:
+    # Track errors and warnings as the program runs
+    def __init__(self):
+        self.has_errors = False
+        self.has_warnings = False
+        self.prefix = ""
+
+    def error(self, text):
+        print("error: {}{}".format(self.prefix, text))
+        self.has_errors = True
+
+    def warning(self, text):
+        print("warning: {}{}".format(self.prefix, text))
+        self.has_warnings = True
+
+
+def git_log(pretty_format, *args):
+    # Delete pretty argument from user args so it doesn't interfere with what we do.
+    args = ["git", "log"] + [arg for arg in args if "--pretty" not in args]
+    args.append("--pretty=format:" + pretty_format)
+    very_verbose("git_log", *args)
+    # Generator yielding each output line.
+    for line in subprocess.Popen(args, stdout=subprocess.PIPE).stdout:
+        yield line.decode().rstrip("\r\n")
+
+
+def diagnose_subject_line(subject_line, subject_line_format, err):
+    err.error("Subject line: " + subject_line)
+    if not subject_line.endswith("."):
+        err.error('* must end with "."')
+    if not re.match(r"^[^!]+: ", subject_line):
+        err.error('* must start with "path: "')
+    if re.match(r"^[^!]+: *$", subject_line):
+        err.error("* must contain a subject after the path.")
+    m = re.match(r"^[^!]+: ([a-z][^ ]*)", subject_line)
+    if m:
+        err.error('* first word of subject ("{}") must be capitalised.'.format(m.group(1)))
+    if re.match(r"^[^!]+: [^ ]+$", subject_line):
+        err.error("* subject must contain more than one word.")
+    err.error("* must match: " + repr(subject_line_format))
+    err.error('* Example: "py/runtime: Add support for foo to bar."')
+
+
+def verify(sha, err):
+    verbose("verify", sha)
+    err.prefix = "commit " + sha + ": "
+
+    # Author and committer email.
+    for line in git_log("%ae%n%ce", sha, "-n1"):
+        very_verbose("email", line)
+        if "noreply" in line:
+            err.error("Unwanted email address: " + line)
+
+    # Message body.
+    raw_body = list(git_log("%B", sha, "-n1"))
+    verify_message_body(raw_body, err)
+
+
+def verify_message_body(raw_body, err):
+    if not raw_body:
+        err.error("Message is empty")
+        return
+
+    # Subject line.
+    subject_line = raw_body[0]
+    for prefix in ignore_prefixes:
+        if subject_line.startswith(prefix):
+            verbose("Skipping ignored commit message")
+            return
+    very_verbose("subject_line", subject_line)
+    subject_line_format = r"^[^!]+: [A-Z]+.+ .+\.$"
+    if not re.match(subject_line_format, subject_line):
+        diagnose_subject_line(subject_line, subject_line_format, err)
+    if len(subject_line) >= 73:
+        err.error("Subject line must be 72 or fewer characters: " + subject_line)
+
+    # Second one divides subject and body.
+    if len(raw_body) > 1 and raw_body[1]:
+        err.error("Second message line must be empty: " + raw_body[1])
+
+    # Message body lines.
+    for line in raw_body[2:]:
+        # Long lines with URLs are exempt from the line length rule.
+        if len(line) >= 76 and "://" not in line:
+            err.error("Message lines should be 75 or less characters: " + line)
+
+    if not raw_body[-1].startswith("Signed-off-by: ") or "@" not in raw_body[-1]:
+        err.error('Message must be signed-off. Use "git commit -s".')
+
+
+def run(args):
+    verbose("run", *args)
+
+    err = ErrorCollection()
+
+    if "--check-file" in args:
+        filename = args[-1]
+        verbose("checking commit message from", filename)
+        with open(args[-1]) as f:
+            # Remove comment lines as well as any empty lines at the end.
+            lines = [line.rstrip("\r\n") for line in f if not line.startswith("#")]
+            while not lines[-1]:
+                lines.pop()
+            verify_message_body(lines, err)
+    else:  # Normal operation, pass arguments to git log
+        for sha in git_log("%h", *args):
+            verify(sha, err)
+
+    if err.has_errors or err.has_warnings:
+        if suggestions:
+            print("See https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md")
+    else:
+        print("ok")
+    if err.has_errors:
+        sys.exit(1)
+
+
+def show_help():
+    print("usage: verifygitlog.py [-v -n -h --check-file] ...")
+    print("-v  : increase verbosity, can be specified multiple times")
+    print("-n  : do not print multi-line suggestions")
+    print("-h  : print this help message and exit")
+    print(
+        "--check-file : Pass a single argument which is a file containing a candidate commit message"
+    )
+    print(
+        "--ignore-rebase : Skip checking commits with git rebase autosquash prefixes or WIP as a prefix"
+    )
+    print("... : arguments passed to git log to retrieve commits to verify")
+    print("      see https://www.git-scm.com/docs/git-log")
+    print("      passing no arguments at all will verify all commits")
+    print("examples:")
+    print("verifygitlog.py -n10  # Check last 10 commits")
+    print("verifygitlog.py -v master..HEAD  # Check commits since master")
+
+
+if __name__ == "__main__":
+    args = sys.argv[1:]
+    verbosity = args.count("-v")
+    suggestions = args.count("-n") == 0
+    if "--ignore-rebase" in args:
+        args.remove("--ignore-rebase")
+        ignore_prefixes = ["squash!", "fixup!", "amend!", "WIP"]
+
+    if "-h" in args:
+        show_help()
+    else:
+        args = [arg for arg in args if arg not in ["-v", "-n", "-h"]]
+        run(args)

From cee0945f1c34d27db7f7a166be8ca8ea39f5349d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Oct 2023 13:18:44 +1100
Subject: [PATCH 217/343] all: Replace "black" with "ruff format".

- Add config for [tool.ruff.format] to pyproject.toml.
- Update pre-commit to run both ruff and ruff-format.
- Update a small number of files that change with ruff's rules.
- Update CI.
- Simplify codeformat.py just forward directly to "ruff format"

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/code_formatting.yml | 16 ------
 .github/workflows/ruff.yml            |  5 +-
 .pre-commit-config.yaml               |  7 +--
 micropython/aiorepl/aiorepl.py        |  4 +-
 pyproject.toml                        |  7 ++-
 python-ecosys/cbor2/cbor2/decoder.py  |  5 +-
 tools/ci.sh                           | 15 ------
 tools/codeformat.py                   | 76 ++-------------------------
 tools/makepyproject.py                |  4 +-
 9 files changed, 20 insertions(+), 119 deletions(-)
 delete mode 100644 .github/workflows/code_formatting.yml

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
deleted file mode 100644
index 71c50aa1b..000000000
--- a/.github/workflows/code_formatting.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Check code formatting
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-    - name: Install packages
-      run: source tools/ci.sh && ci_code_formatting_setup
-    - name: Run code formatting
-      run: source tools/ci.sh && ci_code_formatting_run
-    - name: Check code formatting
-      run: git diff --exit-code
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 0374d766f..71c4131f0 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -1,10 +1,11 @@
 # https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-name: Python code lint with ruff
+name: Python code lint and formatting with ruff
 on: [push, pull_request]
 jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: pip install --user ruff==0.1.0
+    - run: pip install --user ruff==0.1.2
     - run: ruff check --output-format=github .
+    - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bfce6a246..335c1c2fc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,10 +1,6 @@
 repos:
   - repo: local
     hooks:
-      - id: codeformat
-        name: MicroPython codeformat.py for changed files
-        entry: tools/codeformat.py -v -f
-        language: python
       - id: verifygitlog
         name: MicroPython git commit message format checker
         entry: tools/verifygitlog.py --check-file --ignore-rebase
@@ -12,6 +8,7 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.0
+    rev: v0.1.2
     hooks:
       - id: ruff
+        id: ruff-format
diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 8b3ce4f8c..e7e316768 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -39,9 +39,7 @@ async def __code():
     {}
 
 __exec_task = asyncio.create_task(__code())
-""".format(
-                code
-            )
+""".format(code)
 
             async def kbd_intr_task(exec_task, s):
                 while True:
diff --git a/pyproject.toml b/pyproject.toml
index 1aa9c1122..3b2524545 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,8 +61,10 @@ ignore = [
   "F401",
   "F403",
   "F405",
+  "E501",
   "F541",
   "F841",
+  "ISC001",
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
   "PLC1901",
@@ -74,8 +76,9 @@ ignore = [
   "PLW2901",
   "RUF012",
   "RUF100",
+  "W191",
 ]
-line-length = 260
+line-length = 99
 target-version = "py37"
 
 [tool.ruff.mccabe]
@@ -97,3 +100,5 @@ max-statements = 166
 
 # ble multitests are evaluated with some names pre-defined
 "micropython/bluetooth/aioble/multitests/*" = ["F821"]
+
+[tool.ruff.format]
diff --git a/python-ecosys/cbor2/cbor2/decoder.py b/python-ecosys/cbor2/cbor2/decoder.py
index 48ff02d89..e38f078f3 100644
--- a/python-ecosys/cbor2/cbor2/decoder.py
+++ b/python-ecosys/cbor2/cbor2/decoder.py
@@ -210,8 +210,9 @@ def read(self, amount):
         data = self.fp.read(amount)
         if len(data) < amount:
             raise CBORDecodeError(
-                "premature end of stream (expected to read {} bytes, got {} "
-                "instead)".format(amount, len(data))
+                "premature end of stream (expected to read {} bytes, got {} instead)".format(
+                    amount, len(data)
+                )
             )
 
         return data
diff --git a/tools/ci.sh b/tools/ci.sh
index 139894780..730034efb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1,20 +1,5 @@
 #!/bin/bash
 
-########################################################################################
-# code formatting
-
-function ci_code_formatting_setup {
-    sudo apt-add-repository --yes --update ppa:pybricks/ppa
-    sudo apt-get install uncrustify
-    pip3 install black
-    uncrustify --version
-    black --version
-}
-
-function ci_code_formatting_run {
-    tools/codeformat.py -v
-}
-
 ########################################################################################
 # commit formatting
 
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 2bc0c7f44..6a7f2b35f 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -25,87 +25,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# This is based on tools/codeformat.py from the main micropython/micropython
-# repository but without support for .c/.h files.
+# This is just a wrapper around running ruff format, so that code formatting can be
+# invoked in the same way as in the main repo.
 
-import argparse
-import glob
-import itertools
 import os
-import re
 import subprocess
 
-# Relative to top-level repo dir.
-PATHS = [
-    "**/*.py",
-]
-
-EXCLUSIONS = []
-
 # Path to repo top-level dir.
 TOP = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 
-PY_EXTS = (".py",)
-
-
-def list_files(paths, exclusions=None, prefix=""):
-    files = set()
-    for pattern in paths:
-        files.update(glob.glob(os.path.join(prefix, pattern), recursive=True))
-    for pattern in exclusions or []:
-        files.difference_update(glob.fnmatch.filter(files, os.path.join(prefix, pattern)))
-    return sorted(files)
-
 
 def main():
-    cmd_parser = argparse.ArgumentParser(description="Auto-format Python files.")
-    cmd_parser.add_argument("-v", action="store_true", help="Enable verbose output")
-    cmd_parser.add_argument(
-        "-f",
-        action="store_true",
-        help="Filter files provided on the command line against the default list of files to check.",
-    )
-    cmd_parser.add_argument("files", nargs="*", help="Run on specific globs")
-    args = cmd_parser.parse_args()
-
-    # Expand the globs passed on the command line, or use the default globs above.
-    files = []
-    if args.files:
-        files = list_files(args.files)
-        if args.f:
-            # Filter against the default list of files. This is a little fiddly
-            # because we need to apply both the inclusion globs given in PATHS
-            # as well as the EXCLUSIONS, and use absolute paths
-            files = {os.path.abspath(f) for f in files}
-            all_files = set(list_files(PATHS, EXCLUSIONS, TOP))
-            if args.v:  # In verbose mode, log any files we're skipping
-                for f in files - all_files:
-                    print("Not checking: {}".format(f))
-            files = list(files & all_files)
-    else:
-        files = list_files(PATHS, EXCLUSIONS, TOP)
-
-    # Extract files matching a specific language.
-    def lang_files(exts):
-        for file in files:
-            if os.path.splitext(file)[1].lower() in exts:
-                yield file
-
-    # Run tool on N files at a time (to avoid making the command line too long).
-    def batch(cmd, files, N=200):
-        while True:
-            file_args = list(itertools.islice(files, N))
-            if not file_args:
-                break
-            subprocess.check_call(cmd + file_args)
-
-    # Format Python files with black.
-    command = ["black", "--fast", "--line-length=99"]
-    if args.v:
-        command.append("-v")
-    else:
-        command.append("-q")
-    batch(command, lang_files(PY_EXTS))
+    command = ["ruff", "format", "."]
+    subprocess.check_call(command, cwd=TOP)
 
 
 if __name__ == "__main__":
diff --git a/tools/makepyproject.py b/tools/makepyproject.py
index eaaef01b3..25c05d05f 100755
--- a/tools/makepyproject.py
+++ b/tools/makepyproject.py
@@ -185,9 +185,7 @@ def build(manifest_path, output_path):
             """
 [tool.hatch.build]
 packages = ["{}"]
-""".format(
-                top_level_package
-            ),
+""".format(top_level_package),
             file=toml_file,
         )
 

From 83f3991f41dc708ffbd98f16d0f2ba59edeb089b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 10 Nov 2023 16:07:35 +1100
Subject: [PATCH 218/343] lcd160cr: Remove support for options in manifest.

This is the last remaining use of the "options" feature. Nothing in the
main repo which `require()`'s this package sets it.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 micropython/drivers/display/lcd160cr/manifest.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/micropython/drivers/display/lcd160cr/manifest.py b/micropython/drivers/display/lcd160cr/manifest.py
index 5ce055717..9e18a02a7 100644
--- a/micropython/drivers/display/lcd160cr/manifest.py
+++ b/micropython/drivers/display/lcd160cr/manifest.py
@@ -1,8 +1,3 @@
 metadata(description="LCD160CR driver.", version="0.1.0")
 
-options.defaults(test=False)
-
 module("lcd160cr.py", opt=3)
-
-if options.test:
-    module("lcd160cr_test.py", opt=3)

From 340243e205950f8b1d6761f96349bce1bbc1b375 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sat, 30 Sep 2023 10:23:35 +1000
Subject: [PATCH 219/343] time: Add README to explain the purpose of the time
 extension library.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 python-stdlib/time/README.md | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 python-stdlib/time/README.md

diff --git a/python-stdlib/time/README.md b/python-stdlib/time/README.md
new file mode 100644
index 000000000..f07517305
--- /dev/null
+++ b/python-stdlib/time/README.md
@@ -0,0 +1,45 @@
+# time
+
+This library _extends_ the built-in [MicroPython `time`
+module](https://docs.micropython.org/en/latest/library/time.html#module-time) to
+include
+[`time.strftime()`](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior).
+
+`strftime()` is omitted from the built-in `time` module to conserve space.
+
+## Installation
+
+Use `mip` via `mpremote`:
+
+```bash
+> mpremote mip install time
+```
+
+See [Package management](https://docs.micropython.org/en/latest/reference/packages.html) for more details on using `mip` and `mpremote`.
+
+## Common uses
+
+`strftime()` is used when using a loggging [Formatter
+Object](https://docs.python.org/3/library/logging.html#formatter-objects) that
+employs
+[`asctime`](https://docs.python.org/3/library/logging.html#formatter-objects).
+
+For example:
+
+```python
+logging.Formatter('%(asctime)s | %(name)s | %(levelname)s - %(message)s')
+```
+
+The expected output might look like:
+
+```text
+Tue Feb 17 09:42:58 2009 | MAIN | INFO - test
+```
+
+But if this `time` extension library isn't installed, `asctime` will always be
+`None`:
+
+
+```text
+None | MAIN | INFO - test
+```

From 41aa257a3170470483ac61b297538b14a1f3e7ad Mon Sep 17 00:00:00 2001
From: Yu Ting <tristan.yu@outlook.com>
Date: Sun, 12 Nov 2023 17:15:53 +0800
Subject: [PATCH 220/343] base64: Implement custom maketrans and translate
 methods.

Re-implemented bytes.maketrans() and bytes.translate() as there are no such
functions in MicroPython.
---
 python-stdlib/base64/base64.py   | 31 +++++++++++++++++++++++++------
 python-stdlib/base64/manifest.py |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/python-stdlib/base64/base64.py b/python-stdlib/base64/base64.py
index daa39728b..d6baca05f 100644
--- a/python-stdlib/base64/base64.py
+++ b/python-stdlib/base64/base64.py
@@ -52,6 +52,25 @@ def _bytes_from_decode_data(s):
         raise TypeError("argument should be bytes or ASCII string, not %s" % s.__class__.__name__)
 
 
+def _maketrans(f, t):
+    """Re-implement bytes.maketrans() as there is no such function in micropython"""
+    if len(f) != len(t):
+        raise ValueError("maketrans arguments must have same length")
+    translation_table = dict(zip(f, t))
+    return translation_table
+
+
+def _translate(input_bytes, trans_table):
+    """Re-implement bytes.translate() as there is no such function in micropython"""
+    result = bytearray()
+
+    for byte in input_bytes:
+        translated_byte = trans_table.get(byte, byte)
+        result.append(translated_byte)
+
+    return bytes(result)
+
+
 # Base64 encoding/decoding uses binascii
 
 
@@ -73,7 +92,7 @@ def b64encode(s, altchars=None):
         if not isinstance(altchars, bytes_types):
             raise TypeError("expected bytes, not %s" % altchars.__class__.__name__)
         assert len(altchars) == 2, repr(altchars)
-        return encoded.translate(bytes.maketrans(b"+/", altchars))
+        encoded = _translate(encoded, _maketrans(b"+/", altchars))
     return encoded
 
 
@@ -95,7 +114,7 @@ def b64decode(s, altchars=None, validate=False):
     if altchars is not None:
         altchars = _bytes_from_decode_data(altchars)
         assert len(altchars) == 2, repr(altchars)
-        s = s.translate(bytes.maketrans(altchars, b"+/"))
+        s = _translate(s, _maketrans(altchars, b"+/"))
     if validate and not re.match(b"^[A-Za-z0-9+/]*=*$", s):
         raise binascii.Error("Non-base64 digit found")
     return binascii.a2b_base64(s)
@@ -120,8 +139,8 @@ def standard_b64decode(s):
     return b64decode(s)
 
 
-# _urlsafe_encode_translation = bytes.maketrans(b'+/', b'-_')
-# _urlsafe_decode_translation = bytes.maketrans(b'-_', b'+/')
+# _urlsafe_encode_translation = _maketrans(b'+/', b'-_')
+# _urlsafe_decode_translation = _maketrans(b'-_', b'+/')
 
 
 def urlsafe_b64encode(s):
@@ -132,7 +151,7 @@ def urlsafe_b64encode(s):
     '/'.
     """
     #    return b64encode(s).translate(_urlsafe_encode_translation)
-    raise NotImplementedError()
+    return b64encode(s, b"-_").rstrip(b"\n")
 
 
 def urlsafe_b64decode(s):
@@ -266,7 +285,7 @@ def b32decode(s, casefold=False, map01=None):
     if map01 is not None:
         map01 = _bytes_from_decode_data(map01)
         assert len(map01) == 1, repr(map01)
-        s = s.translate(bytes.maketrans(b"01", b"O" + map01))
+        s = _translate(s, _maketrans(b"01", b"O" + map01))
     if casefold:
         s = s.upper()
     # Strip off pad characters from the right.  We need to count the pad
diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
index 2a0ebba51..613d3bc62 100644
--- a/python-stdlib/base64/manifest.py
+++ b/python-stdlib/base64/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="3.3.4")
+metadata(version="3.3.5")
 
 require("binascii")
 require("struct")

From e051a120bcd0433b209727b20d342f1faa651b8f Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 24 Oct 2023 15:27:31 +1100
Subject: [PATCH 221/343] aiorepl: Update import of asyncio.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/README.md  | 2 +-
 micropython/aiorepl/aiorepl.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/aiorepl/README.md b/micropython/aiorepl/README.md
index 4bb11083f..c1c08b899 100644
--- a/micropython/aiorepl/README.md
+++ b/micropython/aiorepl/README.md
@@ -21,7 +21,7 @@ To use this library, you need to import the library and then start the REPL task
 For example, in main.py:
 
 ```py
-import uasyncio as asyncio
+import asyncio
 import aiorepl
 
 async def demo():
diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index e7e316768..e562f9469 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -5,7 +5,7 @@
 import re
 import sys
 import time
-import uasyncio as asyncio
+import asyncio
 
 # Import statement (needs to be global, and does not return).
 _RE_IMPORT = re.compile("^import ([^ ]+)( as ([^ ]+))?")

From d41851ca7246470dc74f6e9140e67af74ea907e7 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 24 Oct 2023 15:34:27 +1100
Subject: [PATCH 222/343] aiorepl: Add support for paste mode (ctrl-e).

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/aiorepl.py | 39 ++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index e562f9469..ab8f5d67e 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -19,6 +19,13 @@
 _HISTORY_LIMIT = const(5 + 1)
 
 
+CHAR_CTRL_A = const(1)
+CHAR_CTRL_B = const(2)
+CHAR_CTRL_C = const(3)
+CHAR_CTRL_D = const(4)
+CHAR_CTRL_E = const(5)
+
+
 async def execute(code, g, s):
     if not code.strip():
         return
@@ -43,7 +50,7 @@ async def __code():
 
             async def kbd_intr_task(exec_task, s):
                 while True:
-                    if ord(await s.read(1)) == 0x03:
+                    if ord(await s.read(1)) == CHAR_CTRL_C:
                         exec_task.cancel()
                         return
 
@@ -102,7 +109,8 @@ async def task(g=None, prompt="--> "):
         while True:
             hist_b = 0  # How far back in the history are we currently.
             sys.stdout.write(prompt)
-            cmd = ""
+            cmd: str = ""
+            paste = False
             while True:
                 b = await s.read(1)
                 pc = c  # save previous character
@@ -112,6 +120,10 @@ async def task(g=None, prompt="--> "):
                 if c < 0x20 or c > 0x7E:
                     if c == 0x0A:
                         # LF
+                        if paste:
+                            sys.stdout.write(b)
+                            cmd += b
+                            continue
                         # If the previous character was also LF, and was less
                         # than 20 ms ago, this was likely due to CRLF->LFLF
                         # conversion, so ignore this linefeed.
@@ -135,12 +147,12 @@ async def task(g=None, prompt="--> "):
                         if cmd:
                             cmd = cmd[:-1]
                             sys.stdout.write("\x08 \x08")
-                    elif c == 0x02:
-                        # Ctrl-B
+                    elif c == CHAR_CTRL_B:
                         continue
-                    elif c == 0x03:
-                        # Ctrl-C
-                        if pc == 0x03 and time.ticks_diff(t, pt) < 20:
+                    elif c == CHAR_CTRL_C:
+                        if paste:
+                            break
+                        if pc == CHAR_CTRL_C and time.ticks_diff(t, pt) < 20:
                             # Two very quick Ctrl-C (faster than a human
                             # typing) likely means mpremote trying to
                             # escape.
@@ -148,12 +160,21 @@ async def task(g=None, prompt="--> "):
                             return
                         sys.stdout.write("\n")
                         break
-                    elif c == 0x04:
-                        # Ctrl-D
+                    elif c == CHAR_CTRL_D:
+                        if paste:
+                            result = await execute(cmd, g, s)
+                            if result is not None:
+                                sys.stdout.write(repr(result))
+                                sys.stdout.write("\n")
+                            break
+
                         sys.stdout.write("\n")
                         # Shutdown asyncio.
                         asyncio.new_event_loop()
                         return
+                    elif c == CHAR_CTRL_E:
+                        sys.stdout.write("paste mode; Ctrl-C to cancel, Ctrl-D to finish\n===\n")
+                        paste = True
                     elif c == 0x1B:
                         # Start of escape sequence.
                         key = await s.read(2)

From 10c9281dadb63cde38b977b4f330ea8af5faf0aa Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 24 Oct 2023 15:36:53 +1100
Subject: [PATCH 223/343] aiorepl: Add cursor left/right support.

Allows modifying current line, adding/deleting characters in the middle
etc.  Includes home/end keys to move to start/end of current line.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/aiorepl.py | 47 ++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index ab8f5d67e..63e98096c 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -111,6 +111,7 @@ async def task(g=None, prompt="--> "):
             sys.stdout.write(prompt)
             cmd: str = ""
             paste = False
+            curs = 0  # cursor offset from end of cmd buffer
             while True:
                 b = await s.read(1)
                 pc = c  # save previous character
@@ -129,6 +130,10 @@ async def task(g=None, prompt="--> "):
                         # conversion, so ignore this linefeed.
                         if pc == 0x0A and time.ticks_diff(t, pt) < 20:
                             continue
+                        if curs:
+                            # move cursor to end of the line
+                            sys.stdout.write("\x1B[{}C".format(curs))
+                            curs = 0
                         sys.stdout.write("\n")
                         if cmd:
                             # Push current command.
@@ -145,8 +150,16 @@ async def task(g=None, prompt="--> "):
                     elif c == 0x08 or c == 0x7F:
                         # Backspace.
                         if cmd:
-                            cmd = cmd[:-1]
-                            sys.stdout.write("\x08 \x08")
+                            if curs:
+                                cmd = "".join((cmd[: -curs - 1], cmd[-curs:]))
+                                sys.stdout.write(
+                                    "\x08\x1B[K"
+                                )  # move cursor back, erase to end of line
+                                sys.stdout.write(cmd[-curs:])  # redraw line
+                                sys.stdout.write("\x1B[{}D".format(curs))  # reset cursor location
+                            else:
+                                cmd = cmd[:-1]
+                                sys.stdout.write("\x08 \x08")
                     elif c == CHAR_CTRL_B:
                         continue
                     elif c == CHAR_CTRL_C:
@@ -178,7 +191,7 @@ async def task(g=None, prompt="--> "):
                     elif c == 0x1B:
                         # Start of escape sequence.
                         key = await s.read(2)
-                        if key in ("[A", "[B"):
+                        if key in ("[A", "[B"):  # up, down
                             # Stash the current command.
                             hist[(hist_i - hist_b) % _HISTORY_LIMIT] = cmd
                             # Clear current command.
@@ -194,12 +207,36 @@ async def task(g=None, prompt="--> "):
                             # Update current command.
                             cmd = hist[(hist_i - hist_b) % _HISTORY_LIMIT]
                             sys.stdout.write(cmd)
+                        elif key == "[D":  # left
+                            if curs < len(cmd) - 1:
+                                curs += 1
+                                sys.stdout.write("\x1B")
+                                sys.stdout.write(key)
+                        elif key == "[C":  # right
+                            if curs:
+                                curs -= 1
+                                sys.stdout.write("\x1B")
+                                sys.stdout.write(key)
+                        elif key == "[H":  # home
+                            pcurs = curs
+                            curs = len(cmd)
+                            sys.stdout.write("\x1B[{}D".format(curs - pcurs))  # move cursor left
+                        elif key == "[F":  # end
+                            pcurs = curs
+                            curs = 0
+                            sys.stdout.write("\x1B[{}C".format(pcurs))  # move cursor right
                     else:
                         # sys.stdout.write("\\x")
                         # sys.stdout.write(hex(c))
                         pass
                 else:
-                    sys.stdout.write(b)
-                    cmd += b
+                    if curs:
+                        # inserting into middle of line
+                        cmd = "".join((cmd[:-curs], b, cmd[-curs:]))
+                        sys.stdout.write(cmd[-curs - 1 :])  # redraw line to end
+                        sys.stdout.write("\x1B[{}D".format(curs))  # reset cursor location
+                    else:
+                        sys.stdout.write(b)
+                        cmd += b
     finally:
         micropython.kbd_intr(3)

From f672baa92ba9c2b890c8a65fe115ec5c025c14c8 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 24 Oct 2023 15:38:00 +1100
Subject: [PATCH 224/343] aiorepl: Add support for raw mode (ctrl-a).

Provides support for mpremote features like cp and mount.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/aiorepl.py  | 95 ++++++++++++++++++++++++++++++---
 micropython/aiorepl/manifest.py |  2 +-
 2 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 63e98096c..14d5d55bc 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -160,17 +160,14 @@ async def task(g=None, prompt="--> "):
                             else:
                                 cmd = cmd[:-1]
                                 sys.stdout.write("\x08 \x08")
+                    elif c == CHAR_CTRL_A:
+                        await raw_repl(s, g)
+                        break
                     elif c == CHAR_CTRL_B:
                         continue
                     elif c == CHAR_CTRL_C:
                         if paste:
                             break
-                        if pc == CHAR_CTRL_C and time.ticks_diff(t, pt) < 20:
-                            # Two very quick Ctrl-C (faster than a human
-                            # typing) likely means mpremote trying to
-                            # escape.
-                            asyncio.new_event_loop()
-                            return
                         sys.stdout.write("\n")
                         break
                     elif c == CHAR_CTRL_D:
@@ -240,3 +237,89 @@ async def task(g=None, prompt="--> "):
                         cmd += b
     finally:
         micropython.kbd_intr(3)
+
+
+async def raw_paste(s, g, window=512):
+    sys.stdout.write("R\x01")  # supported
+    sys.stdout.write(bytearray([window & 0xFF, window >> 8, 0x01]).decode())
+    eof = False
+    idx = 0
+    buff = bytearray(window)
+    file = b""
+    while not eof:
+        for idx in range(window):
+            b = await s.read(1)
+            c = ord(b)
+            if c == CHAR_CTRL_C or c == CHAR_CTRL_D:
+                # end of file
+                sys.stdout.write(chr(CHAR_CTRL_D))
+                if c == CHAR_CTRL_C:
+                    raise KeyboardInterrupt
+                file += buff[:idx]
+                eof = True
+                break
+            buff[idx] = c
+
+        if not eof:
+            file += buff
+            sys.stdout.write("\x01")  # indicate window available to host
+
+    return file
+
+
+async def raw_repl(s: asyncio.StreamReader, g: dict):
+    heading = "raw REPL; CTRL-B to exit\n"
+    line = ""
+    sys.stdout.write(heading)
+
+    while True:
+        line = ""
+        sys.stdout.write(">")
+        while True:
+            b = await s.read(1)
+            c = ord(b)
+            if c == CHAR_CTRL_A:
+                rline = line
+                line = ""
+
+                if len(rline) == 2 and ord(rline[0]) == CHAR_CTRL_E:
+                    if rline[1] == "A":
+                        line = await raw_paste(s, g)
+                        break
+                else:
+                    # reset raw REPL
+                    sys.stdout.write(heading)
+                    sys.stdout.write(">")
+                continue
+            elif c == CHAR_CTRL_B:
+                # exit raw REPL
+                sys.stdout.write("\n")
+                return 0
+            elif c == CHAR_CTRL_C:
+                # clear line
+                line = ""
+            elif c == CHAR_CTRL_D:
+                # entry finished
+                # indicate reception of command
+                sys.stdout.write("OK")
+                break
+            else:
+                # let through any other raw 8-bit value
+                line += b
+
+        if len(line) == 0:
+            # Normally used to trigger soft-reset but stay in raw mode.
+            # Fake it for aiorepl / mpremote.
+            sys.stdout.write("Ignored: soft reboot\n")
+            sys.stdout.write(heading)
+
+        try:
+            result = exec(line, g)
+            if result is not None:
+                sys.stdout.write(repr(result))
+            sys.stdout.write(chr(CHAR_CTRL_D))
+        except Exception as ex:
+            print(line)
+            sys.stdout.write(chr(CHAR_CTRL_D))
+            sys.print_exception(ex, sys.stdout)
+        sys.stdout.write(chr(CHAR_CTRL_D))
diff --git a/micropython/aiorepl/manifest.py b/micropython/aiorepl/manifest.py
index ca88bb359..0fcc21849 100644
--- a/micropython/aiorepl/manifest.py
+++ b/micropython/aiorepl/manifest.py
@@ -1,5 +1,5 @@
 metadata(
-    version="0.1.1",
+    version="0.2.0",
     description="Provides an asynchronous REPL that can run concurrently with an asyncio, also allowing await expressions.",
 )
 

From ae8ea8d11395d34ec931b0aa44ce16f791c959a9 Mon Sep 17 00:00:00 2001
From: scivision <scivision@users.noreply.github.com>
Date: Wed, 13 Sep 2023 20:02:59 -0400
Subject: [PATCH 225/343] os-path: Implement os.path.isfile().

Signed-off-by: Michael Hirsch <michael@scivision.dev>
---
 python-stdlib/os-path/manifest.py  | 2 +-
 python-stdlib/os-path/os/path.py   | 7 +++++++
 python-stdlib/os-path/test_path.py | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/os-path/manifest.py b/python-stdlib/os-path/manifest.py
index fd1885223..4433e6a4d 100644
--- a/python-stdlib/os-path/manifest.py
+++ b/python-stdlib/os-path/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1.4")
+metadata(version="0.2.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/python-stdlib/os-path/os/path.py b/python-stdlib/os-path/os/path.py
index 7b4f937e5..b9ae1972f 100644
--- a/python-stdlib/os-path/os/path.py
+++ b/python-stdlib/os-path/os/path.py
@@ -66,6 +66,13 @@ def isdir(path):
         return False
 
 
+def isfile(path):
+    try:
+        return bool(os.stat(path)[0] & 0x8000)
+    except OSError:
+        return False
+
+
 def expanduser(s):
     if s == "~" or s.startswith("~/"):
         h = os.getenv("HOME")
diff --git a/python-stdlib/os-path/test_path.py b/python-stdlib/os-path/test_path.py
index d2d3a3be4..85178364b 100644
--- a/python-stdlib/os-path/test_path.py
+++ b/python-stdlib/os-path/test_path.py
@@ -20,3 +20,7 @@
 assert isdir(dir + "/os")
 assert not isdir(dir + "/os--")
 assert not isdir(dir + "/test_path.py")
+
+assert not isfile(dir + "/os")
+assert isfile(dir + "/test_path.py")
+assert not isfile(dir + "/test_path.py--")

From 149226d3f743e800dc6629c81c832b4a2164dd8f Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Wed, 8 Nov 2023 08:11:39 +1000
Subject: [PATCH 226/343] uaiohttpclient: Fix hard coded port 80.

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 micropython/uaiohttpclient/manifest.py       | 2 +-
 micropython/uaiohttpclient/uaiohttpclient.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/micropython/uaiohttpclient/manifest.py b/micropython/uaiohttpclient/manifest.py
index 72dd9671c..a204d57b2 100644
--- a/micropython/uaiohttpclient/manifest.py
+++ b/micropython/uaiohttpclient/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="HTTP client module for MicroPython uasyncio module", version="0.5.1")
+metadata(description="HTTP client module for MicroPython uasyncio module", version="0.5.2")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/uaiohttpclient/uaiohttpclient.py b/micropython/uaiohttpclient/uaiohttpclient.py
index 25b2e62a9..bcda6203a 100644
--- a/micropython/uaiohttpclient/uaiohttpclient.py
+++ b/micropython/uaiohttpclient/uaiohttpclient.py
@@ -46,9 +46,16 @@ def request_raw(method, url):
     except ValueError:
         proto, dummy, host = url.split("/", 2)
         path = ""
+
+    if ":" in host:
+        host, port = host.split(":")
+        port = int(port)
+    else:
+        port = 80
+
     if proto != "http:":
         raise ValueError("Unsupported protocol: " + proto)
-    reader, writer = yield from asyncio.open_connection(host, 80)
+    reader, writer = yield from asyncio.open_connection(host, port)
     # Use protocol 1.0, because 1.1 always allows to use chunked transfer-encoding
     # But explicitly set Connection: close, even though this should be default for 1.0,
     # because some servers misbehave w/o it.

From 9d09cdd4af3000d8fd79dca81f9fa2eb6b71d40e Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Wed, 8 Nov 2023 08:13:31 +1000
Subject: [PATCH 227/343] uaiohttpclient: Make flake8 inspired improvements.

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 micropython/uaiohttpclient/uaiohttpclient.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/micropython/uaiohttpclient/uaiohttpclient.py b/micropython/uaiohttpclient/uaiohttpclient.py
index bcda6203a..878e37b9a 100644
--- a/micropython/uaiohttpclient/uaiohttpclient.py
+++ b/micropython/uaiohttpclient/uaiohttpclient.py
@@ -19,10 +19,10 @@ def __init__(self, reader):
 
     def read(self, sz=4 * 1024 * 1024):
         if self.chunk_size == 0:
-            l = yield from self.content.readline()
+            line = yield from self.content.readline()
             # print("chunk line:", l)
-            l = l.split(b";", 1)[0]
-            self.chunk_size = int(l, 16)
+            line = line.split(b";", 1)[0]
+            self.chunk_size = int(line, 16)
             # print("chunk size:", self.chunk_size)
             if self.chunk_size == 0:
                 # End of message
@@ -56,9 +56,10 @@ def request_raw(method, url):
     if proto != "http:":
         raise ValueError("Unsupported protocol: " + proto)
     reader, writer = yield from asyncio.open_connection(host, port)
-    # Use protocol 1.0, because 1.1 always allows to use chunked transfer-encoding
-    # But explicitly set Connection: close, even though this should be default for 1.0,
-    # because some servers misbehave w/o it.
+    # Use protocol 1.0, because 1.1 always allows to use chunked
+    # transfer-encoding But explicitly set Connection: close, even
+    # though this should be default for 1.0, because some servers
+    # misbehave w/o it.
     query = "%s /%s HTTP/1.0\r\nHost: %s\r\nConnection: close\r\nUser-Agent: compat\r\n\r\n" % (
         method,
         path,
@@ -71,7 +72,6 @@ def request_raw(method, url):
 
 def request(method, url):
     redir_cnt = 0
-    redir_url = None
     while redir_cnt < 2:
         reader = yield from request_raw(method, url)
         headers = []

From 05efdd03a76e14b6d0b9d375f4c3441eb87a08a4 Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Wed, 8 Nov 2023 08:15:21 +1000
Subject: [PATCH 228/343] uaiohttpclient: Update "yield from" to "await".

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 micropython/uaiohttpclient/uaiohttpclient.py | 31 ++++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/micropython/uaiohttpclient/uaiohttpclient.py b/micropython/uaiohttpclient/uaiohttpclient.py
index 878e37b9a..6347c3371 100644
--- a/micropython/uaiohttpclient/uaiohttpclient.py
+++ b/micropython/uaiohttpclient/uaiohttpclient.py
@@ -5,8 +5,8 @@ class ClientResponse:
     def __init__(self, reader):
         self.content = reader
 
-    def read(self, sz=-1):
-        return (yield from self.content.read(sz))
+    async def read(self, sz=-1):
+        return await self.content.read(sz)
 
     def __repr__(self):
         return "<ClientResponse %d %s>" % (self.status, self.headers)
@@ -17,22 +17,22 @@ def __init__(self, reader):
         self.content = reader
         self.chunk_size = 0
 
-    def read(self, sz=4 * 1024 * 1024):
+    async def read(self, sz=4 * 1024 * 1024):
         if self.chunk_size == 0:
-            line = yield from self.content.readline()
+            line = await self.content.readline()
             # print("chunk line:", l)
             line = line.split(b";", 1)[0]
             self.chunk_size = int(line, 16)
             # print("chunk size:", self.chunk_size)
             if self.chunk_size == 0:
                 # End of message
-                sep = yield from self.content.read(2)
+                sep = await self.content.read(2)
                 assert sep == b"\r\n"
                 return b""
-        data = yield from self.content.read(min(sz, self.chunk_size))
+        data = await self.content.read(min(sz, self.chunk_size))
         self.chunk_size -= len(data)
         if self.chunk_size == 0:
-            sep = yield from self.content.read(2)
+            sep = await self.content.read(2)
             assert sep == b"\r\n"
         return data
 
@@ -40,7 +40,7 @@ def __repr__(self):
         return "<ChunkedClientResponse %d %s>" % (self.status, self.headers)
 
 
-def request_raw(method, url):
+async def request_raw(method, url):
     try:
         proto, dummy, host, path = url.split("/", 3)
     except ValueError:
@@ -55,7 +55,7 @@ def request_raw(method, url):
 
     if proto != "http:":
         raise ValueError("Unsupported protocol: " + proto)
-    reader, writer = yield from asyncio.open_connection(host, port)
+    reader, writer = await asyncio.open_connection(host, port)
     # Use protocol 1.0, because 1.1 always allows to use chunked
     # transfer-encoding But explicitly set Connection: close, even
     # though this should be default for 1.0, because some servers
@@ -65,22 +65,21 @@ def request_raw(method, url):
         path,
         host,
     )
-    yield from writer.awrite(query.encode("latin-1"))
-    #    yield from writer.aclose()
+    await writer.awrite(query.encode("latin-1"))
     return reader
 
 
-def request(method, url):
+async def request(method, url):
     redir_cnt = 0
     while redir_cnt < 2:
-        reader = yield from request_raw(method, url)
+        reader = await request_raw(method, url)
         headers = []
-        sline = yield from reader.readline()
+        sline = await reader.readline()
         sline = sline.split(None, 2)
         status = int(sline[1])
         chunked = False
         while True:
-            line = yield from reader.readline()
+            line = await reader.readline()
             if not line or line == b"\r\n":
                 break
             headers.append(line)
@@ -92,7 +91,7 @@ def request(method, url):
 
         if 301 <= status <= 303:
             redir_cnt += 1
-            yield from reader.aclose()
+            await reader.aclose()
             continue
         break
 

From 9ceda531804e20374db7e1cfdcada2318498bb14 Mon Sep 17 00:00:00 2001
From: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: Wed, 8 Nov 2023 08:16:05 +1000
Subject: [PATCH 229/343] uaiohttpclient: Update example client code.

Signed-off-by: Mark Blakeney <mark.blakeney@bullet-systems.net>
---
 micropython/uaiohttpclient/example.py | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/micropython/uaiohttpclient/example.py b/micropython/uaiohttpclient/example.py
index 5c03ee29f..d265c9db7 100644
--- a/micropython/uaiohttpclient/example.py
+++ b/micropython/uaiohttpclient/example.py
@@ -1,31 +1,16 @@
 #
 # uaiohttpclient - fetch URL passed as command line argument.
 #
+import sys
 import uasyncio as asyncio
 import uaiohttpclient as aiohttp
 
 
-def print_stream(resp):
-    print((yield from resp.read()))
-    return
-    while True:
-        line = yield from resp.readline()
-        if not line:
-            break
-        print(line.rstrip())
-
-
-def run(url):
-    resp = yield from aiohttp.request("GET", url)
+async def run(url):
+    resp = await aiohttp.request("GET", url)
     print(resp)
-    yield from print_stream(resp)
+    print(await resp.read())
 
 
-import sys
-import logging
-
-logging.basicConfig(level=logging.INFO)
 url = sys.argv[1]
-loop = asyncio.get_event_loop()
-loop.run_until_complete(run(url))
-loop.close()
+asyncio.run(run(url))

From 57ce3ba95c65d9823e8cc5284003967ff621bd46 Mon Sep 17 00:00:00 2001
From: Bhavesh Kakwani <bk@bhave.sh>
Date: Mon, 20 Nov 2023 15:34:44 -0500
Subject: [PATCH 230/343] aioble: Fix advertising variable name to use us not
 ms.

---
 micropython/bluetooth/aioble/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/bluetooth/aioble/README.md b/micropython/bluetooth/aioble/README.md
index b488721c3..83ae00209 100644
--- a/micropython/bluetooth/aioble/README.md
+++ b/micropython/bluetooth/aioble/README.md
@@ -108,7 +108,7 @@ _ENV_SENSE_UUID = bluetooth.UUID(0x181A)
 _ENV_SENSE_TEMP_UUID = bluetooth.UUID(0x2A6E)
 _GENERIC_THERMOMETER = const(768)
 
-_ADV_INTERVAL_MS = const(250000)
+_ADV_INTERVAL_US = const(250000)
 
 temp_service = aioble.Service(_ENV_SENSE_UUID)
 temp_char = aioble.Characteristic(temp_service, _ENV_SENSE_TEMP_UUID, read=True, notify=True)
@@ -117,7 +117,7 @@ aioble.register_services(temp_service)
 
 while True:
     connection = await aioble.advertise(
-            _ADV_INTERVAL_MS,
+            _ADV_INTERVAL_US,
             name="temp-sense",
             services=[_ENV_SENSE_UUID],
             appearance=_GENERIC_THERMOMETER,

From 7cdf70881519c73667efbc4a61a04d9c1a49babb Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Tue, 5 Sep 2023 03:56:54 +0100
Subject: [PATCH 231/343] aiohttp: Add new aiohttp package.

Implement `aiohttp` with `ClientSession`, websockets and `SSLContext`
support.

Only client is implemented and API is mostly compatible with CPython
`aiohttp`.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 python-ecosys/aiohttp/README.md               |  32 +++
 python-ecosys/aiohttp/aiohttp/__init__.py     | 264 +++++++++++++++++
 python-ecosys/aiohttp/aiohttp/aiohttp_ws.py   | 269 ++++++++++++++++++
 python-ecosys/aiohttp/examples/client.py      |  18 ++
 python-ecosys/aiohttp/examples/compression.py |  20 ++
 python-ecosys/aiohttp/examples/get.py         |  29 ++
 python-ecosys/aiohttp/examples/headers.py     |  18 ++
 python-ecosys/aiohttp/examples/methods.py     |  25 ++
 python-ecosys/aiohttp/examples/params.py      |  20 ++
 python-ecosys/aiohttp/examples/ws.py          |  44 +++
 .../aiohttp/examples/ws_repl_echo.py          |  53 ++++
 python-ecosys/aiohttp/manifest.py             |   7 +
 12 files changed, 799 insertions(+)
 create mode 100644 python-ecosys/aiohttp/README.md
 create mode 100644 python-ecosys/aiohttp/aiohttp/__init__.py
 create mode 100644 python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
 create mode 100644 python-ecosys/aiohttp/examples/client.py
 create mode 100644 python-ecosys/aiohttp/examples/compression.py
 create mode 100644 python-ecosys/aiohttp/examples/get.py
 create mode 100644 python-ecosys/aiohttp/examples/headers.py
 create mode 100644 python-ecosys/aiohttp/examples/methods.py
 create mode 100644 python-ecosys/aiohttp/examples/params.py
 create mode 100644 python-ecosys/aiohttp/examples/ws.py
 create mode 100644 python-ecosys/aiohttp/examples/ws_repl_echo.py
 create mode 100644 python-ecosys/aiohttp/manifest.py

diff --git a/python-ecosys/aiohttp/README.md b/python-ecosys/aiohttp/README.md
new file mode 100644
index 000000000..5ce5e14bc
--- /dev/null
+++ b/python-ecosys/aiohttp/README.md
@@ -0,0 +1,32 @@
+aiohttp is an HTTP client module for MicroPython asyncio module,
+with API mostly compatible with CPython [aiohttp](https://github.com/aio-libs/aiohttp)
+module.
+
+> [!NOTE]
+> Only client is implemented.
+
+See `examples/client.py`
+```py
+import aiohttp
+import asyncio
+
+async def main():
+
+    async with aiohttp.ClientSession() as session:
+        async with session.get('http://micropython.org') as response:
+
+            print("Status:", response.status)
+            print("Content-Type:", response.headers['Content-Type'])
+
+            html = await response.text()
+            print("Body:", html[:15], "...")
+
+asyncio.run(main())
+```
+```
+$ micropython examples/client.py
+Status: 200
+Content-Type: text/html; charset=utf-8
+Body: <!DOCTYPE html> ...
+
+```
diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
new file mode 100644
index 000000000..d31788435
--- /dev/null
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -0,0 +1,264 @@
+# MicroPython aiohttp library
+# MIT license; Copyright (c) 2023 Carlos Gil
+
+import asyncio
+import json as _json
+from .aiohttp_ws import (
+    _WSRequestContextManager,
+    ClientWebSocketResponse,
+    WebSocketClient,
+    WSMsgType,
+)
+
+HttpVersion10 = "HTTP/1.0"
+HttpVersion11 = "HTTP/1.1"
+
+
+class ClientResponse:
+    def __init__(self, reader):
+        self.content = reader
+
+    def _decode(self, data):
+        c_encoding = self.headers.get("Content-Encoding")
+        if c_encoding in ("gzip", "deflate", "gzip,deflate"):
+            try:
+                import deflate, io
+
+                if c_encoding == "deflate":
+                    with deflate.DeflateIO(io.BytesIO(data), deflate.ZLIB) as d:
+                        return d.read()
+                elif c_encoding == "gzip":
+                    with deflate.DeflateIO(io.BytesIO(data), deflate.GZIP, 15) as d:
+                        return d.read()
+            except ImportError:
+                print("WARNING: deflate module required")
+        return data
+
+    async def read(self, sz=-1):
+        return self._decode(await self.content.read(sz))
+
+    async def text(self, encoding="utf-8"):
+        return (await self.read(sz=-1)).decode(encoding)
+
+    async def json(self):
+        return _json.loads(await self.read())
+
+    def __repr__(self):
+        return "<ClientResponse %d %s>" % (self.status, self.headers)
+
+
+class ChunkedClientResponse(ClientResponse):
+    def __init__(self, reader):
+        self.content = reader
+        self.chunk_size = 0
+
+    async def read(self, sz=4 * 1024 * 1024):
+        if self.chunk_size == 0:
+            l = await self.content.readline()
+            l = l.split(b";", 1)[0]
+            self.chunk_size = int(l, 16)
+            if self.chunk_size == 0:
+                # End of message
+                sep = await self.content.read(2)
+                assert sep == b"\r\n"
+                return b""
+        data = await self.content.read(min(sz, self.chunk_size))
+        self.chunk_size -= len(data)
+        if self.chunk_size == 0:
+            sep = await self.content.read(2)
+            assert sep == b"\r\n"
+        return self._decode(data)
+
+    def __repr__(self):
+        return "<ChunkedClientResponse %d %s>" % (self.status, self.headers)
+
+
+class _RequestContextManager:
+    def __init__(self, client, request_co):
+        self.reqco = request_co
+        self.client = client
+
+    async def __aenter__(self):
+        return await self.reqco
+
+    async def __aexit__(self, *args):
+        await self.client._reader.aclose()
+        return await asyncio.sleep(0)
+
+
+class ClientSession:
+    def __init__(self, base_url="", headers={}, version=HttpVersion10):
+        self._reader = None
+        self._base_url = base_url
+        self._base_headers = {"Connection": "close", "User-Agent": "compat"}
+        self._base_headers.update(**headers)
+        self._http_version = version
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, *args):
+        return await asyncio.sleep(0)
+
+    # TODO: Implement timeouts
+
+    async def _request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}):
+        redir_cnt = 0
+        redir_url = None
+        while redir_cnt < 2:
+            reader = await self.request_raw(method, url, data, json, ssl, params, headers)
+            _headers = []
+            sline = await reader.readline()
+            sline = sline.split(None, 2)
+            status = int(sline[1])
+            chunked = False
+            while True:
+                line = await reader.readline()
+                if not line or line == b"\r\n":
+                    break
+                _headers.append(line)
+                if line.startswith(b"Transfer-Encoding:"):
+                    if b"chunked" in line:
+                        chunked = True
+                elif line.startswith(b"Location:"):
+                    url = line.rstrip().split(None, 1)[1].decode("latin-1")
+
+            if 301 <= status <= 303:
+                redir_cnt += 1
+                await reader.aclose()
+                continue
+            break
+
+        if chunked:
+            resp = ChunkedClientResponse(reader)
+        else:
+            resp = ClientResponse(reader)
+        resp.status = status
+        resp.headers = _headers
+        resp.url = url
+        if params:
+            resp.url += "?" + "&".join(f"{k}={params[k]}" for k in sorted(params))
+        try:
+            resp.headers = {
+                val.split(":", 1)[0]: val.split(":", 1)[-1].strip()
+                for val in [hed.decode().strip() for hed in _headers]
+            }
+        except Exception:
+            pass
+        self._reader = reader
+        return resp
+
+    async def request_raw(
+        self,
+        method,
+        url,
+        data=None,
+        json=None,
+        ssl=None,
+        params=None,
+        headers={},
+        is_handshake=False,
+        version=None,
+    ):
+        if json and isinstance(json, dict):
+            data = _json.dumps(json)
+        if data is not None and method == "GET":
+            method = "POST"
+        if params:
+            url += "?" + "&".join(f"{k}={params[k]}" for k in sorted(params))
+        try:
+            proto, dummy, host, path = url.split("/", 3)
+        except ValueError:
+            proto, dummy, host = url.split("/", 2)
+            path = ""
+
+        if proto == "http:":
+            port = 80
+        elif proto == "https:":
+            port = 443
+            if ssl is None:
+                ssl = True
+        else:
+            raise ValueError("Unsupported protocol: " + proto)
+
+        if ":" in host:
+            host, port = host.split(":", 1)
+            port = int(port)
+
+        reader, writer = await asyncio.open_connection(host, port, ssl=ssl)
+
+        # Use protocol 1.0, because 1.1 always allows to use chunked transfer-encoding
+        # But explicitly set Connection: close, even though this should be default for 1.0,
+        # because some servers misbehave w/o it.
+        if version is None:
+            version = self._http_version
+        if "Host" not in headers:
+            headers.update(Host=host)
+        if not data:
+            query = "%s /%s %s\r\n%s\r\n" % (
+                method,
+                path,
+                version,
+                "\r\n".join(f"{k}: {v}" for k, v in headers.items()) + "\r\n" if headers else "",
+            )
+        else:
+            headers.update(**{"Content-Length": len(str(data))})
+            if json:
+                headers.update(**{"Content-Type": "application/json"})
+            query = """%s /%s %s\r\n%s\r\n%s\r\n\r\n""" % (
+                method,
+                path,
+                version,
+                "\r\n".join(f"{k}: {v}" for k, v in headers.items()) + "\r\n",
+                data,
+            )
+        if not is_handshake:
+            await writer.awrite(query.encode("latin-1"))
+            return reader
+        else:
+            await writer.awrite(query.encode())
+            return reader, writer
+
+    def request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}):
+        return _RequestContextManager(
+            self,
+            self._request(
+                method,
+                self._base_url + url,
+                data=data,
+                json=json,
+                ssl=ssl,
+                params=params,
+                headers=dict(**self._base_headers, **headers),
+            ),
+        )
+
+    def get(self, url, **kwargs):
+        return self.request("GET", url, **kwargs)
+
+    def post(self, url, **kwargs):
+        return self.request("POST", url, **kwargs)
+
+    def put(self, url, **kwargs):
+        return self.request("PUT", url, **kwargs)
+
+    def patch(self, url, **kwargs):
+        return self.request("PATCH", url, **kwargs)
+
+    def delete(self, url, **kwargs):
+        return self.request("DELETE", url, **kwargs)
+
+    def head(self, url, **kwargs):
+        return self.request("HEAD", url, **kwargs)
+
+    def options(self, url, **kwargs):
+        return self.request("OPTIONS", url, **kwargs)
+
+    def ws_connect(self, url, ssl=None):
+        return _WSRequestContextManager(self, self._ws_connect(url, ssl=ssl))
+
+    async def _ws_connect(self, url, ssl=None):
+        ws_client = WebSocketClient(None)
+        await ws_client.connect(url, ssl=ssl, handshake_request=self.request_raw)
+        self._reader = ws_client.reader
+        return ClientWebSocketResponse(ws_client)
diff --git a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
new file mode 100644
index 000000000..e5575a11c
--- /dev/null
+++ b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
@@ -0,0 +1,269 @@
+# MicroPython aiohttp library
+# MIT license; Copyright (c) 2023 Carlos Gil
+# adapted from https://github.com/danni/uwebsockets
+# and https://github.com/miguelgrinberg/microdot/blob/main/src/microdot_asyncio_websocket.py
+
+import asyncio
+import random
+import json as _json
+import binascii
+import re
+import struct
+from collections import namedtuple
+
+URL_RE = re.compile(r"(wss|ws)://([A-Za-z0-9-\.]+)(?:\:([0-9]+))?(/.+)?")
+URI = namedtuple("URI", ("protocol", "hostname", "port", "path"))  # noqa: PYI024
+
+
+def urlparse(uri):
+    """Parse ws:// URLs"""
+    match = URL_RE.match(uri)
+    if match:
+        protocol = match.group(1)
+        host = match.group(2)
+        port = match.group(3)
+        path = match.group(4)
+
+        if protocol == "wss":
+            if port is None:
+                port = 443
+        elif protocol == "ws":
+            if port is None:
+                port = 80
+        else:
+            raise ValueError("Scheme {} is invalid".format(protocol))
+
+        return URI(protocol, host, int(port), path)
+
+
+class WebSocketMessage:
+    def __init__(self, opcode, data):
+        self.type = opcode
+        self.data = data
+
+
+class WSMsgType:
+    TEXT = 1
+    BINARY = 2
+    ERROR = 258
+
+
+class WebSocketClient:
+    CONT = 0
+    TEXT = 1
+    BINARY = 2
+    CLOSE = 8
+    PING = 9
+    PONG = 10
+
+    def __init__(self, params):
+        self.params = params
+        self.closed = False
+        self.reader = None
+        self.writer = None
+
+    async def connect(self, uri, ssl=None, handshake_request=None):
+        uri = urlparse(uri)
+        assert uri
+        if uri.protocol == "wss":
+            if not ssl:
+                ssl = True
+        await self.handshake(uri, ssl, handshake_request)
+
+    @classmethod
+    def _parse_frame_header(cls, header):
+        byte1, byte2 = struct.unpack("!BB", header)
+
+        # Byte 1: FIN(1) _(1) _(1) _(1) OPCODE(4)
+        fin = bool(byte1 & 0x80)
+        opcode = byte1 & 0x0F
+
+        # Byte 2: MASK(1) LENGTH(7)
+        mask = bool(byte2 & (1 << 7))
+        length = byte2 & 0x7F
+
+        return fin, opcode, mask, length
+
+    def _process_websocket_frame(self, opcode, payload):
+        if opcode == self.TEXT:
+            payload = payload.decode()
+        elif opcode == self.BINARY:
+            pass
+        elif opcode == self.CLOSE:
+            # raise OSError(32, "Websocket connection closed")
+            return opcode, payload
+        elif opcode == self.PING:
+            return self.PONG, payload
+        elif opcode == self.PONG:  # pragma: no branch
+            return None, None
+        return None, payload
+
+    @classmethod
+    def _encode_websocket_frame(cls, opcode, payload):
+        if opcode == cls.TEXT:
+            payload = payload.encode()
+
+        length = len(payload)
+        fin = mask = True
+
+        # Frame header
+        # Byte 1: FIN(1) _(1) _(1) _(1) OPCODE(4)
+        byte1 = 0x80 if fin else 0
+        byte1 |= opcode
+
+        # Byte 2: MASK(1) LENGTH(7)
+        byte2 = 0x80 if mask else 0
+
+        if length < 126:  # 126 is magic value to use 2-byte length header
+            byte2 |= length
+            frame = struct.pack("!BB", byte1, byte2)
+
+        elif length < (1 << 16):  # Length fits in 2-bytes
+            byte2 |= 126  # Magic code
+            frame = struct.pack("!BBH", byte1, byte2, length)
+
+        elif length < (1 << 64):
+            byte2 |= 127  # Magic code
+            frame = struct.pack("!BBQ", byte1, byte2, length)
+
+        else:
+            raise ValueError
+
+        # Mask is 4 bytes
+        mask_bits = struct.pack("!I", random.getrandbits(32))
+        frame += mask_bits
+        payload = bytes(b ^ mask_bits[i % 4] for i, b in enumerate(payload))
+        return frame + payload
+
+    async def handshake(self, uri, ssl, req):
+        headers = {}
+        _http_proto = "http" if uri.protocol != "wss" else "https"
+        url = f"{_http_proto}://{uri.hostname}:{uri.port}{uri.path or '/'}"
+        key = binascii.b2a_base64(bytes(random.getrandbits(8) for _ in range(16)))[:-1]
+        headers["Host"] = f"{uri.hostname}:{uri.port}"
+        headers["Connection"] = "Upgrade"
+        headers["Upgrade"] = "websocket"
+        headers["Sec-WebSocket-Key"] = key
+        headers["Sec-WebSocket-Version"] = "13"
+        headers["Origin"] = f"{_http_proto}://{uri.hostname}:{uri.port}"
+
+        self.reader, self.writer = await req(
+            "GET",
+            url,
+            ssl=ssl,
+            headers=headers,
+            is_handshake=True,
+            version="HTTP/1.1",
+        )
+
+        header = await self.reader.readline()
+        header = header[:-2]
+        assert header.startswith(b"HTTP/1.1 101 "), header
+
+        while header:
+            header = await self.reader.readline()
+            header = header[:-2]
+
+    async def receive(self):
+        while True:
+            opcode, payload = await self._read_frame()
+            send_opcode, data = self._process_websocket_frame(opcode, payload)
+            if send_opcode:  # pragma: no cover
+                await self.send(data, send_opcode)
+            if opcode == self.CLOSE:
+                self.closed = True
+                return opcode, data
+            elif data:  # pragma: no branch
+                return opcode, data
+
+    async def send(self, data, opcode=None):
+        frame = self._encode_websocket_frame(
+            opcode or (self.TEXT if isinstance(data, str) else self.BINARY), data
+        )
+        self.writer.write(frame)
+        await self.writer.drain()
+
+    async def close(self):
+        if not self.closed:  # pragma: no cover
+            self.closed = True
+            await self.send(b"", self.CLOSE)
+
+    async def _read_frame(self):
+        header = await self.reader.read(2)
+        if len(header) != 2:  # pragma: no cover
+            # raise OSError(32, "Websocket connection closed")
+            opcode = self.CLOSE
+            payload = b""
+            return opcode, payload
+        fin, opcode, has_mask, length = self._parse_frame_header(header)
+        if length == 126:  # Magic number, length header is 2 bytes
+            (length,) = struct.unpack("!H", await self.reader.read(2))
+        elif length == 127:  # Magic number, length header is 8 bytes
+            (length,) = struct.unpack("!Q", await self.reader.read(8))
+
+        if has_mask:  # pragma: no cover
+            mask = await self.reader.read(4)
+        payload = await self.reader.read(length)
+        if has_mask:  # pragma: no cover
+            payload = bytes(x ^ mask[i % 4] for i, x in enumerate(payload))
+        return opcode, payload
+
+
+class ClientWebSocketResponse:
+    def __init__(self, wsclient):
+        self.ws = wsclient
+
+    def __aiter__(self):
+        return self
+
+    async def __anext__(self):
+        msg = WebSocketMessage(*await self.ws.receive())
+        # print(msg.data, msg.type) # DEBUG
+        if (not msg.data and msg.type == self.ws.CLOSE) or self.ws.closed:
+            raise StopAsyncIteration
+        return msg
+
+    async def close(self):
+        await self.ws.close()
+
+    async def send_str(self, data):
+        if not isinstance(data, str):
+            raise TypeError("data argument must be str (%r)" % type(data))
+        await self.ws.send(data)
+
+    async def send_bytes(self, data):
+        if not isinstance(data, (bytes, bytearray, memoryview)):
+            raise TypeError("data argument must be byte-ish (%r)" % type(data))
+        await self.ws.send(data)
+
+    async def send_json(self, data):
+        await self.send_str(_json.dumps(data))
+
+    async def receive_str(self):
+        msg = WebSocketMessage(*await self.ws.receive())
+        if msg.type != self.ws.TEXT:
+            raise TypeError(f"Received message {msg.type}:{msg.data!r} is not str")
+        return msg.data
+
+    async def receive_bytes(self):
+        msg = WebSocketMessage(*await self.ws.receive())
+        if msg.type != self.ws.BINARY:
+            raise TypeError(f"Received message {msg.type}:{msg.data!r} is not bytes")
+        return msg.data
+
+    async def receive_json(self):
+        data = await self.receive_str()
+        return _json.loads(data)
+
+
+class _WSRequestContextManager:
+    def __init__(self, client, request_co):
+        self.reqco = request_co
+        self.client = client
+
+    async def __aenter__(self):
+        return await self.reqco
+
+    async def __aexit__(self, *args):
+        await self.client._reader.aclose()
+        return await asyncio.sleep(0)
diff --git a/python-ecosys/aiohttp/examples/client.py b/python-ecosys/aiohttp/examples/client.py
new file mode 100644
index 000000000..471737b26
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/client.py
@@ -0,0 +1,18 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+
+async def main():
+    async with aiohttp.ClientSession() as session:
+        async with session.get("http://micropython.org") as response:
+            print("Status:", response.status)
+            print("Content-Type:", response.headers["Content-Type"])
+
+            html = await response.text()
+            print("Body:", html[:15], "...")
+
+
+asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/compression.py b/python-ecosys/aiohttp/examples/compression.py
new file mode 100644
index 000000000..21f9cf7fd
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/compression.py
@@ -0,0 +1,20 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+headers = {"Accept-Encoding": "gzip,deflate"}
+
+
+async def main():
+    async with aiohttp.ClientSession(headers=headers, version=aiohttp.HttpVersion11) as session:
+        async with session.get("http://micropython.org") as response:
+            print("Status:", response.status)
+            print("Content-Type:", response.headers["Content-Type"])
+            print(response.headers)
+            html = await response.text()
+            print(html)
+
+
+asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/get.py b/python-ecosys/aiohttp/examples/get.py
new file mode 100644
index 000000000..43507a6e7
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/get.py
@@ -0,0 +1,29 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+
+URL = sys.argv.pop()
+
+if not URL.startswith("http"):
+    URL = "http://micropython.org"
+
+print(URL)
+
+
+async def fetch(client):
+    async with client.get(URL) as resp:
+        assert resp.status == 200
+        return await resp.text()
+
+
+async def main():
+    async with aiohttp.ClientSession() as client:
+        html = await fetch(client)
+        print(html)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/headers.py b/python-ecosys/aiohttp/examples/headers.py
new file mode 100644
index 000000000..c3a92fc49
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/headers.py
@@ -0,0 +1,18 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+
+headers = {"Authorization": "Basic bG9naW46cGFzcw=="}
+
+
+async def main():
+    async with aiohttp.ClientSession(headers=headers) as session:
+        async with session.get("http://httpbin.org/headers") as r:
+            json_body = await r.json()
+            print(json_body)
+
+
+asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/methods.py b/python-ecosys/aiohttp/examples/methods.py
new file mode 100644
index 000000000..118777c4e
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/methods.py
@@ -0,0 +1,25 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+
+async def main():
+    async with aiohttp.ClientSession("http://httpbin.org") as session:
+        async with session.get("/get") as resp:
+            assert resp.status == 200
+            rget = await resp.text()
+            print(f"GET: {rget}")
+        async with session.post("/post", json={"foo": "bar"}) as resp:
+            assert resp.status == 200
+            rpost = await resp.text()
+            print(f"POST: {rpost}")
+        async with session.put("/put", data=b"data") as resp:
+            assert resp.status == 200
+            rput = await resp.json()
+            print("PUT: ", rput)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/params.py b/python-ecosys/aiohttp/examples/params.py
new file mode 100644
index 000000000..8c47e2097
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/params.py
@@ -0,0 +1,20 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+
+params = {"key1": "value1", "key2": "value2"}
+
+
+async def main():
+    async with aiohttp.ClientSession() as session:
+        async with session.get("http://httpbin.org/get", params=params) as response:
+            expect = "http://httpbin.org/get?key1=value1&key2=value2"
+            assert str(response.url) == expect, f"{response.url} != {expect}"
+            html = await response.text()
+            print(html)
+
+
+asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/ws.py b/python-ecosys/aiohttp/examples/ws.py
new file mode 100644
index 000000000..e989a39c5
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/ws.py
@@ -0,0 +1,44 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+try:
+    URL = sys.argv[1]  # expects a websocket echo server
+except Exception:
+    URL = "ws://echo.websocket.events"
+
+
+sslctx = False
+
+if URL.startswith("wss:"):
+    try:
+        import ssl
+
+        sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        sslctx.verify_mode = ssl.CERT_NONE
+    except Exception:
+        pass
+
+
+async def ws_test_echo(session):
+    async with session.ws_connect(URL, ssl=sslctx) as ws:
+        await ws.send_str("hello world!\r\n")
+        async for msg in ws:
+            if msg.type == aiohttp.WSMsgType.TEXT:
+                print(msg.data)
+
+            if "close" in msg.data:
+                break
+            await ws.send_str("close\r\n")
+        await ws.close()
+
+
+async def main():
+    async with aiohttp.ClientSession() as session:
+        await ws_test_echo(session)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/python-ecosys/aiohttp/examples/ws_repl_echo.py b/python-ecosys/aiohttp/examples/ws_repl_echo.py
new file mode 100644
index 000000000..9393620e3
--- /dev/null
+++ b/python-ecosys/aiohttp/examples/ws_repl_echo.py
@@ -0,0 +1,53 @@
+import sys
+
+sys.path.insert(0, ".")
+import aiohttp
+import asyncio
+
+try:
+    URL = sys.argv[1]  # expects a websocket echo server
+    READ_BANNER = False
+except Exception:
+    URL = "ws://echo.websocket.events"
+    READ_BANNER = True
+
+
+sslctx = False
+
+if URL.startswith("wss:"):
+    try:
+        import ssl
+
+        sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        sslctx.verify_mode = ssl.CERT_NONE
+    except Exception:
+        pass
+
+
+async def ws_test_echo(session):
+    async with session.ws_connect(URL, ssl=sslctx) as ws:
+        if READ_BANNER:
+            print(await ws.receive_str())
+        try:
+            while True:
+                await ws.send_str(f"{input('>>> ')}\r\n")
+
+                async for msg in ws:
+                    if msg.type == aiohttp.WSMsgType.TEXT:
+                        print(msg.data, end="")
+                        break
+
+        except KeyboardInterrupt:
+            pass
+
+        finally:
+            await ws.close()
+
+
+async def main():
+    async with aiohttp.ClientSession() as session:
+        await ws_test_echo(session)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/python-ecosys/aiohttp/manifest.py b/python-ecosys/aiohttp/manifest.py
new file mode 100644
index 000000000..d68039c95
--- /dev/null
+++ b/python-ecosys/aiohttp/manifest.py
@@ -0,0 +1,7 @@
+metadata(
+    description="HTTP client module for MicroPython asyncio module",
+    version="0.0.1",
+    pypi="aiohttp",
+)
+
+package("aiohttp")

From 803452a1acd2a567ae1c2063e82b7128b5a702b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 1 Feb 2024 12:36:19 +0000
Subject: [PATCH 232/343] umqtt.simple: Simplify check for user being unused.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There don't seem to be any MQTT implementations that expect an empty
username (instead of the field missing), so the check for unused `user` can
be simplified.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 micropython/umqtt.simple/umqtt/simple.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index 2b269473b..c59c6d9de 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -75,7 +75,7 @@ def connect(self, clean_session=True):
 
         sz = 10 + 2 + len(self.client_id)
         msg[6] = clean_session << 1
-        if self.user is not None:
+        if self.user:
             sz += 2 + len(self.user) + 2 + len(self.pswd)
             msg[6] |= 0xC0
         if self.keepalive:
@@ -101,7 +101,7 @@ def connect(self, clean_session=True):
         if self.lw_topic:
             self._send_str(self.lw_topic)
             self._send_str(self.lw_msg)
-        if self.user is not None:
+        if self.user:
             self._send_str(self.user)
             self._send_str(self.pswd)
         resp = self.sock.read(4)

From 35d41dbb0e4acf1518f520220d405ebe2db257d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 1 Feb 2024 12:36:19 +0000
Subject: [PATCH 233/343] ssl: Restructure micropython SSL interface to a new
 tls module.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MicroPython now supplies SSL/TLS functionality in a new built-in `tls`
module.  The `ssl` module is now implemented purely in Python, in this
repository.  Other libraries are updated to work with this scheme.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 .../bundles/bundle-networking/manifest.py     |  3 +-
 micropython/umqtt.simple/manifest.py          |  2 +-
 micropython/umqtt.simple/umqtt/simple.py      |  8 +-
 micropython/urllib.urequest/manifest.py       |  2 +-
 .../urllib.urequest/urllib/urequest.py        |  6 +-
 python-ecosys/requests/manifest.py            |  2 +-
 python-ecosys/requests/requests/__init__.py   |  6 +-
 python-stdlib/ssl/manifest.py                 |  4 +-
 python-stdlib/ssl/ssl.py                      | 92 +++++++++++++------
 9 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/micropython/bundles/bundle-networking/manifest.py b/micropython/bundles/bundle-networking/manifest.py
index 79d5e9d9d..7ad3540da 100644
--- a/micropython/bundles/bundle-networking/manifest.py
+++ b/micropython/bundles/bundle-networking/manifest.py
@@ -1,10 +1,11 @@
 metadata(
-    version="0.1.0",
+    version="0.2.0",
     description="Common networking packages for all network-capable deployments of MicroPython.",
 )
 
 require("mip")
 require("ntptime")
+require("ssl")
 require("requests")
 require("webrepl")
 
diff --git a/micropython/umqtt.simple/manifest.py b/micropython/umqtt.simple/manifest.py
index 19617a5ee..b418995c5 100644
--- a/micropython/umqtt.simple/manifest.py
+++ b/micropython/umqtt.simple/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Lightweight MQTT client for MicroPython.", version="1.3.4")
+metadata(description="Lightweight MQTT client for MicroPython.", version="1.4.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index c59c6d9de..e84e585c4 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -16,8 +16,7 @@ def __init__(
         user=None,
         password=None,
         keepalive=0,
-        ssl=False,
-        ssl_params={},
+        ssl=None,
     ):
         if port == 0:
             port = 8883 if ssl else 1883
@@ -26,7 +25,6 @@ def __init__(
         self.server = server
         self.port = port
         self.ssl = ssl
-        self.ssl_params = ssl_params
         self.pid = 0
         self.cb = None
         self.user = user
@@ -67,9 +65,7 @@ def connect(self, clean_session=True):
         addr = socket.getaddrinfo(self.server, self.port)[0][-1]
         self.sock.connect(addr)
         if self.ssl:
-            import ussl
-
-            self.sock = ussl.wrap_socket(self.sock, **self.ssl_params)
+            self.sock = self.ssl.wrap_socket(self.sock, server_hostname=self.server)
         premsg = bytearray(b"\x10\0\0\0\0\0")
         msg = bytearray(b"\x04MQTT\x04\x02\0\0")
 
diff --git a/micropython/urllib.urequest/manifest.py b/micropython/urllib.urequest/manifest.py
index e3e8f13f4..2790208a7 100644
--- a/micropython/urllib.urequest/manifest.py
+++ b/micropython/urllib.urequest/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.6.0")
+metadata(version="0.7.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/urllib.urequest/urllib/urequest.py b/micropython/urllib.urequest/urllib/urequest.py
index 4c654d45e..2eff43c36 100644
--- a/micropython/urllib.urequest/urllib/urequest.py
+++ b/micropython/urllib.urequest/urllib/urequest.py
@@ -12,7 +12,7 @@ def urlopen(url, data=None, method="GET"):
     if proto == "http:":
         port = 80
     elif proto == "https:":
-        import ussl
+        import tls
 
         port = 443
     else:
@@ -29,7 +29,9 @@ def urlopen(url, data=None, method="GET"):
     try:
         s.connect(ai[-1])
         if proto == "https:":
-            s = ussl.wrap_socket(s, server_hostname=host)
+            context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+            context.verify_mode = tls.CERT_NONE
+            s = context.wrap_socket(s, server_hostname=host)
 
         s.write(method)
         s.write(b" /")
diff --git a/python-ecosys/requests/manifest.py b/python-ecosys/requests/manifest.py
index 1c46a7384..97df1560e 100644
--- a/python-ecosys/requests/manifest.py
+++ b/python-ecosys/requests/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.8.1", pypi="requests")
+metadata(version="0.9.0", pypi="requests")
 
 package("requests")
diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index fd751e623..740102916 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -63,7 +63,7 @@ def request(
     if proto == "http:":
         port = 80
     elif proto == "https:":
-        import ussl
+        import tls
 
         port = 443
     else:
@@ -90,7 +90,9 @@ def request(
     try:
         s.connect(ai[-1])
         if proto == "https:":
-            s = ussl.wrap_socket(s, server_hostname=host)
+            context = tls.SSLContext(tls.PROTOCOL_TLS_CLIENT)
+            context.verify_mode = tls.CERT_NONE
+            s = context.wrap_socket(s, server_hostname=host)
         s.write(b"%s /%s HTTP/1.0\r\n" % (method, path))
         if "Host" not in headers:
             s.write(b"Host: %s\r\n" % host)
diff --git a/python-stdlib/ssl/manifest.py b/python-stdlib/ssl/manifest.py
index 1dae2f6e7..5dd041794 100644
--- a/python-stdlib/ssl/manifest.py
+++ b/python-stdlib/ssl/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.2.0")
 
-module("ssl.py")
+module("ssl.py", opt=3)
diff --git a/python-stdlib/ssl/ssl.py b/python-stdlib/ssl/ssl.py
index 9262f5fb5..19847d6d3 100644
--- a/python-stdlib/ssl/ssl.py
+++ b/python-stdlib/ssl/ssl.py
@@ -1,36 +1,72 @@
-from ussl import *
-import ussl as _ussl
+import tls
+from tls import (
+    CERT_NONE,
+    CERT_OPTIONAL,
+    CERT_REQUIRED,
+    MBEDTLS_VERSION,
+    PROTOCOL_TLS_CLIENT,
+    PROTOCOL_TLS_SERVER,
+)
 
-# Constants
-for sym in "CERT_NONE", "CERT_OPTIONAL", "CERT_REQUIRED":
-    if sym not in globals():
-        globals()[sym] = object()
+
+class SSLContext:
+    def __init__(self, *args):
+        self._context = tls.SSLContext(*args)
+        self._context.verify_mode = CERT_NONE
+
+    @property
+    def verify_mode(self):
+        return self._context.verify_mode
+
+    @verify_mode.setter
+    def verify_mode(self, val):
+        self._context.verify_mode = val
+
+    def load_cert_chain(self, certfile, keyfile):
+        if isinstance(certfile, str):
+            with open(certfile, "rb") as f:
+                certfile = f.read()
+        if isinstance(keyfile, str):
+            with open(keyfile, "rb") as f:
+                keyfile = f.read()
+        self._context.load_cert_chain(certfile, keyfile)
+
+    def load_verify_locations(self, cafile=None, cadata=None):
+        if cafile:
+            with open(cafile, "rb") as f:
+                cadata = f.read()
+        self._context.load_verify_locations(cadata)
+
+    def wrap_socket(
+        self, sock, server_side=False, do_handshake_on_connect=True, server_hostname=None
+    ):
+        return self._context.wrap_socket(
+            sock,
+            server_side=server_side,
+            do_handshake_on_connect=do_handshake_on_connect,
+            server_hostname=server_hostname,
+        )
 
 
 def wrap_socket(
     sock,
-    keyfile=None,
-    certfile=None,
     server_side=False,
+    key=None,
+    cert=None,
     cert_reqs=CERT_NONE,
-    *,
-    ca_certs=None,
-    server_hostname=None
+    cadata=None,
+    server_hostname=None,
+    do_handshake=True,
 ):
-    # TODO: More arguments accepted by CPython could also be handled here.
-    # That would allow us to accept ca_certs as a positional argument, which
-    # we should.
-    kw = {}
-    if keyfile is not None:
-        kw["keyfile"] = keyfile
-    if certfile is not None:
-        kw["certfile"] = certfile
-    if server_side is not False:
-        kw["server_side"] = server_side
-    if cert_reqs is not CERT_NONE:
-        kw["cert_reqs"] = cert_reqs
-    if ca_certs is not None:
-        kw["ca_certs"] = ca_certs
-    if server_hostname is not None:
-        kw["server_hostname"] = server_hostname
-    return _ussl.wrap_socket(sock, **kw)
+    con = SSLContext(PROTOCOL_TLS_SERVER if server_side else PROTOCOL_TLS_CLIENT)
+    if cert or key:
+        con.load_cert_chain(cert, key)
+    if cadata:
+        con.load_verify_locations(cadata=cadata)
+    con.verify_mode = cert_reqs
+    return con.wrap_socket(
+        sock,
+        server_side=server_side,
+        do_handshake_on_connect=do_handshake,
+        server_hostname=server_hostname,
+    )

From ddb1a279578bfff8c1b18aff3baa668620684f64 Mon Sep 17 00:00:00 2001
From: Adam Knowles <1413836+Pharkie@users.noreply.github.com>
Date: Sat, 20 Jan 2024 11:44:02 +0000
Subject: [PATCH 234/343] hmac: Fix passing in a string for digestmod argument.

The built-in `hashlib` module does not have a `.new` method (although the
Python version in this repository does).
---
 python-stdlib/hmac/hmac.py      | 2 +-
 python-stdlib/hmac/manifest.py  | 2 +-
 python-stdlib/hmac/test_hmac.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/hmac/hmac.py b/python-stdlib/hmac/hmac.py
index 28631042f..dbbdd4718 100644
--- a/python-stdlib/hmac/hmac.py
+++ b/python-stdlib/hmac/hmac.py
@@ -17,7 +17,7 @@ def __init__(self, key, msg=None, digestmod=None):
             make_hash = digestmod  # A
         elif isinstance(digestmod, str):
             # A hash name suitable for hashlib.new().
-            make_hash = lambda d=b"": hashlib.new(digestmod, d)  # B
+            make_hash = lambda d=b"": getattr(hashlib, digestmod)(d)
         else:
             # A module supporting PEP 247.
             make_hash = digestmod.new  # C
diff --git a/python-stdlib/hmac/manifest.py b/python-stdlib/hmac/manifest.py
index 28d78988d..ff0a62f08 100644
--- a/python-stdlib/hmac/manifest.py
+++ b/python-stdlib/hmac/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="3.4.3")
+metadata(version="3.4.4")
 
 module("hmac.py")
diff --git a/python-stdlib/hmac/test_hmac.py b/python-stdlib/hmac/test_hmac.py
index d155dd6a2..1cfcf4e37 100644
--- a/python-stdlib/hmac/test_hmac.py
+++ b/python-stdlib/hmac/test_hmac.py
@@ -8,7 +8,7 @@
 
 msg = b"zlutoucky kun upel dabelske ody"
 
-dig = hmac.new(b"1234567890", msg=msg, digestmod=hashlib.sha256).hexdigest()
+dig = hmac.new(b"1234567890", msg=msg, digestmod="sha256").hexdigest()
 
 print("c735e751e36b08fb01e25794bdb15e7289b82aecdb652c8f4f72f307b39dad39")
 print(dig)

From 56f514f56954aa1830632ece6fa01b0831602280 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Wed, 3 Jan 2024 01:53:36 +0000
Subject: [PATCH 235/343] aiohttp: Fix binary data treatment.

- Fix binary data `Content-type` header and data `Content-Length`
  calculation.

- Fix query length when data is included.

- Fix `json` and `text` methods of `ClientResponse` to read
  `Content-Length` size

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 python-ecosys/aiohttp/aiohttp/__init__.py | 21 +++++++++++++--------
 python-ecosys/aiohttp/manifest.py         |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
index d31788435..23d227a6f 100644
--- a/python-ecosys/aiohttp/aiohttp/__init__.py
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -38,10 +38,10 @@ async def read(self, sz=-1):
         return self._decode(await self.content.read(sz))
 
     async def text(self, encoding="utf-8"):
-        return (await self.read(sz=-1)).decode(encoding)
+        return (await self.read(int(self.headers.get("Content-Length", -1)))).decode(encoding)
 
     async def json(self):
-        return _json.loads(await self.read())
+        return _json.loads(await self.read(int(self.headers.get("Content-Length", -1))))
 
     def __repr__(self):
         return "<ClientResponse %d %s>" % (self.status, self.headers)
@@ -121,7 +121,7 @@ async def _request(self, method, url, data=None, json=None, ssl=None, params=Non
                     if b"chunked" in line:
                         chunked = True
                 elif line.startswith(b"Location:"):
-                    url = line.rstrip().split(None, 1)[1].decode("latin-1")
+                    url = line.rstrip().split(None, 1)[1].decode()
 
             if 301 <= status <= 303:
                 redir_cnt += 1
@@ -195,17 +195,22 @@ async def request_raw(
         if "Host" not in headers:
             headers.update(Host=host)
         if not data:
-            query = "%s /%s %s\r\n%s\r\n" % (
+            query = b"%s /%s %s\r\n%s\r\n" % (
                 method,
                 path,
                 version,
                 "\r\n".join(f"{k}: {v}" for k, v in headers.items()) + "\r\n" if headers else "",
             )
         else:
-            headers.update(**{"Content-Length": len(str(data))})
             if json:
                 headers.update(**{"Content-Type": "application/json"})
-            query = """%s /%s %s\r\n%s\r\n%s\r\n\r\n""" % (
+            if isinstance(data, bytes):
+                headers.update(**{"Content-Type": "application/octet-stream"})
+            else:
+                data = data.encode()
+
+            headers.update(**{"Content-Length": len(data)})
+            query = b"""%s /%s %s\r\n%s\r\n%s""" % (
                 method,
                 path,
                 version,
@@ -213,10 +218,10 @@ async def request_raw(
                 data,
             )
         if not is_handshake:
-            await writer.awrite(query.encode("latin-1"))
+            await writer.awrite(query)
             return reader
         else:
-            await writer.awrite(query.encode())
+            await writer.awrite(query)
             return reader, writer
 
     def request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}):
diff --git a/python-ecosys/aiohttp/manifest.py b/python-ecosys/aiohttp/manifest.py
index d68039c95..9cb2ef50f 100644
--- a/python-ecosys/aiohttp/manifest.py
+++ b/python-ecosys/aiohttp/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="HTTP client module for MicroPython asyncio module",
-    version="0.0.1",
+    version="0.0.2",
     pypi="aiohttp",
 )
 

From 8058b2935bad15f930a45a5f5f640c8da8aaf1f2 Mon Sep 17 00:00:00 2001
From: ubi de feo <me@ubidefeo.com>
Date: Mon, 5 Feb 2024 08:18:19 +0100
Subject: [PATCH 236/343] tarfile-write: Fix permissions when adding to
 archive.

Signed-off-by: ubi de feo <me@ubidefeo.com>
---
 python-stdlib/tarfile-write/manifest.py      | 2 +-
 python-stdlib/tarfile-write/tarfile/write.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/tarfile-write/manifest.py b/python-stdlib/tarfile-write/manifest.py
index 248f7da60..bc4f37741 100644
--- a/python-stdlib/tarfile-write/manifest.py
+++ b/python-stdlib/tarfile-write/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Adds write (create/append) support to tarfile.", version="0.1.1")
+metadata(description="Adds write (create/append) support to tarfile.", version="0.1.2")
 
 require("tarfile")
 package("tarfile")
diff --git a/python-stdlib/tarfile-write/tarfile/write.py b/python-stdlib/tarfile-write/tarfile/write.py
index 062b8ae6b..527b3317b 100644
--- a/python-stdlib/tarfile-write/tarfile/write.py
+++ b/python-stdlib/tarfile-write/tarfile/write.py
@@ -67,7 +67,7 @@ def addfile(self, tarinfo, fileobj=None):
             name += "/"
     hdr = uctypes.struct(uctypes.addressof(buf), _TAR_HEADER, uctypes.LITTLE_ENDIAN)
     hdr.name[:] = name.encode("utf-8")[:100]
-    hdr.mode[:] = b"%07o\0" % (tarinfo.mode & 0o7777)
+    hdr.mode[:] = b"%07o\0" % ((0o755 if tarinfo.isdir() else 0o644) & 0o7777)
     hdr.uid[:] = b"%07o\0" % tarinfo.uid
     hdr.gid[:] = b"%07o\0" % tarinfo.gid
     hdr.size[:] = b"%011o\0" % size
@@ -96,9 +96,10 @@ def addfile(self, tarinfo, fileobj=None):
 def add(self, name, recursive=True):
     from . import TarInfo
 
-    tarinfo = TarInfo(name)
     try:
         stat = os.stat(name)
+        res_name = (name + '/') if (stat[0] & 0xf000) == 0x4000 else name
+        tarinfo = TarInfo(res_name)
         tarinfo.mode = stat[0]
         tarinfo.uid = stat[4]
         tarinfo.gid = stat[5]

From 4cc67065dd4b20aa55bad51903805ef092d6a939 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 17:20:49 +1100
Subject: [PATCH 237/343] tools/ci.sh: Add unix-ffi library when testing
 unix-ffi subdirectory.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 tools/ci.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 730034efb..761491c6e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -30,7 +30,11 @@ function ci_build_packages_check_manifest {
     for file in $(find -name manifest.py); do
         echo "##################################################"
         echo "# Testing $file"
-        python3 /tmp/micropython/tools/manifestfile.py --lib . --compile $file
+        extra_args=
+        if [[ "$file" =~ "/unix-ffi/" ]]; then
+            extra_args="--unix-ffi"
+        fi
+        python3 /tmp/micropython/tools/manifestfile.py $extra_args --lib . --compile $file
     done
 }
 

From b71210351999060126e1126aeecb371676651cdd Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 16:00:05 +1100
Subject: [PATCH 238/343] lora-sx126x: Fix invalid default configuration after
 reset.

According to the docs, only freq_khz was needed for working output.
However:

- Without output_power setting, no output from SX1262 antenna (theory:
  output routed to the SX1261 antenna).

- SF,BW,etc. settings were different from the SX127x power on defaults, so
  modems with an identical configuration were unable to communicate.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 22 ++++++++++++---------
 micropython/lora/lora/lora/modem.py         |  7 ++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index f0cd42793..f1aa5a871 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -163,6 +163,9 @@ def __init__(
         # 0x02 is 40us, default value appears undocumented but this is the SX1276 default
         self._ramp_val = 0x02
 
+        # Configure the SX126x at least once after reset
+        self._configured = False
+
         if reset:
             # If the caller supplies a reset pin argument, reset the radio
             reset.init(Pin.OUT, value=0)
@@ -385,22 +388,22 @@ def configure(self, lora_cfg):
                 syncword = 0x0404 + ((syncword & 0x0F) << 4) + ((syncword & 0xF0) << 8)
             self._cmd(">BBH", _CMD_WRITE_REGISTER, _REG_LSYNCRH, syncword)
 
-        if "output_power" in lora_cfg:
+        if not self._configured or any(
+            key in lora_cfg for key in ("output_power", "pa_ramp_us", "tx_ant")
+        ):
             pa_config_args, self._output_power = self._get_pa_tx_params(
-                lora_cfg["output_power"], lora_cfg.get("tx_ant", None)
+                lora_cfg.get("output_power", self._output_power), lora_cfg.get("tx_ant", None)
             )
             self._cmd("BBBBB", _CMD_SET_PA_CONFIG, *pa_config_args)
 
-        if "pa_ramp_us" in lora_cfg:
-            self._ramp_val = self._get_pa_ramp_val(
-                lora_cfg, [10, 20, 40, 80, 200, 800, 1700, 3400]
-            )
+            if "pa_ramp_us" in lora_cfg:
+                self._ramp_val = self._get_pa_ramp_val(
+                    lora_cfg, [10, 20, 40, 80, 200, 800, 1700, 3400]
+                )
 
-        if "output_power" in lora_cfg or "pa_ramp_us" in lora_cfg:
-            # Only send the SetTxParams command if power level or PA ramp time have changed
             self._cmd("BBB", _CMD_SET_TX_PARAMS, self._output_power, self._ramp_val)
 
-        if any(key in lora_cfg for key in ("sf", "bw", "coding_rate")):
+        if not self._configured or any(key in lora_cfg for key in ("sf", "bw", "coding_rate")):
             if "sf" in lora_cfg:
                 self._sf = lora_cfg["sf"]
                 if self._sf < _CFG_SF_MIN or self._sf > _CFG_SF_MAX:
@@ -441,6 +444,7 @@ def configure(self, lora_cfg):
             self._reg_write(_REG_RX_GAIN, 0x96 if lora_cfg["rx_boost"] else 0x94)
 
         self._check_error()
+        self._configured = True
 
     def _invert_workaround(self, enable):
         # Apply workaround for DS 15.4 Optimizing the Inverted IQ Operation
diff --git a/micropython/lora/lora/lora/modem.py b/micropython/lora/lora/lora/modem.py
index e71d4ec72..499712acf 100644
--- a/micropython/lora/lora/lora/modem.py
+++ b/micropython/lora/lora/lora/modem.py
@@ -37,10 +37,11 @@ def __init__(self, ant_sw):
         self._ant_sw = ant_sw
         self._irq_callback = None
 
-        # Common configuration settings that need to be tracked by all modem drivers
-        # (Note that subclasses may set these to other values in their constructors, to match
-        # the power-on-reset configuration of a particular modem.)
+        # Common configuration settings that need to be tracked by all modem drivers.
         #
+        # Where modem hardware sets different values after reset, the driver should
+        # set them back to these defaults (if not provided by the user), so that
+        # behaviour remains consistent between different modems using the same driver.
         self._rf_freq_hz = 0  # Needs to be set via configure()
         self._sf = 7  # Spreading factor
         self._bw_hz = 125000  # Reset value

From ad6ab5a78c207cb663dfb82255798c4cfad51b5f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 16:01:28 +1100
Subject: [PATCH 239/343] lora-sync: Fix race with fast or failed send().

If send completes before the first call to poll_send(), the driver could
get stuck in _sync_wait(). This had much less impact before rp2 port went
tickless, as _sync_wait(will_irq=True) calls machine.idle() which may not
wake very frequently on a tickless port.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sync/lora/sync_modem.py | 2 +-
 micropython/lora/lora-sync/manifest.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/lora/lora-sync/lora/sync_modem.py b/micropython/lora/lora-sync/lora/sync_modem.py
index 27c2f19d1..585ae2cb4 100644
--- a/micropython/lora/lora-sync/lora/sync_modem.py
+++ b/micropython/lora/lora-sync/lora/sync_modem.py
@@ -42,8 +42,8 @@ def send(self, packet, tx_at_ms=None):
 
         tx = True
         while tx is True:
-            tx = self.poll_send()
             self._sync_wait(will_irq)
+            tx = self.poll_send()
         return tx
 
     def recv(self, timeout_ms=None, rx_length=0xFF, rx_packet=None):
diff --git a/micropython/lora/lora-sync/manifest.py b/micropython/lora/lora-sync/manifest.py
index 57b9d21d8..1936a50e4 100644
--- a/micropython/lora/lora-sync/manifest.py
+++ b/micropython/lora/lora-sync/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("lora")
 package("lora")

From 546284817af7840bf4e78539ca671371f9bbed23 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 16:10:59 +1100
Subject: [PATCH 240/343] lora-sx127x: Implement missing syncword support.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sx127x/lora/sx127x.py | 3 +++
 micropython/lora/lora-sx127x/manifest.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/micropython/lora/lora-sx127x/lora/sx127x.py b/micropython/lora/lora-sx127x/lora/sx127x.py
index 3f94aaf0c..0226c9696 100644
--- a/micropython/lora/lora-sx127x/lora/sx127x.py
+++ b/micropython/lora/lora-sx127x/lora/sx127x.py
@@ -519,6 +519,9 @@ def configure(self, lora_cfg):
 
         self._reg_update(_REG_MODEM_CONFIG3, update_mask, modem_config3)
 
+        if "syncword" in lora_cfg:
+            self._reg_write(_REG_SYNC_WORD, lora_cfg["syncword"])
+
     def _reg_write(self, reg, value):
         self._cs(0)
         if isinstance(value, int):
diff --git a/micropython/lora/lora-sx127x/manifest.py b/micropython/lora/lora-sx127x/manifest.py
index 57b9d21d8..1936a50e4 100644
--- a/micropython/lora/lora-sx127x/manifest.py
+++ b/micropython/lora/lora-sx127x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("lora")
 package("lora")

From 35bb7952ba480de44a88031bba2311171bea9837 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 16:11:18 +1100
Subject: [PATCH 241/343] lora-sx126x: Fix syncword setting.

Fixes issue #796.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index f1aa5a871..ff0263d9d 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -386,7 +386,7 @@ def configure(self, lora_cfg):
                 # see
                 # https://www.thethingsnetwork.org/forum/t/should-private-lorawan-networks-use-a-different-sync-word/34496/15
                 syncword = 0x0404 + ((syncword & 0x0F) << 4) + ((syncword & 0xF0) << 8)
-            self._cmd(">BBH", _CMD_WRITE_REGISTER, _REG_LSYNCRH, syncword)
+            self._cmd(">BHH", _CMD_WRITE_REGISTER, _REG_LSYNCRH, syncword)
 
         if not self._configured or any(
             key in lora_cfg for key in ("output_power", "pa_ramp_us", "tx_ant")

From 224246531ee1d525deb087faf104d66a5d02f4c5 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 13 Feb 2024 16:27:21 +1100
Subject: [PATCH 242/343] lora-sx126x: Clean up some struct formatting.

Changes are cosmetic - and maybe very minor code size - but not functional.
_reg_read() was calling struct.packinto() with an incorrect number of
arguments but it seems like MicroPython didn't mind, as result is correct
for both versions.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 8 ++++----
 micropython/lora/lora-sx126x/manifest.py    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index ff0263d9d..eeb3bffb7 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -469,7 +469,7 @@ def calibrate(self):
         # See DS 13.1.12 Calibrate Function
 
         # calibParam 0xFE means to calibrate all blocks.
-        self._cmd("<BB", _CMD_CALIBRATE, 0xFE)
+        self._cmd("BB", _CMD_CALIBRATE, 0xFE)
 
         time.sleep_us(_CALIBRATE_TYPICAL_TIME_US)
 
@@ -545,7 +545,7 @@ def start_recv(self, timeout_ms=None, continuous=False, rx_length=0xFF):
         else:
             timeout = 0  # Single receive mode, no timeout
 
-        self._cmd(">BBH", _CMD_SET_RX, timeout >> 16, timeout)
+        self._cmd(">BBH", _CMD_SET_RX, timeout >> 16, timeout)  # 24 bits
 
         return self._dio1
 
@@ -729,10 +729,10 @@ def _cmd(self, fmt, *write_args, n_read=0, write_buf=None, read_buf=None):
             return res
 
     def _reg_read(self, addr):
-        return self._cmd("BBBB", _CMD_READ_REGISTER, addr >> 8, addr & 0xFF, n_read=1)[0]
+        return self._cmd(">BHB", _CMD_READ_REGISTER, addr, 0, n_read=1)[0]
 
     def _reg_write(self, addr, val):
-        return self._cmd("BBBB", _CMD_WRITE_REGISTER, addr >> 8, addr & 0xFF, val & 0xFF)
+        return self._cmd(">BHB", _CMD_WRITE_REGISTER, addr, val & 0xFF)
 
 
 class _SX1262(_SX126x):
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
index 1936a50e4..177877091 100644
--- a/micropython/lora/lora-sx126x/manifest.py
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.1")
+metadata(version="0.1.2")
 require("lora")
 package("lora")

From ffb07dbce52371a113da82e3d2deec447c2b61a5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Feb 2024 14:54:24 +1100
Subject: [PATCH 243/343] gzip: Fix recursion error in open() function.

And give the `mode` parameter a default, matching CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/gzip/gzip.py     | 6 +++---
 python-stdlib/gzip/manifest.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python-stdlib/gzip/gzip.py b/python-stdlib/gzip/gzip.py
index c4473becb..12bfb1ff5 100644
--- a/python-stdlib/gzip/gzip.py
+++ b/python-stdlib/gzip/gzip.py
@@ -3,15 +3,15 @@
 
 _WBITS = const(15)
 
-import io, deflate
+import builtins, io, deflate
 
 
 def GzipFile(fileobj):
     return deflate.DeflateIO(fileobj, deflate.GZIP, _WBITS)
 
 
-def open(filename, mode):
-    return deflate.DeflateIO(open(filename, mode), deflate.GZIP, _WBITS, True)
+def open(filename, mode="rb"):
+    return deflate.DeflateIO(builtins.open(filename, mode), deflate.GZIP, _WBITS, True)
 
 
 if hasattr(deflate.DeflateIO, "write"):
diff --git a/python-stdlib/gzip/manifest.py b/python-stdlib/gzip/manifest.py
index 006b538c5..c422b2965 100644
--- a/python-stdlib/gzip/manifest.py
+++ b/python-stdlib/gzip/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="1.0.0")
+metadata(version="1.0.1")
 
 module("gzip.py")

From 23df50d0ea0d64c2a4e00f3014dd4590da0a510b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 17 Mar 2024 13:22:36 +1100
Subject: [PATCH 244/343] unix-ffi: Remove "unix_ffi" argument from require().

And describe how to use `add_library()` instead.

Signed-off-by: Damien George <damien@micropython.org>
---
 unix-ffi/README.md                    | 10 +++++++---
 unix-ffi/_markupbase/manifest.py      |  2 +-
 unix-ffi/email.charset/manifest.py    |  4 ++--
 unix-ffi/email.encoders/manifest.py   |  2 +-
 unix-ffi/email.feedparser/manifest.py |  8 ++++----
 unix-ffi/email.header/manifest.py     |  8 ++++----
 unix-ffi/email.internal/manifest.py   | 10 +++++-----
 unix-ffi/email.message/manifest.py    |  8 ++++----
 unix-ffi/email.parser/manifest.py     |  6 +++---
 unix-ffi/email.utils/manifest.py      |  8 ++++----
 unix-ffi/fcntl/manifest.py            |  2 +-
 unix-ffi/getopt/manifest.py           |  2 +-
 unix-ffi/gettext/manifest.py          |  2 +-
 unix-ffi/glob/manifest.py             |  4 ++--
 unix-ffi/html.parser/manifest.py      |  6 +++---
 unix-ffi/http.client/manifest.py      |  8 ++++----
 unix-ffi/machine/manifest.py          |  6 +++---
 unix-ffi/multiprocessing/manifest.py  |  4 ++--
 unix-ffi/os/manifest.py               |  2 +-
 unix-ffi/pwd/manifest.py              |  2 +-
 unix-ffi/re/manifest.py               |  2 +-
 unix-ffi/select/manifest.py           |  4 ++--
 unix-ffi/signal/manifest.py           |  2 +-
 unix-ffi/sqlite3/manifest.py          |  2 +-
 unix-ffi/time/manifest.py             |  2 +-
 unix-ffi/timeit/manifest.py           |  4 ++--
 unix-ffi/ucurses/manifest.py          |  6 +++---
 unix-ffi/urllib.parse/manifest.py     |  2 +-
 28 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/unix-ffi/README.md b/unix-ffi/README.md
index d6b9417d8..6ea05d65a 100644
--- a/unix-ffi/README.md
+++ b/unix-ffi/README.md
@@ -19,9 +19,13 @@ replacement for CPython.
 
 ### Usage
 
-To use a unix-specific library, pass `unix_ffi=True` to `require()` in your
-manifest file.
+To use a unix-specific library, a manifest file must add the `unix-ffi`
+library to the library search path using `add_library()`:
 
 ```py
-require("os", unix_ffi=True) # Use the unix-ffi version instead of python-stdlib.
+add_library("unix-ffi", "$(MPY_LIB_DIR)/unix-ffi", prepend=True)
 ```
+
+Prepending the `unix-ffi` library to the path will make it so that the
+`unix-ffi` version of a package will be preferred if that package appears in
+both `unix-ffi` and another library (eg `python-stdlib`).
diff --git a/unix-ffi/_markupbase/manifest.py b/unix-ffi/_markupbase/manifest.py
index ec576c28f..9cbf52bb0 100644
--- a/unix-ffi/_markupbase/manifest.py
+++ b/unix-ffi/_markupbase/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="3.3.4")
 
-require("re", unix_ffi=True)
+require("re")
 
 module("_markupbase.py")
diff --git a/unix-ffi/email.charset/manifest.py b/unix-ffi/email.charset/manifest.py
index 31d70cece..7e6dd7936 100644
--- a/unix-ffi/email.charset/manifest.py
+++ b/unix-ffi/email.charset/manifest.py
@@ -1,7 +1,7 @@
 metadata(version="0.5.1")
 
 require("functools")
-require("email.encoders", unix_ffi=True)
-require("email.errors", unix_ffi=True)
+require("email.encoders")
+require("email.errors")
 
 package("email")
diff --git a/unix-ffi/email.encoders/manifest.py b/unix-ffi/email.encoders/manifest.py
index e1e2090c9..a3e735d8c 100644
--- a/unix-ffi/email.encoders/manifest.py
+++ b/unix-ffi/email.encoders/manifest.py
@@ -3,7 +3,7 @@
 require("base64")
 require("binascii")
 require("quopri")
-require("re", unix_ffi=True)
+require("re")
 require("string")
 
 package("email")
diff --git a/unix-ffi/email.feedparser/manifest.py b/unix-ffi/email.feedparser/manifest.py
index 4ea80e302..31c34ba91 100644
--- a/unix-ffi/email.feedparser/manifest.py
+++ b/unix-ffi/email.feedparser/manifest.py
@@ -1,8 +1,8 @@
 metadata(version="0.5.1")
 
-require("re", unix_ffi=True)
-require("email.errors", unix_ffi=True)
-require("email.message", unix_ffi=True)
-require("email.internal", unix_ffi=True)
+require("re")
+require("email.errors")
+require("email.message")
+require("email.internal")
 
 package("email")
diff --git a/unix-ffi/email.header/manifest.py b/unix-ffi/email.header/manifest.py
index 65b017b50..0be7e85c2 100644
--- a/unix-ffi/email.header/manifest.py
+++ b/unix-ffi/email.header/manifest.py
@@ -1,9 +1,9 @@
 metadata(version="0.5.2")
 
-require("re", unix_ffi=True)
+require("re")
 require("binascii")
-require("email.encoders", unix_ffi=True)
-require("email.errors", unix_ffi=True)
-require("email.charset", unix_ffi=True)
+require("email.encoders")
+require("email.errors")
+require("email.charset")
 
 package("email")
diff --git a/unix-ffi/email.internal/manifest.py b/unix-ffi/email.internal/manifest.py
index 4aff6d2c5..88acb2c01 100644
--- a/unix-ffi/email.internal/manifest.py
+++ b/unix-ffi/email.internal/manifest.py
@@ -1,15 +1,15 @@
 metadata(version="0.5.1")
 
-require("re", unix_ffi=True)
+require("re")
 require("base64")
 require("binascii")
 require("functools")
 require("string")
 # require("calendar") TODO
 require("abc")
-require("email.errors", unix_ffi=True)
-require("email.header", unix_ffi=True)
-require("email.charset", unix_ffi=True)
-require("email.utils", unix_ffi=True)
+require("email.errors")
+require("email.header")
+require("email.charset")
+require("email.utils")
 
 package("email")
diff --git a/unix-ffi/email.message/manifest.py b/unix-ffi/email.message/manifest.py
index 7b75ee7ac..d1849de35 100644
--- a/unix-ffi/email.message/manifest.py
+++ b/unix-ffi/email.message/manifest.py
@@ -1,11 +1,11 @@
 metadata(version="0.5.3")
 
-require("re", unix_ffi=True)
+require("re")
 require("uu")
 require("base64")
 require("binascii")
-require("email.utils", unix_ffi=True)
-require("email.errors", unix_ffi=True)
-require("email.charset", unix_ffi=True)
+require("email.utils")
+require("email.errors")
+require("email.charset")
 
 package("email")
diff --git a/unix-ffi/email.parser/manifest.py b/unix-ffi/email.parser/manifest.py
index ebe662111..dd8aacde8 100644
--- a/unix-ffi/email.parser/manifest.py
+++ b/unix-ffi/email.parser/manifest.py
@@ -1,8 +1,8 @@
 metadata(version="0.5.1")
 
 require("warnings")
-require("email.feedparser", unix_ffi=True)
-require("email.message", unix_ffi=True)
-require("email.internal", unix_ffi=True)
+require("email.feedparser")
+require("email.message")
+require("email.internal")
 
 package("email")
diff --git a/unix-ffi/email.utils/manifest.py b/unix-ffi/email.utils/manifest.py
index 20b21b406..a7208536d 100644
--- a/unix-ffi/email.utils/manifest.py
+++ b/unix-ffi/email.utils/manifest.py
@@ -1,13 +1,13 @@
 metadata(version="3.3.4")
 
-require("os", unix_ffi=True)
-require("re", unix_ffi=True)
+require("os")
+require("re")
 require("base64")
 require("random")
 require("datetime")
-require("urllib.parse", unix_ffi=True)
+require("urllib.parse")
 require("warnings")
 require("quopri")
-require("email.charset", unix_ffi=True)
+require("email.charset")
 
 package("email")
diff --git a/unix-ffi/fcntl/manifest.py b/unix-ffi/fcntl/manifest.py
index a0e9d9592..e572a58e8 100644
--- a/unix-ffi/fcntl/manifest.py
+++ b/unix-ffi/fcntl/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("fcntl.py")
diff --git a/unix-ffi/getopt/manifest.py b/unix-ffi/getopt/manifest.py
index ae28ffd7f..cde6c4c09 100644
--- a/unix-ffi/getopt/manifest.py
+++ b/unix-ffi/getopt/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="3.3.4")
 
-require("os", unix_ffi=True)
+require("os")
 
 module("getopt.py")
diff --git a/unix-ffi/gettext/manifest.py b/unix-ffi/gettext/manifest.py
index 94b58b2e4..fe40b01b6 100644
--- a/unix-ffi/gettext/manifest.py
+++ b/unix-ffi/gettext/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Riccardo Magliocchetti.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("gettext.py")
diff --git a/unix-ffi/glob/manifest.py b/unix-ffi/glob/manifest.py
index 622289bca..2d2fab31c 100644
--- a/unix-ffi/glob/manifest.py
+++ b/unix-ffi/glob/manifest.py
@@ -1,8 +1,8 @@
 metadata(version="0.5.2")
 
-require("os", unix_ffi=True)
+require("os")
 require("os-path")
-require("re", unix_ffi=True)
+require("re")
 require("fnmatch")
 
 module("glob.py")
diff --git a/unix-ffi/html.parser/manifest.py b/unix-ffi/html.parser/manifest.py
index a0a5bc4f4..3f29bbceb 100644
--- a/unix-ffi/html.parser/manifest.py
+++ b/unix-ffi/html.parser/manifest.py
@@ -1,8 +1,8 @@
 metadata(version="3.3.4")
 
-require("_markupbase", unix_ffi=True)
+require("_markupbase")
 require("warnings")
-require("html.entities", unix_ffi=True)
-require("re", unix_ffi=True)
+require("html.entities")
+require("re")
 
 package("html")
diff --git a/unix-ffi/http.client/manifest.py b/unix-ffi/http.client/manifest.py
index be0c9ef36..add274422 100644
--- a/unix-ffi/http.client/manifest.py
+++ b/unix-ffi/http.client/manifest.py
@@ -1,10 +1,10 @@
 metadata(version="0.5.1")
 
-require("email.parser", unix_ffi=True)
-require("email.message", unix_ffi=True)
-require("socket", unix_ffi=True)
+require("email.parser")
+require("email.message")
+require("socket")
 require("collections")
-require("urllib.parse", unix_ffi=True)
+require("urllib.parse")
 require("warnings")
 
 package("http")
diff --git a/unix-ffi/machine/manifest.py b/unix-ffi/machine/manifest.py
index 9c1f34775..c0e40764d 100644
--- a/unix-ffi/machine/manifest.py
+++ b/unix-ffi/machine/manifest.py
@@ -2,8 +2,8 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib", unix_ffi=True)
-require("os", unix_ffi=True)
-require("signal", unix_ffi=True)
+require("ffilib")
+require("os")
+require("signal")
 
 package("machine")
diff --git a/unix-ffi/multiprocessing/manifest.py b/unix-ffi/multiprocessing/manifest.py
index 68f2bca08..d6b32411d 100644
--- a/unix-ffi/multiprocessing/manifest.py
+++ b/unix-ffi/multiprocessing/manifest.py
@@ -2,8 +2,8 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("os", unix_ffi=True)
-require("select", unix_ffi=True)
+require("os")
+require("select")
 require("pickle")
 
 module("multiprocessing.py")
diff --git a/unix-ffi/os/manifest.py b/unix-ffi/os/manifest.py
index 0dce28e0b..e4bc100a2 100644
--- a/unix-ffi/os/manifest.py
+++ b/unix-ffi/os/manifest.py
@@ -2,7 +2,7 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 require("errno")
 require("stat")
 
diff --git a/unix-ffi/pwd/manifest.py b/unix-ffi/pwd/manifest.py
index 49bfb403e..fd422aaeb 100644
--- a/unix-ffi/pwd/manifest.py
+++ b/unix-ffi/pwd/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Riccardo Magliocchetti.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("pwd.py")
diff --git a/unix-ffi/re/manifest.py b/unix-ffi/re/manifest.py
index cc52df47a..ca027317d 100644
--- a/unix-ffi/re/manifest.py
+++ b/unix-ffi/re/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("re.py")
diff --git a/unix-ffi/select/manifest.py b/unix-ffi/select/manifest.py
index ef2778ed7..b9576de5e 100644
--- a/unix-ffi/select/manifest.py
+++ b/unix-ffi/select/manifest.py
@@ -2,7 +2,7 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("os", unix_ffi=True)
-require("ffilib", unix_ffi=True)
+require("os")
+require("ffilib")
 
 module("select.py")
diff --git a/unix-ffi/signal/manifest.py b/unix-ffi/signal/manifest.py
index 913bbdc8c..cb23542cc 100644
--- a/unix-ffi/signal/manifest.py
+++ b/unix-ffi/signal/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("signal.py")
diff --git a/unix-ffi/sqlite3/manifest.py b/unix-ffi/sqlite3/manifest.py
index e941e1ddd..63cdf4b9f 100644
--- a/unix-ffi/sqlite3/manifest.py
+++ b/unix-ffi/sqlite3/manifest.py
@@ -2,6 +2,6 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("sqlite3.py")
diff --git a/unix-ffi/time/manifest.py b/unix-ffi/time/manifest.py
index d13942cd6..d1ff709a4 100644
--- a/unix-ffi/time/manifest.py
+++ b/unix-ffi/time/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="0.5.0")
 
-require("ffilib", unix_ffi=True)
+require("ffilib")
 
 module("time.py")
diff --git a/unix-ffi/timeit/manifest.py b/unix-ffi/timeit/manifest.py
index 94b6a5fe9..ea13af331 100644
--- a/unix-ffi/timeit/manifest.py
+++ b/unix-ffi/timeit/manifest.py
@@ -1,9 +1,9 @@
 metadata(version="3.3.4")
 
-require("getopt", unix_ffi=True)
+require("getopt")
 require("itertools")
 # require("linecache") TODO
-require("time", unix_ffi=True)
+require("time")
 require("traceback")
 
 module("timeit.py")
diff --git a/unix-ffi/ucurses/manifest.py b/unix-ffi/ucurses/manifest.py
index 50648033e..8ec2675a5 100644
--- a/unix-ffi/ucurses/manifest.py
+++ b/unix-ffi/ucurses/manifest.py
@@ -2,8 +2,8 @@
 
 # Originally written by Paul Sokolovsky.
 
-require("os", unix_ffi=True)
-require("tty", unix_ffi=True)
-require("select", unix_ffi=True)
+require("os")
+require("tty")
+require("select")
 
 package("ucurses")
diff --git a/unix-ffi/urllib.parse/manifest.py b/unix-ffi/urllib.parse/manifest.py
index 7023883f4..94109b134 100644
--- a/unix-ffi/urllib.parse/manifest.py
+++ b/unix-ffi/urllib.parse/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.5.2")
 
-require("re", unix_ffi=True)
+require("re")
 require("collections")
 require("collections-defaultdict")
 

From 5c7e3fc0bc4a35d8267cf0bc2d121b35568c5a76 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 22 Feb 2024 11:48:57 +1100
Subject: [PATCH 245/343] json: Move to unix-ffi.

It requires the unix pcre-based re module.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 python-stdlib/json/manifest.py                    | 3 ---
 {python-stdlib => unix-ffi}/json/json/__init__.py | 0
 {python-stdlib => unix-ffi}/json/json/decoder.py  | 0
 {python-stdlib => unix-ffi}/json/json/encoder.py  | 0
 {python-stdlib => unix-ffi}/json/json/scanner.py  | 0
 {python-stdlib => unix-ffi}/json/json/tool.py     | 0
 unix-ffi/json/manifest.py                         | 4 ++++
 {python-stdlib => unix-ffi}/json/test_json.py     | 0
 8 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 python-stdlib/json/manifest.py
 rename {python-stdlib => unix-ffi}/json/json/__init__.py (100%)
 rename {python-stdlib => unix-ffi}/json/json/decoder.py (100%)
 rename {python-stdlib => unix-ffi}/json/json/encoder.py (100%)
 rename {python-stdlib => unix-ffi}/json/json/scanner.py (100%)
 rename {python-stdlib => unix-ffi}/json/json/tool.py (100%)
 create mode 100644 unix-ffi/json/manifest.py
 rename {python-stdlib => unix-ffi}/json/test_json.py (100%)

diff --git a/python-stdlib/json/manifest.py b/python-stdlib/json/manifest.py
deleted file mode 100644
index 87999e5f1..000000000
--- a/python-stdlib/json/manifest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-metadata(version="0.1.0")
-
-package("json")
diff --git a/python-stdlib/json/json/__init__.py b/unix-ffi/json/json/__init__.py
similarity index 100%
rename from python-stdlib/json/json/__init__.py
rename to unix-ffi/json/json/__init__.py
diff --git a/python-stdlib/json/json/decoder.py b/unix-ffi/json/json/decoder.py
similarity index 100%
rename from python-stdlib/json/json/decoder.py
rename to unix-ffi/json/json/decoder.py
diff --git a/python-stdlib/json/json/encoder.py b/unix-ffi/json/json/encoder.py
similarity index 100%
rename from python-stdlib/json/json/encoder.py
rename to unix-ffi/json/json/encoder.py
diff --git a/python-stdlib/json/json/scanner.py b/unix-ffi/json/json/scanner.py
similarity index 100%
rename from python-stdlib/json/json/scanner.py
rename to unix-ffi/json/json/scanner.py
diff --git a/python-stdlib/json/json/tool.py b/unix-ffi/json/json/tool.py
similarity index 100%
rename from python-stdlib/json/json/tool.py
rename to unix-ffi/json/json/tool.py
diff --git a/unix-ffi/json/manifest.py b/unix-ffi/json/manifest.py
new file mode 100644
index 000000000..9267719f1
--- /dev/null
+++ b/unix-ffi/json/manifest.py
@@ -0,0 +1,4 @@
+metadata(version="0.2.0")
+
+require("re")
+package("json")
diff --git a/python-stdlib/json/test_json.py b/unix-ffi/json/test_json.py
similarity index 100%
rename from python-stdlib/json/test_json.py
rename to unix-ffi/json/test_json.py

From 8ee876dcd61a66011f0d403d6ff2c7828712a605 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 6 Mar 2024 12:04:43 +0100
Subject: [PATCH 246/343] cbor2: Deprecate decoder and encoder modules.

Deprecate decoder and encoder modules to maintain compatibility with the
CPython cbor2 module.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 python-ecosys/cbor2/cbor2/__init__.py                 | 9 +++++++--
 python-ecosys/cbor2/cbor2/{decoder.py => _decoder.py} | 0
 python-ecosys/cbor2/cbor2/{encoder.py => _encoder.py} | 0
 python-ecosys/cbor2/examples/cbor_test.py             | 7 +++----
 python-ecosys/cbor2/manifest.py                       | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename python-ecosys/cbor2/cbor2/{decoder.py => _decoder.py} (100%)
 rename python-ecosys/cbor2/cbor2/{encoder.py => _encoder.py} (100%)

diff --git a/python-ecosys/cbor2/cbor2/__init__.py b/python-ecosys/cbor2/cbor2/__init__.py
index 40114d8b2..7cd98734e 100644
--- a/python-ecosys/cbor2/cbor2/__init__.py
+++ b/python-ecosys/cbor2/cbor2/__init__.py
@@ -24,5 +24,10 @@
 """
 
 
-from . import decoder
-from . import encoder
+from ._decoder import CBORDecoder
+from ._decoder import load
+from ._decoder import loads
+
+from ._encoder import CBOREncoder
+from ._encoder import dump
+from ._encoder import dumps
diff --git a/python-ecosys/cbor2/cbor2/decoder.py b/python-ecosys/cbor2/cbor2/_decoder.py
similarity index 100%
rename from python-ecosys/cbor2/cbor2/decoder.py
rename to python-ecosys/cbor2/cbor2/_decoder.py
diff --git a/python-ecosys/cbor2/cbor2/encoder.py b/python-ecosys/cbor2/cbor2/_encoder.py
similarity index 100%
rename from python-ecosys/cbor2/cbor2/encoder.py
rename to python-ecosys/cbor2/cbor2/_encoder.py
diff --git a/python-ecosys/cbor2/examples/cbor_test.py b/python-ecosys/cbor2/examples/cbor_test.py
index 79ae6089e..b4f351786 100644
--- a/python-ecosys/cbor2/examples/cbor_test.py
+++ b/python-ecosys/cbor2/examples/cbor_test.py
@@ -24,16 +24,15 @@
 """
 
 
-from cbor2 import encoder
-from cbor2 import decoder
+import cbor2
 
 input = [
     {"bn": "urn:dev:ow:10e2073a01080063", "u": "Cel", "t": 1.276020076e09, "v": 23.5},
     {"u": "Cel", "t": 1.276020091e09, "v": 23.6},
 ]
 
-data = encoder.dumps(input)
+data = cbor2.dumps(input)
 print(data)
 print(data.hex())
-text = decoder.loads(data)
+text = cbor2.loads(data)
 print(text)
diff --git a/python-ecosys/cbor2/manifest.py b/python-ecosys/cbor2/manifest.py
index b94ecc886..aa4b77092 100644
--- a/python-ecosys/cbor2/manifest.py
+++ b/python-ecosys/cbor2/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0", pypi="cbor2")
+metadata(version="1.0.0", pypi="cbor2")
 
 package("cbor2")

From 661efa48f091f4279098c99cfb4e942e2b8d1b51 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 6 Mar 2024 12:09:12 +0100
Subject: [PATCH 247/343] senml: Use the updated cbor2 API.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
---
 micropython/senml/examples/basic_cbor.py | 4 ++--
 micropython/senml/manifest.py            | 2 +-
 micropython/senml/senml/senml_pack.py    | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/micropython/senml/examples/basic_cbor.py b/micropython/senml/examples/basic_cbor.py
index f5e92af37..804a886fc 100644
--- a/micropython/senml/examples/basic_cbor.py
+++ b/micropython/senml/examples/basic_cbor.py
@@ -26,7 +26,7 @@
 
 from senml import *
 import time
-from cbor2 import decoder
+import cbor2
 
 pack = SenmlPack("device_name")
 
@@ -38,5 +38,5 @@
         cbor_val = pack.to_cbor()
         print(cbor_val)
         print(cbor_val.hex())
-        print(decoder.loads(cbor_val))  # convert to string again so we can print it.
+        print(cbor2.loads(cbor_val))  # convert to string again so we can print it.
     time.sleep(1)
diff --git a/micropython/senml/manifest.py b/micropython/senml/manifest.py
index 216717caf..f4743075a 100644
--- a/micropython/senml/manifest.py
+++ b/micropython/senml/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="SenML serialisation for MicroPython.",
-    version="0.1.0",
+    version="0.1.1",
     pypi_publish="micropython-senml",
 )
 
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
index 85b26d40b..4e106fd3e 100644
--- a/micropython/senml/senml/senml_pack.py
+++ b/micropython/senml/senml/senml_pack.py
@@ -27,8 +27,7 @@
 from senml.senml_record import SenmlRecord
 from senml.senml_base import SenmlBase
 import json
-from cbor2 import encoder
-from cbor2 import decoder
+import cbor2
 
 
 class SenmlPackIterator:
@@ -278,7 +277,7 @@ def from_cbor(self, data):
         :param data: a byte array.
         :return: None
         """
-        records = decoder.loads(data)  # load the raw senml data
+        records = cbor2.loads(data)  # load the raw senml data
         naming_map = {
             "bn": -2,
             "bt": -3,
@@ -320,7 +319,7 @@ def to_cbor(self):
         }
         converted = []
         self._build_rec_dict(naming_map, converted)
-        return encoder.dumps(converted)
+        return cbor2.dumps(converted)
 
     def add(self, item):
         """

From 45ead11f965ddad664b8efe380d83155859e653b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Mar 2024 17:41:01 +1100
Subject: [PATCH 248/343] ssl: Use "from tls import *" to be compatible with
 axtls.

axtls doesn't define all the CERT_xxx constants, nor the MBEDTLS_VERSION
constant.

This change means that `tls.SSLContext` is imported into the module, but
that's subsequently overridden by the class definition in this module.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/ssl/manifest.py | 2 +-
 python-stdlib/ssl/ssl.py      | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/python-stdlib/ssl/manifest.py b/python-stdlib/ssl/manifest.py
index 5dd041794..a99523071 100644
--- a/python-stdlib/ssl/manifest.py
+++ b/python-stdlib/ssl/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 module("ssl.py", opt=3)
diff --git a/python-stdlib/ssl/ssl.py b/python-stdlib/ssl/ssl.py
index 19847d6d3..c61904be7 100644
--- a/python-stdlib/ssl/ssl.py
+++ b/python-stdlib/ssl/ssl.py
@@ -1,12 +1,5 @@
 import tls
-from tls import (
-    CERT_NONE,
-    CERT_OPTIONAL,
-    CERT_REQUIRED,
-    MBEDTLS_VERSION,
-    PROTOCOL_TLS_CLIENT,
-    PROTOCOL_TLS_SERVER,
-)
+from tls import *
 
 
 class SSLContext:

From 583bc0da70049f3b200d03e919321ac8dbeb2eb8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Mar 2024 12:43:09 +1100
Subject: [PATCH 249/343] usb: Add USB device support packages.

These packages build on top of machine.USBDevice() to provide high level
and flexible support for implementing USB devices in Python code.

Additional credits, as per included copyright notices:

- CDC support based on initial implementation by @hoihu with fixes by
  @linted.

- MIDI support based on initial implementation by @paulhamsh.

- HID keypad example based on work by @turmoni.

- Everyone who tested and provided feedback on early versions of these
  packages.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/usb/README.md                     | 136 +++
 .../usb/examples/device/cdc_repl_example.py   |  47 +
 .../device/hid_custom_keypad_example.py       | 144 +++
 .../usb/examples/device/keyboard_example.py   |  97 ++
 .../usb/examples/device/midi_example.py       |  78 ++
 .../usb/examples/device/mouse_example.py      |  52 ++
 micropython/usb/usb-device-cdc/manifest.py    |   3 +
 .../usb/usb-device-cdc/usb/device/cdc.py      | 437 +++++++++
 micropython/usb/usb-device-hid/manifest.py    |   3 +
 .../usb/usb-device-hid/usb/device/hid.py      | 232 +++++
 .../usb/usb-device-keyboard/manifest.py       |   3 +
 .../usb/device/keyboard.py                    | 233 +++++
 micropython/usb/usb-device-midi/manifest.py   |   3 +
 .../usb/usb-device-midi/usb/device/midi.py    | 306 +++++++
 micropython/usb/usb-device-mouse/manifest.py  |   3 +
 .../usb/usb-device-mouse/usb/device/mouse.py  | 100 ++
 micropython/usb/usb-device/manifest.py        |   2 +
 .../usb/usb-device/tests/test_core_buffer.py  |  97 ++
 .../usb/usb-device/usb/device/__init__.py     |   2 +
 micropython/usb/usb-device/usb/device/core.py | 851 ++++++++++++++++++
 20 files changed, 2829 insertions(+)
 create mode 100644 micropython/usb/README.md
 create mode 100644 micropython/usb/examples/device/cdc_repl_example.py
 create mode 100644 micropython/usb/examples/device/hid_custom_keypad_example.py
 create mode 100644 micropython/usb/examples/device/keyboard_example.py
 create mode 100644 micropython/usb/examples/device/midi_example.py
 create mode 100644 micropython/usb/examples/device/mouse_example.py
 create mode 100644 micropython/usb/usb-device-cdc/manifest.py
 create mode 100644 micropython/usb/usb-device-cdc/usb/device/cdc.py
 create mode 100644 micropython/usb/usb-device-hid/manifest.py
 create mode 100644 micropython/usb/usb-device-hid/usb/device/hid.py
 create mode 100644 micropython/usb/usb-device-keyboard/manifest.py
 create mode 100644 micropython/usb/usb-device-keyboard/usb/device/keyboard.py
 create mode 100644 micropython/usb/usb-device-midi/manifest.py
 create mode 100644 micropython/usb/usb-device-midi/usb/device/midi.py
 create mode 100644 micropython/usb/usb-device-mouse/manifest.py
 create mode 100644 micropython/usb/usb-device-mouse/usb/device/mouse.py
 create mode 100644 micropython/usb/usb-device/manifest.py
 create mode 100644 micropython/usb/usb-device/tests/test_core_buffer.py
 create mode 100644 micropython/usb/usb-device/usb/device/__init__.py
 create mode 100644 micropython/usb/usb-device/usb/device/core.py

diff --git a/micropython/usb/README.md b/micropython/usb/README.md
new file mode 100644
index 000000000..342a0a7e0
--- /dev/null
+++ b/micropython/usb/README.md
@@ -0,0 +1,136 @@
+# USB Drivers
+
+These packages allow implementing USB functionality on a MicroPython system
+using pure Python code.
+
+Currently only USB device is implemented, not USB host.
+
+## USB Device support
+
+### Support
+
+USB Device support depends on the low-level
+[machine.USBDevice](https://docs.micropython.org/en/latest/library/machine.USBDevice.html)
+class. This class is new and not supported on all ports, so please check the
+documentation for your MicroPython version. It is possible to implement a USB
+device using only the low-level USBDevice class. However, the packages here are
+higher level and easier to use.
+
+For more information about how to install packages, or "freeze" them into a
+firmware image, consult the [MicroPython documentation on "Package
+management"](https://docs.micropython.org/en/latest/reference/packages.html).
+
+### Examples
+
+The [examples/device](examples/device) directory in this repo has a range of
+examples. After installing necessary packages, you can download an example and
+run it with `mpremote run EXAMPLE_FILENAME.py` ([mpremote
+docs](https://docs.micropython.org/en/latest/reference/mpremote.html#mpremote-command-run)).
+
+#### Unexpected serial disconnects
+
+If you normally connect to your MicroPython device over a USB serial port ("USB
+CDC"), then running a USB example will disconnect mpremote when the new USB
+device configuration activates and the serial port has to temporarily
+disconnect. It is likely that mpremote will print an error. The example should
+still start running, if necessary then you can reconnect with mpremote and type
+Ctrl-B to restore the MicroPython REPL and/or Ctrl-C to stop the running
+example.
+
+If you use `mpremote run` again while a different USB device configuration is
+already active, then the USB serial port may disconnect immediately before the
+example runs. This is because mpremote has to soft-reset MicroPython, and when
+the existing USB device is reset then the entire USB port needs to reset. If
+this happens, run the same `mpremote run` command again.
+
+We plan to add features to `mpremote` so that this limitation is less
+disruptive. Other tools that communicate with MicroPython over the serial port
+will encounter similar issues when runtime USB is in use.
+
+### Initialising runtime USB
+
+The overall pattern for enabling USB devices at runtime is:
+
+1. Instantiate the Interface objects for your desired USB device.
+2. Call `usb.device.get()` to get the singleton object for the high-level USB device.
+3. Call `init(...)` to pass the desired interfaces as arguments, plus any custom
+   keyword arguments to configure the overall device.
+
+An example, similar to [mouse_example.py](examples/device/mouse_example.py):
+
+```py
+    m = usb.device.mouse.MouseInterface()
+    usb.device.get().init(m, builtin_driver=True)
+```
+
+Setting `builtin_driver=True` means that any built-in USB serial port will still
+be available. Otherwise, you may permanently lose access to MicroPython until
+the next time the device resets.
+
+See [Unexpected serial disconnects](#Unexpected-serial-disconnects), above, for
+an explanation of possible errors or disconnects when the runtime USB device
+initialises.
+
+Placing the call to `usb.device.get().init()` into the `boot.py` of the
+MicroPython file system allows the runtime USB device to initialise immediately
+on boot, before any built-in USB. This is a feature (not a bug) and allows you
+full control over the USB device, for example to only enable USB HID and prevent
+REPL access to the system.
+
+However, note that calling this function on boot without `builtin_driver=True`
+will make the MicroPython USB serial interface permanently inaccessible until
+you "safe mode boot" (on supported boards) or completely erase the flash of your
+device.
+
+### Package usb-device
+
+This base package contains the common implementation components for the other
+packages, and can be used to implement new and different USB interface support.
+All of the other `usb-device-<name>` packages depend on this package, and it
+will be automatically installed as needed.
+
+Specicially, this package provides the `usb.device.get()` function for accessing
+the Device singleton object, and the `usb.device.core` module which contains the
+low-level classes and utility functions for implementing new USB interface
+drivers in Python. The best examples of how to use the core classes is the
+source code of the other USB device packages.
+
+### Package usb-device-keyboard
+
+This package provides the `usb.device.keyboard` module. See
+[keyboard_example.py](examples/device/keyboard_example.py) for an example
+program.
+
+### Package usb-device-mouse
+
+This package provides the `usb.device.mouse` module. See
+[mouse_example.py](examples/device/mouse_example.py) for an example program.
+
+### Package usb-device-hid
+
+This package provides the `usb.device.hid` module. USB HID (Human Interface
+Device) class allows creating a wide variety of device types. The most common
+are mouse and keyboard, which have their own packages in micropython-lib.
+However, using the usb-device-hid package directly allows creation of any kind
+of HID device.
+
+See [hid_custom_keypad_example.py](examples/device/hid_custom_keypad_example.py)
+for an example of a Keypad HID device with a custom HID descriptor.
+
+### Package usb-device-cdc
+
+This package provides the `usb.device.cdc` module. USB CDC (Communications
+Device Class) is most commonly used for virtual serial port USB interfaces, and
+that is what is supported here.
+
+The example [cdc_repl_example.py](examples/device/cdc_repl_example.py)
+demonstrates how to add a second USB serial interface and duplicate the
+MicroPython REPL between the two.
+
+### Package usb-device-midi
+
+This package provides the `usb.device.midi` module. This allows implementing
+USB MIDI devices in MicroPython.
+
+The example [midi_example.py](examples/device/midi_example.py) demonstrates how
+to create a simple MIDI device to send MIDI data to and from the USB host.
diff --git a/micropython/usb/examples/device/cdc_repl_example.py b/micropython/usb/examples/device/cdc_repl_example.py
new file mode 100644
index 000000000..06dc9a76c
--- /dev/null
+++ b/micropython/usb/examples/device/cdc_repl_example.py
@@ -0,0 +1,47 @@
+# MicroPython USB CDC REPL example
+#
+# Example demonstrating how to use os.dupterm() to provide the
+# MicroPython REPL on a dynamic CDCInterface() serial port.
+#
+# To run this example:
+#
+# 1. Make sure `usb-device-cdc` is installed via: mpremote mip install usb-device-cdc
+#
+# 2. Run the example via: mpremote run cdc_repl_example.py
+#
+# 3. mpremote will exit with an error after the previous step, because when the
+#    example runs the existing USB device disconnects and then re-enumerates with
+#    the second serial port. If you check (for example by running mpremote connect
+#    list) then you should now see two USB serial devices.
+#
+# 4. Connect to one of the new ports: mpremote connect PORTNAME
+#
+#    It may be necessary to type Ctrl-B to exit the raw REPL mode and resume the
+#    interactive REPL after mpremote connects.
+#
+# MIT license; Copyright (c) 2023-2024 Angus Gratton
+import os
+import time
+import usb.device
+from usb.device.cdc import CDCInterface
+
+cdc = CDCInterface()
+cdc.init(timeout=0)  # zero timeout makes this non-blocking, suitable for os.dupterm()
+
+# pass builtin_driver=True so that we get the built-in USB-CDC alongside,
+# if it's available.
+usb.device.get().init(cdc, builtin_driver=True)
+
+print("Waiting for USB host to configure the interface...")
+
+# wait for host enumerate as a CDC device...
+while not cdc.is_open():
+    time.sleep_ms(100)
+
+# Note: This example doesn't wait for the host to access the new CDC port,
+# which could be done by polling cdc.dtr, as this will block the REPL
+# from resuming while this code is still executing.
+
+print("CDC port enumerated, duplicating REPL...")
+
+old_term = os.dupterm(cdc)
diff --git a/micropython/usb/examples/device/hid_custom_keypad_example.py b/micropython/usb/examples/device/hid_custom_keypad_example.py
new file mode 100644
index 000000000..9d427cf10
--- /dev/null
+++ b/micropython/usb/examples/device/hid_custom_keypad_example.py
@@ -0,0 +1,144 @@
+# MicroPython USB HID custom Keypad example
+#
+# This example demonstrates creating a custom HID device with its own
+# HID descriptor, in this case for a USB number keypad.
+#
+# For higher level examples that require less code to use, see mouse_example.py
+# and keyboard_example.py
+#
+# To run this example:
+#
+# 1. Make sure `usb-device-hid` is installed via: mpremote mip install usb-device-hid
+#
+# 2. Run the example via: mpremote run hid_custom_keypad_example.py
+#
+# 3. mpremote will exit with an error after the previous step, because when the
+#    example runs the existing USB device disconnects and then re-enumerates with
+#    the custom HID interface present. At this point, the example is running.
+#
+# 4. To see output from the example, re-connect: mpremote connect PORTNAME
+#
+# MIT license; Copyright (c) 2023 Dave Wickham, 2023-2024 Angus Gratton
+from micropython import const
+import time
+import usb.device
+from usb.device.hid import HIDInterface
+
+_INTERFACE_PROTOCOL_KEYBOARD = const(0x01)
+
+
+def keypad_example():
+    k = KeypadInterface()
+
+    usb.device.get().init(k, builtin_driver=True)
+
+    while not k.is_open():
+        time.sleep_ms(100)
+
+    while True:
+        time.sleep(2)
+        print("Press NumLock...")
+        k.send_key("<NumLock>")
+        time.sleep_ms(100)
+        k.send_key()
+        time.sleep(1)
+        # continue
+        print("Press ...")
+        for _ in range(3):
+            time.sleep(0.1)
+            k.send_key(".")
+            time.sleep(0.1)
+            k.send_key()
+        print("Starting again...")
+
+
+class KeypadInterface(HIDInterface):
+    # Very basic synchronous USB keypad HID interface
+
+    def __init__(self):
+        super().__init__(
+            _KEYPAD_REPORT_DESC,
+            set_report_buf=bytearray(1),
+            protocol=_INTERFACE_PROTOCOL_KEYBOARD,
+            interface_str="MicroPython Keypad",
+        )
+        self.numlock = False
+
+    def on_set_report(self, report_data, _report_id, _report_type):
+        report = report_data[0]
+        b = bool(report & 1)
+        if b != self.numlock:
+            print("Numlock: ", b)
+            self.numlock = b
+
+    def send_key(self, key=None):
+        if key is None:
+            self.send_report(b"\x00")
+        else:
+            self.send_report(_key_to_id(key).to_bytes(1, "big"))
+
+
+# See HID Usages and Descriptions 1.4, section 10 Keyboard/Keypad Page (0x07)
+#
+# This keypad example has a contiguous series of keys (KEYPAD_KEY_IDS) starting
+# from the NumLock/Clear keypad key (0x53), but you can send any Key IDs from
+# the table in the HID Usages specification.
+_KEYPAD_KEY_OFFS = const(0x53)
+
+_KEYPAD_KEY_IDS = [
+    "<NumLock>",
+    "/",
+    "*",
+    "-",
+    "+",
+    "<Enter>",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "0",
+    ".",
+]
+
+
+def _key_to_id(key):
+    # This is a little slower than making a dict for lookup, but uses
+    # less memory and O(n) can be fast enough when n is small.
+    return _KEYPAD_KEY_IDS.index(key) + _KEYPAD_KEY_OFFS
+
+
+# HID Report descriptor for a numeric keypad
+#
+# fmt: off
+_KEYPAD_REPORT_DESC = (
+    b'\x05\x01'  # Usage Page (Generic Desktop)
+        b'\x09\x07'  # Usage (Keypad)
+    b'\xA1\x01'  # Collection (Application)
+        b'\x05\x07'  # Usage Page (Keypad)
+            b'\x19\x00'  # Usage Minimum (0)
+            b'\x29\xFF'  # Usage Maximum (ff)
+            b'\x15\x00'  # Logical Minimum (0)
+            b'\x25\xFF'  # Logical Maximum (ff)
+            b'\x95\x01'  # Report Count (1),
+            b'\x75\x08'  # Report Size (8),
+            b'\x81\x00'  # Input (Data, Array, Absolute)
+        b'\x05\x08'  # Usage page (LEDs)
+            b'\x19\x01'  # Usage Minimum (1)
+            b'\x29\x01'  # Usage Maximum (1),
+            b'\x95\x01'  # Report Count (1),
+            b'\x75\x01'  # Report Size (1),
+            b'\x91\x02'  # Output (Data, Variable, Absolute)
+            b'\x95\x01'  # Report Count (1),
+            b'\x75\x07'  # Report Size (7),
+            b'\x91\x01'  # Output (Constant) - padding bits
+    b'\xC0'  # End Collection
+)
+# fmt: on
+
+
+keypad_example()
diff --git a/micropython/usb/examples/device/keyboard_example.py b/micropython/usb/examples/device/keyboard_example.py
new file mode 100644
index 000000000..d8994ff1b
--- /dev/null
+++ b/micropython/usb/examples/device/keyboard_example.py
@@ -0,0 +1,97 @@
+# MicroPython USB Keyboard example
+#
+# To run this example:
+#
+# 1. Check the KEYS assignment below, and connect buttons or switches to the
+#    assigned GPIOs. You can change the entries as needed, look up the reference
+#    for your board to see what pins are available. Note that the example uses
+#    "active low" logic, so pressing a switch or button should switch the
+#    connected pin to Ground (0V).
+#
+# 2. Make sure `usb-device-keyboard` is installed via: mpremote mip install usb-device-keyboard
+#
+# 3. Run the example via: mpremote run keyboard_example.py
+#
+# 4. mpremote will exit with an error after the previous step, because when the
+#    example runs the existing USB device disconnects and then re-enumerates with
+#   the keyboard interface present. At this point, the example is running.
+#
+# 5. The example doesn't print anything to the serial port, but to stop it first
+#    re-connect: mpremote connect PORTNAME
+#
+# 6. Type Ctrl-C to interrupt the running example and stop it. You may have to
+#    also type Ctrl-B to restore the interactive REPL.
+#
+# To implement a keyboard with different USB HID characteristics, copy the
+# usb-device-keyboard/usb/device/keyboard.py file into your own project and modify
+# KeyboardInterface.
+#
+# MIT license; Copyright (c) 2024 Angus Gratton
+import usb.device
+from usb.device.keyboard import KeyboardInterface, KeyCode, LEDCode
+from machine import Pin
+import time
+
+# Tuples mapping Pin inputs to the KeyCode each input generates
+#
+# (Big keyboards usually multiplex multiple keys per input with a scan matrix,
+# but this is a simple example.)
+KEYS = (
+    (Pin.cpu.GPIO10, KeyCode.CAPS_LOCK),
+    (Pin.cpu.GPIO11, KeyCode.LEFT_SHIFT),
+    (Pin.cpu.GPIO12, KeyCode.M),
+    (Pin.cpu.GPIO13, KeyCode.P),
+    # ... add more pin to KeyCode mappings here if needed
+)
+
+# Tuples mapping Pin outputs to the LEDCode that turns the output on
+LEDS = (
+    (Pin.board.LED, LEDCode.CAPS_LOCK),
+    # ... add more pin to LEDCode mappings here if needed
+)
+
+
+class ExampleKeyboard(KeyboardInterface):
+    def on_led_update(self, led_mask):
+        # print(hex(led_mask))
+        for pin, code in LEDS:
+            # Set the pin high if 'code' bit is set in led_mask
+            pin(code & led_mask)
+
+
+def keyboard_example():
+    # Initialise all the pins as active-low inputs with pullup resistors
+    for pin, _ in KEYS:
+        pin.init(Pin.IN, Pin.PULL_UP)
+
+    # Initialise all the LEDs as active-high outputs
+    for pin, _ in LEDS:
+        pin.init(Pin.OUT, value=0)
+
+    # Register the keyboard interface and re-enumerate
+    k = ExampleKeyboard()
+    usb.device.get().init(k, builtin_driver=True)
+
+    print("Entering keyboard loop...")
+
+    keys = []  # Keys held down, reuse the same list object
+    prev_keys = [None]  # Previous keys, starts with a dummy value so first
+    # iteration will always send
+    while True:
+        if k.is_open():
+            keys.clear()
+            for pin, code in KEYS:
+                if not pin():  # active-low
+                    keys.append(code)
+            if keys != prev_keys:
+                # print(keys)
+                k.send_keys(keys)
+                prev_keys.clear()
+                prev_keys.extend(keys)
+
+        # This simple example scans each input in an infinite loop, but a more
+        # complex implementation would probably use a timer or similar.
+        time.sleep_ms(1)
+
+
+keyboard_example()
diff --git a/micropython/usb/examples/device/midi_example.py b/micropython/usb/examples/device/midi_example.py
new file mode 100644
index 000000000..55fe8af69
--- /dev/null
+++ b/micropython/usb/examples/device/midi_example.py
@@ -0,0 +1,78 @@
+# MicroPython USB MIDI example
+#
+# This example demonstrates creating a custom MIDI device.
+#
+# To run this example:
+#
+# 1. Make sure `usb-device-midi` is installed via: mpremote mip install usb-device-midi
+#
+# 2. Run the example via: mpremote run midi_example.py
+#
+# 3. mpremote will exit with an error after the previous step, because when the
+#    example runs the existing USB device disconnects and then re-enumerates with
+#    the MIDI interface present. At this point, the example is running.
+#
+# 4. To see output from the example, re-connect: mpremote connect PORTNAME
+#
+#
+# MIT license; Copyright (c) 2023-2024 Angus Gratton
+import usb.device
+from usb.device.midi import MIDIInterface
+import time
+
+
+class MIDIExample(MIDIInterface):
+    # Very simple example event handler functions, showing how to receive note
+    # and control change messages sent from the host to the device.
+    #
+    # If you need to send MIDI data to the host, then it's fine to instantiate
+    # MIDIInterface class directly.
+
+    def on_open(self):
+        super().on_open()
+        print("Device opened by host")
+
+    def on_note_on(self, channel, pitch, vel):
+        print(f"RX Note On channel {channel} pitch {pitch} velocity {vel}")
+
+    def on_note_off(self, channel, pitch, vel):
+        print(f"RX Note Off channel {channel} pitch {pitch} velocity {vel}")
+
+    def on_control_change(self, channel, controller, value):
+        print(f"RX Control channel {channel} controller {controller} value {value}")
+
+
+m = MIDIExample()
+# Remove builtin_driver=True if you don't want the MicroPython serial REPL available.
+usb.device.get().init(m, builtin_driver=True)
+
+print("Waiting for USB host to configure the interface...")
+
+while not m.is_open():
+    time.sleep_ms(100)
+
+print("Starting MIDI loop...")
+
+# TX constants
+CHANNEL = 0
+PITCH = 60
+CONTROLLER = 64
+
+control_val = 0
+
+while m.is_open():
+    time.sleep(1)
+    print(f"TX Note On channel {CHANNEL} pitch {PITCH}")
+    m.note_on(CHANNEL, PITCH)  # Velocity is an optional third argument
+    time.sleep(0.5)
+    print(f"TX Note Off channel {CHANNEL} pitch {PITCH}")
+    m.note_off(CHANNEL, PITCH)
+    time.sleep(1)
+    print(f"TX Control channel {CHANNEL} controller {CONTROLLER} value {control_val}")
+    m.control_change(CHANNEL, CONTROLLER, control_val)
+    control_val += 1
+    if control_val == 0x7F:
+        control_val = 0
+    time.sleep(1)
+
+print("USB host has reset device, example done.")
diff --git a/micropython/usb/examples/device/mouse_example.py b/micropython/usb/examples/device/mouse_example.py
new file mode 100644
index 000000000..c73d6cfa6
--- /dev/null
+++ b/micropython/usb/examples/device/mouse_example.py
@@ -0,0 +1,52 @@
+# MicroPython USB Mouse example
+#
+# To run this example:
+#
+# 1. Make sure `usb-device-mouse` is installed via: mpremote mip install usb-device-mouse
+#
+# 2. Run the example via: mpremote run mouse_example.py
+#
+# 3. mpremote will exit with an error after the previous step, because when the
+#    example runs the existing USB device disconnects and then re-enumerates with
+#    the mouse interface present. At this point, the example is running.
+#
+# 4. You should see the mouse move and right click. At this point, the example
+#    is finished executing.
+#
+# To implement a more complex mouse with more buttons or other custom interface
+# features, copy the usb-device-mouse/usb/device/mouse.py file into your own
+# project and modify MouseInterface.
+#
+# MIT license; Copyright (c) 2023-2024 Angus Gratton
+import time
+import usb.device
+from usb.device.mouse import MouseInterface
+
+
+def mouse_example():
+    m = MouseInterface()
+
+    # Note: builtin_driver=True means that if there's a USB-CDC REPL
+    # available then it will appear as well as the HID device.
+    usb.device.get().init(m, builtin_driver=True)
+
+    # wait for host to enumerate as a HID device...
+    while not m.is_open():
+        time.sleep_ms(100)
+
+    time.sleep_ms(2000)
+
+    print("Moving...")
+    m.move_by(-100, 0)
+    m.move_by(-100, 0)
+    time.sleep_ms(500)
+
+    print("Clicking...")
+    m.click_right(True)
+    time.sleep_ms(200)
+    m.click_right(False)
+
+    print("Done!")
+
+
+mouse_example()
diff --git a/micropython/usb/usb-device-cdc/manifest.py b/micropython/usb/usb-device-cdc/manifest.py
new file mode 100644
index 000000000..af9b8cb84
--- /dev/null
+++ b/micropython/usb/usb-device-cdc/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0")
+require("usb-device")
+package("usb")
diff --git a/micropython/usb/usb-device-cdc/usb/device/cdc.py b/micropython/usb/usb-device-cdc/usb/device/cdc.py
new file mode 100644
index 000000000..741eaafb2
--- /dev/null
+++ b/micropython/usb/usb-device-cdc/usb/device/cdc.py
@@ -0,0 +1,437 @@
+# MicroPython USB CDC module
+# MIT license; Copyright (c) 2022 Martin Fischer, 2023-2024 Angus Gratton
+import io
+import time
+import errno
+import machine
+import struct
+from micropython import const
+
+from .core import Interface, Buffer, split_bmRequestType
+
+_EP_IN_FLAG = const(1 << 7)
+
+# Control transfer stages
+_STAGE_IDLE = const(0)
+_STAGE_SETUP = const(1)
+_STAGE_DATA = const(2)
+_STAGE_ACK = const(3)
+
+# Request types
+_REQ_TYPE_STANDARD = const(0x0)
+_REQ_TYPE_CLASS = const(0x1)
+_REQ_TYPE_VENDOR = const(0x2)
+_REQ_TYPE_RESERVED = const(0x3)
+
+_DEV_CLASS_MISC = const(0xEF)
+_CS_DESC_TYPE = const(0x24)  # CS Interface type communication descriptor
+
+# CDC control interface definitions
+_INTERFACE_CLASS_CDC = const(2)
+_INTERFACE_SUBCLASS_CDC = const(2)  # Abstract Control Mode
+_PROTOCOL_NONE = const(0)  # no protocol
+
+# CDC descriptor subtype
+# see also CDC120.pdf, table 13
+_CDC_FUNC_DESC_HEADER = const(0)
+_CDC_FUNC_DESC_CALL_MANAGEMENT = const(1)
+_CDC_FUNC_DESC_ABSTRACT_CONTROL = const(2)
+_CDC_FUNC_DESC_UNION = const(6)
+
+# CDC class requests, table 13, PSTN subclass
+_SET_LINE_CODING_REQ = const(0x20)
+_GET_LINE_CODING_REQ = const(0x21)
+_SET_CONTROL_LINE_STATE = const(0x22)
+_SEND_BREAK_REQ = const(0x23)
+
+_LINE_CODING_STOP_BIT_1 = const(0)
+_LINE_CODING_STOP_BIT_1_5 = const(1)
+_LINE_CODING_STOP_BIT_2 = const(2)
+
+_LINE_CODING_PARITY_NONE = const(0)
+_LINE_CODING_PARITY_ODD = const(1)
+_LINE_CODING_PARITY_EVEN = const(2)
+_LINE_CODING_PARITY_MARK = const(3)
+_LINE_CODING_PARITY_SPACE = const(4)
+
+_LINE_STATE_DTR = const(1)
+_LINE_STATE_RTS = const(2)
+
+_PARITY_BITS_REPR = "NOEMS"
+_STOP_BITS_REPR = ("1", "1.5", "2")
+
+# Other definitions
+_CDC_VERSION = const(0x0120)  # release number in binary-coded decimal
+
+# Number of endpoints in each interface
+_CDC_CONTROL_EP_NUM = const(1)
+_CDC_DATA_EP_NUM = const(2)
+
+# CDC data interface definitions
+_CDC_ITF_DATA_CLASS = const(0xA)
+_CDC_ITF_DATA_SUBCLASS = const(0)
+_CDC_ITF_DATA_PROT = const(0)  # no protocol
+
+# Length of the bulk transfer endpoints. Maybe should be configurable?
+_BULK_EP_LEN = const(64)
+
+# MicroPython error constants (negated as IOBase.ioctl uses negative return values for error codes)
+# these must match values in py/mperrno.h
+_MP_EINVAL = const(-22)
+_MP_ETIMEDOUT = const(-110)
+
+# MicroPython stream ioctl requests, same as py/stream.h
+_MP_STREAM_FLUSH = const(1)
+_MP_STREAM_POLL = const(3)
+
+# MicroPython ioctl poll values, same as py/stream.h
+_MP_STREAM_POLL_WR = const(0x04)
+_MP_STREAM_POLL_RD = const(0x01)
+_MP_STREAM_POLL_HUP = const(0x10)
+
+
+class CDCInterface(io.IOBase, Interface):
+    # USB CDC serial device class, designed to resemble machine.UART
+    # with some additional methods.
+    #
+    # Relies on multiple inheritance so it can be an io.IOBase for stream
+    # functions and also a Interface (actually an Interface Association
+    # Descriptor holding two interfaces.)
+    def __init__(self, **kwargs):
+        # io.IOBase has no __init__()
+        Interface.__init__(self)
+
+        # Callbacks for particular control changes initiated by the host
+        self.break_cb = None  # Host sent a "break" condition
+        self.line_state_cb = None
+        self.line_coding_cb = None
+
+        self._line_state = 0  # DTR & RTS
+        # Set a default line coding of 115200/8N1
+        self._line_coding = bytearray(b"\x00\xc2\x01\x00\x00\x00\x08")
+
+        self._wb = ()  # Optional write Buffer (IN endpoint), set by CDC.init()
+        self._rb = ()  # Optional read Buffer (OUT endpoint), set by CDC.init()
+        self._timeout = 1000  # set from CDC.init() as well
+
+        # one control interface endpoint, two data interface endpoints
+        self.ep_c_in = self.ep_d_in = self.ep_d_out = None
+
+        self._c_itf = None  # Number of control interface, data interface is one more
+
+        self.init(**kwargs)
+
+    def init(
+        self, baudrate=9600, bits=8, parity="N", stop=1, timeout=None, txbuf=256, rxbuf=256, flow=0
+    ):
+        # Configure the CDC serial port. Note that many of these settings like
+        # baudrate, bits, parity, stop don't change the USB-CDC device behavior
+        # at all, only the "line coding" as communicated from/to the USB host.
+
+        # Store initial line coding parameters in the USB CDC binary format
+        # (there is nothing implemented to further change these from Python
+        # code, the USB host sets them.)
+        struct.pack_into(
+            "<LBBB",
+            self._line_coding,
+            0,
+            baudrate,
+            _STOP_BITS_REPR.index(str(stop)),
+            _PARITY_BITS_REPR.index(parity),
+            bits,
+        )
+
+        if flow != 0:
+            raise NotImplementedError  # UART flow control currently not supported
+
+        if not (txbuf and rxbuf):
+            raise ValueError  # Buffer sizes are required
+
+        self._timeout = timeout
+        self._wb = Buffer(txbuf)
+        self._rb = Buffer(rxbuf)
+
+    ###
+    ### Line State & Line Coding State property getters
+    ###
+
+    @property
+    def rts(self):
+        return bool(self._line_state & _LINE_STATE_RTS)
+
+    @property
+    def dtr(self):
+        return bool(self._line_state & _LINE_STATE_DTR)
+
+    # Line Coding Representation
+    # Byte 0-3   Byte 4      Byte 5       Byte 6
+    # dwDTERate  bCharFormat bParityType  bDataBits
+
+    @property
+    def baudrate(self):
+        return struct.unpack("<LBBB", self._line_coding)[0]
+
+    @property
+    def stop_bits(self):
+        return _STOP_BITS_REPR[self._line_coding[4]]
+
+    @property
+    def parity(self):
+        return _PARITY_BITS_REPR[self._line_coding[5]]
+
+    @property
+    def data_bits(self):
+        return self._line_coding[6]
+
+    def __repr__(self):
+        return f"{self.baudrate}/{self.data_bits}{self.parity}{self.stop_bits} rts={self.rts} dtr={self.dtr}"
+
+    ###
+    ### Set callbacks for operations initiated by the host
+    ###
+
+    def set_break_cb(self, cb):
+        self.break_cb = cb
+
+    def set_line_state_cb(self, cb):
+        self.line_state_cb = cb
+
+    def set_line_coding_cb(self, cb):
+        self.line_coding_cb = cb
+
+    ###
+    ### USB Interface Implementation
+    ###
+
+    def desc_cfg(self, desc, itf_num, ep_num, strs):
+        # CDC needs a Interface Association Descriptor (IAD) wrapping two interfaces: Control & Data interfaces
+        desc.interface_assoc(itf_num, 2, _INTERFACE_CLASS_CDC, _INTERFACE_SUBCLASS_CDC)
+
+        # Now add the Control interface descriptor
+        self._c_itf = itf_num
+        desc.interface(itf_num, _CDC_CONTROL_EP_NUM, _INTERFACE_CLASS_CDC, _INTERFACE_SUBCLASS_CDC)
+
+        # Append the CDC class-specific interface descriptor
+        # see CDC120-track, p20
+        desc.pack(
+            "<BBBH",
+            5,  # bFunctionLength
+            _CS_DESC_TYPE,  # bDescriptorType
+            _CDC_FUNC_DESC_HEADER,  # bDescriptorSubtype
+            _CDC_VERSION,  # cdc version
+        )
+
+        # CDC-PSTN table3 "Call Management"
+        # set to No
+        desc.pack(
+            "<BBBBB",
+            5,  # bFunctionLength
+            _CS_DESC_TYPE,  # bDescriptorType
+            _CDC_FUNC_DESC_CALL_MANAGEMENT,  # bDescriptorSubtype
+            0,  # bmCapabilities - XXX no call managment so far
+            itf_num + 1,  # bDataInterface - interface 1
+        )
+
+        # CDC-PSTN table4 "Abstract Control"
+        # set to support line_coding and send_break
+        desc.pack(
+            "<BBBB",
+            4,  # bFunctionLength
+            _CS_DESC_TYPE,  # bDescriptorType
+            _CDC_FUNC_DESC_ABSTRACT_CONTROL,  # bDescriptorSubtype
+            0x6,  # bmCapabilities D1, D2
+        )
+
+        # CDC-PSTN "Union"
+        # set control interface / data interface number
+        desc.pack(
+            "<BBBBB",
+            5,  # bFunctionLength
+            _CS_DESC_TYPE,  # bDescriptorType
+            _CDC_FUNC_DESC_UNION,  # bDescriptorSubtype
+            itf_num,  # bControlInterface
+            itf_num + 1,  # bSubordinateInterface0 (data class itf number)
+        )
+
+        # Single control IN endpoint (currently unused in this implementation)
+        self.ep_c_in = ep_num | _EP_IN_FLAG
+        desc.endpoint(self.ep_c_in, "interrupt", 8, 16)
+
+        # Now add the data interface
+        desc.interface(
+            itf_num + 1,
+            _CDC_DATA_EP_NUM,
+            _CDC_ITF_DATA_CLASS,
+            _CDC_ITF_DATA_SUBCLASS,
+            _CDC_ITF_DATA_PROT,
+        )
+
+        # Two data endpoints, bulk OUT and IN
+        self.ep_d_out = ep_num + 1
+        self.ep_d_in = (ep_num + 1) | _EP_IN_FLAG
+        desc.endpoint(self.ep_d_out, "bulk", _BULK_EP_LEN, 0)
+        desc.endpoint(self.ep_d_in, "bulk", _BULK_EP_LEN, 0)
+
+    def num_itfs(self):
+        return 2
+
+    def num_eps(self):
+        return 2  # total after masking out _EP_IN_FLAG
+
+    def on_open(self):
+        super().on_open()
+        # kick off any transfers that may have queued while the device was not open
+        self._rd_xfer()
+        self._wr_xfer()
+
+    def on_interface_control_xfer(self, stage, request):
+        # Handle class-specific interface control transfers
+        bmRequestType, bRequest, wValue, wIndex, wLength = struct.unpack("BBHHH", request)
+        recipient, req_type, req_dir = split_bmRequestType(bmRequestType)
+
+        if wIndex != self._c_itf:
+            return False  # Only for the control interface (may be redundant check?)
+
+        if req_type != _REQ_TYPE_CLASS:
+            return False  # Unsupported request type
+
+        if stage == _STAGE_SETUP:
+            if bRequest in (_SET_LINE_CODING_REQ, _GET_LINE_CODING_REQ):
+                return self._line_coding  # Buffer to read or write
+
+            # Continue on other supported requests, stall otherwise
+            return bRequest in (_SET_CONTROL_LINE_STATE, _SEND_BREAK_REQ)
+
+        if stage == _STAGE_ACK:
+            if bRequest == _SET_LINE_CODING_REQ:
+                if self.line_coding_cb:
+                    self.line_coding_cb(self._line_coding)
+            elif bRequest == _SET_CONTROL_LINE_STATE:
+                self._line_state = wValue
+                if self.line_state_cb:
+                    self.line_state_cb(wValue)
+            elif bRequest == _SEND_BREAK_REQ:
+                if self.break_cb:
+                    self.break_cb(wValue)
+
+        return True  # allow DATA/ACK stages to complete normally
+
+    def _wr_xfer(self):
+        # Submit a new data IN transfer from the _wb buffer, if needed
+        if self.is_open() and not self.xfer_pending(self.ep_d_in) and self._wb.readable():
+            self.submit_xfer(self.ep_d_in, self._wb.pend_read(), self._wr_cb)
+
+    def _wr_cb(self, ep, res, num_bytes):
+        # Whenever a data IN transfer ends
+        if res == 0:
+            self._wb.finish_read(num_bytes)
+        self._wr_xfer()
+
+    def _rd_xfer(self):
+        # Keep an active data OUT transfer to read data from the host,
+        # whenever the receive buffer has room for new data
+        if self.is_open() and not self.xfer_pending(self.ep_d_out) and self._rb.writable():
+            # Can only submit up to the endpoint length per transaction, otherwise we won't
+            # get any transfer callback until the full transaction completes.
+            self.submit_xfer(self.ep_d_out, self._rb.pend_write(_BULK_EP_LEN), self._rd_cb)
+
+    def _rd_cb(self, ep, res, num_bytes):
+        # Whenever a data OUT transfer ends
+        if res == 0:
+            self._rb.finish_write(num_bytes)
+        self._rd_xfer()
+
+    ###
+    ### io.IOBase stream implementation
+    ###
+
+    def write(self, buf):
+        # use a memoryview to track how much of 'buf' we've written so far
+        # (unfortunately, this means a 1 block allocation for each write, but it's otherwise allocation free.)
+        start = time.ticks_ms()
+        mv = memoryview(buf)
+        while True:
+            # Keep pushing buf into _wb into it's all gone
+            nbytes = self._wb.write(mv)
+            self._wr_xfer()  # make sure a transfer is running from _wb
+
+            if nbytes == len(mv):
+                return len(buf)  # Success
+
+            mv = mv[nbytes:]
+
+            # check for timeout
+            if time.ticks_diff(time.ticks_ms(), start) >= self._timeout:
+                return len(buf) - len(mv)
+
+            machine.idle()
+
+    def read(self, size):
+        start = time.ticks_ms()
+
+        # Allocate a suitable buffer to read into
+        if size >= 0:
+            b = bytearray(size)
+        else:
+            # for size == -1, return however many bytes are ready
+            b = bytearray(self._rb.readable())
+
+        n = self._readinto(b, start)
+        if not n:
+            return None
+        if n < len(b):
+            return b[:n]
+        return b
+
+    def readinto(self, b):
+        return self._readinto(b, time.ticks_ms())
+
+    def _readinto(self, b, start):
+        if len(b) == 0:
+            return 0
+
+        n = 0
+        m = memoryview(b)
+        while n < len(b):
+            # copy out of the read buffer if there is anything available
+            if self._rb.readable():
+                n += self._rb.readinto(m if n == 0 else m[n:])
+                self._rd_xfer()  # if _rd was previously full, no transfer will be running
+                if n == len(b):
+                    break  # Done, exit before we call machine.idle()
+
+            if time.ticks_diff(time.ticks_ms(), start) >= self._timeout:
+                break  # Timed out
+
+            machine.idle()
+
+        return n or None
+
+    def ioctl(self, req, arg):
+        if req == _MP_STREAM_POLL:
+            return (
+                (_MP_STREAM_POLL_WR if (arg & _MP_STREAM_POLL_WR) and self._wb.writable() else 0)
+                | (_MP_STREAM_POLL_RD if (arg & _MP_STREAM_POLL_RD) and self._rb.readable() else 0)
+                |
+                # using the USB level "open" (i.e. connected to host) for !HUP, not !DTR (port is open)
+                (_MP_STREAM_POLL_HUP if (arg & _MP_STREAM_POLL_HUP) and not self.is_open() else 0)
+            )
+        elif req == _MP_STREAM_FLUSH:
+            start = time.ticks_ms()
+            # Wait until write buffer contains no bytes for the lower TinyUSB layer to "read"
+            while self._wb.readable():
+                if not self.is_open():
+                    return _MP_EINVAL
+                if time.ticks_diff(time.ticks_ms(), start) > self._timeout:
+                    return _MP_ETIMEDOUT
+                machine.idle()
+            return 0
+
+        return _MP_EINVAL
+
+    def flush(self):
+        # a C implementation of this exists in stream.c, but it's not in io.IOBase
+        # and can't immediately be called from here (AFAIK)
+        r = self.ioctl(_MP_STREAM_FLUSH, 0)
+        if r:
+            raise OSError(r)
diff --git a/micropython/usb/usb-device-hid/manifest.py b/micropython/usb/usb-device-hid/manifest.py
new file mode 100644
index 000000000..af9b8cb84
--- /dev/null
+++ b/micropython/usb/usb-device-hid/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0")
+require("usb-device")
+package("usb")
diff --git a/micropython/usb/usb-device-hid/usb/device/hid.py b/micropython/usb/usb-device-hid/usb/device/hid.py
new file mode 100644
index 000000000..9e4c70dde
--- /dev/null
+++ b/micropython/usb/usb-device-hid/usb/device/hid.py
@@ -0,0 +1,232 @@
+# MicroPython USB hid module
+#
+# This implements a base HIDInterface class that can be used directly,
+# or subclassed into more specific HID interface types.
+#
+# MIT license; Copyright (c) 2023 Angus Gratton
+from micropython import const
+import machine
+import struct
+import time
+from .core import Interface, Descriptor, split_bmRequestType
+
+_EP_IN_FLAG = const(1 << 7)
+
+# Control transfer stages
+_STAGE_IDLE = const(0)
+_STAGE_SETUP = const(1)
+_STAGE_DATA = const(2)
+_STAGE_ACK = const(3)
+
+# Request types
+_REQ_TYPE_STANDARD = const(0x0)
+_REQ_TYPE_CLASS = const(0x1)
+_REQ_TYPE_VENDOR = const(0x2)
+_REQ_TYPE_RESERVED = const(0x3)
+
+# Descriptor types
+_DESC_HID_TYPE = const(0x21)
+_DESC_REPORT_TYPE = const(0x22)
+_DESC_PHYSICAL_TYPE = const(0x23)
+
+# Interface and protocol identifiers
+_INTERFACE_CLASS = const(0x03)
+_INTERFACE_SUBCLASS_NONE = const(0x00)
+_INTERFACE_SUBCLASS_BOOT = const(0x01)
+
+_INTERFACE_PROTOCOL_NONE = const(0x00)
+_INTERFACE_PROTOCOL_KEYBOARD = const(0x01)
+_INTERFACE_PROTOCOL_MOUSE = const(0x02)
+
+# bRequest values for HID control requests
+_REQ_CONTROL_GET_REPORT = const(0x01)
+_REQ_CONTROL_GET_IDLE = const(0x02)
+_REQ_CONTROL_GET_PROTOCOL = const(0x03)
+_REQ_CONTROL_GET_DESCRIPTOR = const(0x06)
+_REQ_CONTROL_SET_REPORT = const(0x09)
+_REQ_CONTROL_SET_IDLE = const(0x0A)
+_REQ_CONTROL_SET_PROTOCOL = const(0x0B)
+
+# Standard descriptor lengths
+_STD_DESC_INTERFACE_LEN = const(9)
+_STD_DESC_ENDPOINT_LEN = const(7)
+
+
+class HIDInterface(Interface):
+    # Abstract base class to implement a USB device HID interface in Python.
+
+    def __init__(
+        self,
+        report_descriptor,
+        extra_descriptors=[],
+        set_report_buf=None,
+        protocol=_INTERFACE_PROTOCOL_NONE,
+        interface_str=None,
+    ):
+        # Construct a new HID interface.
+        #
+        # - report_descriptor is the only mandatory argument, which is the binary
+        # data consisting of the HID Report Descriptor. See Device Class
+        # Definition for Human Interface Devices (HID) v1.11 section 6.2.2 Report
+        # Descriptor, p23.
+        #
+        # - extra_descriptors is an optional argument holding additional HID
+        #   descriptors, to append after the mandatory report descriptor. Most
+        #   HID devices do not use these.
+        #
+        # - set_report_buf is an optional writable buffer object (i.e.
+        #   bytearray), where SET_REPORT requests from the host can be
+        #   written. Only necessary if the report_descriptor contains Output
+        #   entries. If set, the size must be at least the size of the largest
+        #   Output entry.
+        #
+        # - protocol can be set to a specific value as per HID v1.11 section 4.3 Protocols, p9.
+        #
+        # - interface_str is an optional string descriptor to associate with the HID USB interface.
+        super().__init__()
+        self.report_descriptor = report_descriptor
+        self.extra_descriptors = extra_descriptors
+        self._set_report_buf = set_report_buf
+        self.protocol = protocol
+        self.interface_str = interface_str
+
+        self._int_ep = None  # set during enumeration
+
+    def get_report(self):
+        return False
+
+    def on_set_report(self, report_data, report_id, report_type):
+        # Override this function in order to handle SET REPORT requests from the host,
+        # where it sends data to the HID device.
+        #
+        # This function will only be called if the Report descriptor contains at least one Output entry,
+        # and the set_report_buf argument is provided to the constructor.
+        #
+        # Return True to complete the control transfer normally, False to abort it.
+        return True
+
+    def busy(self):
+        # Returns True if the interrupt endpoint is busy (i.e. existing transfer is pending)
+        return self.is_open() and self.xfer_pending(self._int_ep)
+
+    def send_report(self, report_data, timeout_ms=100):
+        # Helper function to send a HID report in the typical USB interrupt
+        # endpoint associated with a HID interface.
+        #
+        # Returns True if successful, False if HID device is not active or timeout
+        # is reached without being able to queue the report for sending.
+        deadline = time.ticks_add(time.ticks_ms(), timeout_ms)
+        while self.busy():
+            if time.ticks_diff(deadline, time.ticks_ms()) <= 0:
+                return False
+            machine.idle()
+        if not self.is_open():
+            return False
+        self.submit_xfer(self._int_ep, report_data)
+
+    def desc_cfg(self, desc, itf_num, ep_num, strs):
+        # Add the standard interface descriptor
+        desc.interface(
+            itf_num,
+            1,
+            _INTERFACE_CLASS,
+            _INTERFACE_SUBCLASS_NONE,
+            self.protocol,
+            len(strs) if self.interface_str else 0,
+        )
+
+        if self.interface_str:
+            strs.append(self.interface_str)
+
+        # As per HID v1.11 section 7.1 Standard Requests, return the contents of
+        # the standard HID descriptor before the associated endpoint descriptor.
+        self.get_hid_descriptor(desc)
+
+        # Add the typical single USB interrupt endpoint descriptor associated
+        # with a HID interface.
+        self._int_ep = ep_num | _EP_IN_FLAG
+        desc.endpoint(self._int_ep, "interrupt", 8, 8)
+
+        self.idle_rate = 0
+        self.protocol = 0
+
+    def num_eps(self):
+        return 1
+
+    def get_hid_descriptor(self, desc=None):
+        # Append a full USB HID descriptor from the object's report descriptor
+        # and optional additional descriptors.
+        #
+        # See HID Specification Version 1.1, Section 6.2.1 HID Descriptor p22
+
+        l = 9 + 3 * len(self.extra_descriptors)  # total length
+
+        if desc is None:
+            desc = Descriptor(bytearray(l))
+
+        desc.pack(
+            "<BBHBBBH",
+            l,  # bLength
+            _DESC_HID_TYPE,  # bDescriptorType
+            0x111,  # bcdHID
+            0,  # bCountryCode
+            len(self.extra_descriptors) + 1,  # bNumDescriptors
+            0x22,  # bDescriptorType, Report
+            len(self.report_descriptor),  # wDescriptorLength, Report
+        )
+        # Fill in any additional descriptor type/length pairs
+        #
+        # TODO: unclear if this functionality is ever used, may be easier to not
+        # support in base class
+        for dt, dd in self.extra_descriptors:
+            desc.pack("<BH", dt, len(dd))
+
+        return desc.b
+
+    def on_interface_control_xfer(self, stage, request):
+        # Handle standard and class-specific interface control transfers for HID devices.
+        bmRequestType, bRequest, wValue, _, wLength = struct.unpack("BBHHH", request)
+
+        recipient, req_type, _ = split_bmRequestType(bmRequestType)
+
+        if stage == _STAGE_SETUP:
+            if req_type == _REQ_TYPE_STANDARD:
+                # HID Spec p48: 7.1 Standard Requests
+                if bRequest == _REQ_CONTROL_GET_DESCRIPTOR:
+                    desc_type = wValue >> 8
+                    if desc_type == _DESC_HID_TYPE:
+                        return self.get_hid_descriptor()
+                    if desc_type == _DESC_REPORT_TYPE:
+                        return self.report_descriptor
+            elif req_type == _REQ_TYPE_CLASS:
+                # HID Spec p50: 7.2 Class-Specific Requests
+                if bRequest == _REQ_CONTROL_GET_REPORT:
+                    print("GET_REPORT?")
+                    return False  # Unsupported for now
+                if bRequest == _REQ_CONTROL_GET_IDLE:
+                    return bytes([self.idle_rate])
+                if bRequest == _REQ_CONTROL_GET_PROTOCOL:
+                    return bytes([self.protocol])
+                if bRequest in (_REQ_CONTROL_SET_IDLE, _REQ_CONTROL_SET_PROTOCOL):
+                    return True
+                if bRequest == _REQ_CONTROL_SET_REPORT:
+                    return self._set_report_buf  # If None, request will stall
+            return False  # Unsupported request
+
+        if stage == _STAGE_ACK:
+            if req_type == _REQ_TYPE_CLASS:
+                if bRequest == _REQ_CONTROL_SET_IDLE:
+                    self.idle_rate = wValue >> 8
+                elif bRequest == _REQ_CONTROL_SET_PROTOCOL:
+                    self.protocol = wValue
+                elif bRequest == _REQ_CONTROL_SET_REPORT:
+                    report_id = wValue & 0xFF
+                    report_type = wValue >> 8
+                    report_data = self._set_report_buf
+                    if wLength < len(report_data):
+                        # need to truncate the response in the callback if we got less bytes
+                        # than allowed for in the buffer
+                        report_data = memoryview(self._set_report_buf)[:wLength]
+                    self.on_set_report(report_data, report_id, report_type)
+
+        return True  # allow DATA/ACK stages to complete normally
diff --git a/micropython/usb/usb-device-keyboard/manifest.py b/micropython/usb/usb-device-keyboard/manifest.py
new file mode 100644
index 000000000..923535c4c
--- /dev/null
+++ b/micropython/usb/usb-device-keyboard/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0")
+require("usb-device-hid")
+package("usb")
diff --git a/micropython/usb/usb-device-keyboard/usb/device/keyboard.py b/micropython/usb/usb-device-keyboard/usb/device/keyboard.py
new file mode 100644
index 000000000..c42405fc4
--- /dev/null
+++ b/micropython/usb/usb-device-keyboard/usb/device/keyboard.py
@@ -0,0 +1,233 @@
+# MIT license; Copyright (c) 2023-2024 Angus Gratton
+from micropython import const
+import time
+import usb.device
+from usb.device.hid import HIDInterface
+
+_INTERFACE_PROTOCOL_KEYBOARD = const(0x01)
+
+_KEY_ARRAY_LEN = const(6)  # Size of HID key array, must match report descriptor
+_KEY_REPORT_LEN = const(_KEY_ARRAY_LEN + 2)  # Modifier Byte + Reserved Byte + Array entries
+
+
+class KeyboardInterface(HIDInterface):
+    # Synchronous USB keyboard HID interface
+
+    def __init__(self):
+        super().__init__(
+            _KEYBOARD_REPORT_DESC,
+            set_report_buf=bytearray(1),
+            protocol=_INTERFACE_PROTOCOL_KEYBOARD,
+            interface_str="MicroPython Keyboard",
+        )
+        self._key_reports = [
+            bytearray(_KEY_REPORT_LEN),
+            bytearray(_KEY_REPORT_LEN),
+        ]  # Ping/pong report buffers
+        self.numlock = False
+
+    def on_set_report(self, report_data, _report_id, _report_type):
+        self.on_led_update(report_data[0])
+
+    def on_led_update(self, led_mask):
+        # Override to handle keyboard LED updates. led_mask is bitwise ORed
+        # together values as defined in LEDCode.
+        pass
+
+    def send_keys(self, down_keys, timeout_ms=100):
+        # Update the state of the keyboard by sending a report with down_keys
+        # set, where down_keys is an iterable (list or similar) of integer
+        # values such as the values defined in KeyCode.
+        #
+        # Will block for up to timeout_ms if a previous report is still
+        # pending to be sent to the host. Returns True on success.
+
+        r, s = self._key_reports  # next report buffer to send, spare report buffer
+        r[0] = 0  # modifier byte
+        i = 2  # index for next key array item to write to
+        for k in down_keys:
+            if k < 0:  # Modifier key
+                r[0] |= -k
+            elif i < _KEY_REPORT_LEN:
+                r[i] = k
+                i += 1
+            else:  # Excess rollover! Can't report
+                r[0] = 0
+                for i in range(2, _KEY_REPORT_LEN):
+                    r[i] = 0xFF
+                break
+
+        while i < _KEY_REPORT_LEN:
+            r[i] = 0
+            i += 1
+
+        if self.send_report(r, timeout_ms):
+            # Swap buffers if the previous one is newly queued to send, so
+            # any subsequent call can't modify that buffer mid-send
+            self._key_reports[0] = s
+            self._key_reports[1] = r
+            return True
+        return False
+
+
+# HID keyboard report descriptor
+#
+# From p69 of http://www.usb.org/developers/devclass_docs/HID1_11.pdf
+#
+# fmt: off
+_KEYBOARD_REPORT_DESC = (
+    b'\x05\x01'     # Usage Page (Generic Desktop),
+        b'\x09\x06'     # Usage (Keyboard),
+    b'\xA1\x01'     # Collection (Application),
+        b'\x05\x07'         # Usage Page (Key Codes);
+            b'\x19\xE0'         # Usage Minimum (224),
+            b'\x29\xE7'         # Usage Maximum (231),
+            b'\x15\x00'         # Logical Minimum (0),
+            b'\x25\x01'         # Logical Maximum (1),
+            b'\x75\x01'         # Report Size (1),
+            b'\x95\x08'         # Report Count (8),
+            b'\x81\x02'         # Input (Data, Variable, Absolute), ;Modifier byte
+            b'\x95\x01'         # Report Count (1),
+            b'\x75\x08'         # Report Size (8),
+            b'\x81\x01'         # Input (Constant), ;Reserved byte
+            b'\x95\x05'         # Report Count (5),
+            b'\x75\x01'         # Report Size (1),
+        b'\x05\x08'         # Usage Page (Page# for LEDs),
+            b'\x19\x01'         # Usage Minimum (1),
+            b'\x29\x05'         # Usage Maximum (5),
+            b'\x91\x02'         # Output (Data, Variable, Absolute), ;LED report
+            b'\x95\x01'         # Report Count (1),
+            b'\x75\x03'         # Report Size (3),
+            b'\x91\x01'         # Output (Constant), ;LED report padding
+            b'\x95\x06'         # Report Count (6),
+            b'\x75\x08'         # Report Size (8),
+            b'\x15\x00'         # Logical Minimum (0),
+            b'\x25\x65'         # Logical Maximum(101),
+        b'\x05\x07'         # Usage Page (Key Codes),
+            b'\x19\x00'         # Usage Minimum (0),
+            b'\x29\x65'         # Usage Maximum (101),
+            b'\x81\x00'         # Input (Data, Array), ;Key arrays (6 bytes)
+    b'\xC0'     # End Collection
+)
+# fmt: on
+
+
+# Standard HID keycodes, as a pseudo-enum class for easy access
+#
+# Modifier keys are encoded as negative values
+class KeyCode:
+    A = 4
+    B = 5
+    C = 6
+    D = 7
+    E = 8
+    F = 9
+    G = 10
+    H = 11
+    I = 12
+    J = 13
+    K = 14
+    L = 15
+    M = 16
+    N = 17
+    O = 18
+    P = 19
+    Q = 20
+    R = 21
+    S = 22
+    T = 23
+    U = 24
+    V = 25
+    W = 26
+    X = 27
+    Y = 28
+    Z = 29
+    N1 = 30  # Standard number row keys
+    N2 = 31
+    N3 = 32
+    N4 = 33
+    N5 = 34
+    N6 = 35
+    N7 = 36
+    N8 = 37
+    N9 = 38
+    N0 = 39
+    ENTER = 40
+    ESCAPE = 41
+    BACKSPACE = 42
+    TAB = 43
+    SPACE = 44
+    MINUS = 45  # - _
+    EQUAL = 46  # = +
+    OPEN_BRACKET = 47  # [ {
+    CLOSE_BRACKET = 48  # ] }
+    BACKSLASH = 49  # \ |
+    HASH = 50  # # ~
+    COLON = 51  # ; :
+    QUOTE = 52  # ' "
+    TILDE = 53  # ` ~
+    COMMA = 54  # , <
+    DOT = 55  # . >
+    SLASH = 56  # / ?
+    CAPS_LOCK = 57
+    F1 = 58
+    F2 = 59
+    F3 = 60
+    F4 = 61
+    F5 = 62
+    F6 = 63
+    F7 = 64
+    F8 = 65
+    F9 = 66
+    F10 = 67
+    F11 = 68
+    F12 = 69
+    PRINTSCREEN = 70
+    SCROLL_LOCK = 71
+    PAUSE = 72
+    INSERT = 73
+    HOME = 74
+    PAGEUP = 75
+    DELETE = 76
+    END = 77
+    PAGEDOWN = 78
+    RIGHT = 79  # Arrow keys
+    LEFT = 80
+    DOWN = 81
+    UP = 82
+    KP_NUM_LOCK = 83
+    KP_DIVIDE = 84
+    KP_AT = 85
+    KP_MULTIPLY = 85
+    KP_MINUS = 86
+    KP_PLUS = 87
+    KP_ENTER = 88
+    KP_1 = 89
+    KP_2 = 90
+    KP_3 = 91
+    KP_4 = 92
+    KP_5 = 93
+    KP_6 = 94
+    KP_7 = 95
+    KP_8 = 96
+    KP_9 = 97
+    KP_0 = 98
+
+    # HID modifier values (negated to allow them to be passed along with the normal keys)
+    LEFT_CTRL = -0x01
+    LEFT_SHIFT = -0x02
+    LEFT_ALT = -0x04
+    LEFT_UI = -0x08
+    RIGHT_CTRL = -0x10
+    RIGHT_SHIFT = -0x20
+    RIGHT_ALT = -0x40
+    RIGHT_UI = -0x80
+
+
+# HID LED values
+class LEDCode:
+    NUM_LOCK = 0x01
+    CAPS_LOCK = 0x02
+    SCROLL_LOCK = 0x04
+    COMPOSE = 0x08
+    KANA = 0x10
diff --git a/micropython/usb/usb-device-midi/manifest.py b/micropython/usb/usb-device-midi/manifest.py
new file mode 100644
index 000000000..af9b8cb84
--- /dev/null
+++ b/micropython/usb/usb-device-midi/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0")
+require("usb-device")
+package("usb")
diff --git a/micropython/usb/usb-device-midi/usb/device/midi.py b/micropython/usb/usb-device-midi/usb/device/midi.py
new file mode 100644
index 000000000..ecb178ea4
--- /dev/null
+++ b/micropython/usb/usb-device-midi/usb/device/midi.py
@@ -0,0 +1,306 @@
+# MicroPython USB MIDI module
+# MIT license; Copyright (c) 2023 Paul Hamshere, 2023-2024 Angus Gratton
+from micropython import const, schedule
+import struct
+
+from .core import Interface, Buffer
+
+_EP_IN_FLAG = const(1 << 7)
+
+_INTERFACE_CLASS_AUDIO = const(0x01)
+_INTERFACE_SUBCLASS_AUDIO_CONTROL = const(0x01)
+_INTERFACE_SUBCLASS_AUDIO_MIDISTREAMING = const(0x03)
+
+# Audio subclass extends the standard endpoint descriptor
+# with two extra bytes
+_STD_DESC_AUDIO_ENDPOINT_LEN = const(9)
+_CLASS_DESC_ENDPOINT_LEN = const(5)
+
+_STD_DESC_ENDPOINT_TYPE = const(0x5)
+
+_JACK_TYPE_EMBEDDED = const(0x01)
+_JACK_TYPE_EXTERNAL = const(0x02)
+
+_JACK_IN_DESC_LEN = const(6)
+_JACK_OUT_DESC_LEN = const(9)
+
+# MIDI Status bytes. For Channel messages these are only the upper 4 bits, ORed with the channel number.
+# As per https://www.midi.org/specifications-old/item/table-1-summary-of-midi-message
+_MIDI_NOTE_OFF = const(0x80)
+_MIDI_NOTE_ON = const(0x90)
+_MIDI_POLY_KEYPRESS = const(0xA0)
+_MIDI_CONTROL_CHANGE = const(0xB0)
+
+# USB-MIDI CINs (Code Index Numbers), as per USB MIDI Table 4-1
+_CIN_SYS_COMMON_2BYTE = const(0x2)
+_CIN_SYS_COMMON_3BYTE = const(0x3)
+_CIN_SYSEX_START = const(0x4)
+_CIN_SYSEX_END_1BYTE = const(0x5)
+_CIN_SYSEX_END_2BYTE = const(0x6)
+_CIN_SYSEX_END_3BYTE = const(0x7)
+_CIN_NOTE_OFF = const(0x8)
+_CIN_NOTE_ON = const(0x9)
+_CIN_POLY_KEYPRESS = const(0xA)
+_CIN_CONTROL_CHANGE = const(0xB)
+_CIN_PROGRAM_CHANGE = const(0xC)
+_CIN_CHANNEL_PRESSURE = const(0xD)
+_CIN_PITCH_BEND = const(0xE)
+_CIN_SINGLE_BYTE = const(0xF)  # Not currently supported
+
+# Jack IDs for a simple bidrectional MIDI device(!)
+_EMB_IN_JACK_ID = const(1)
+_EXT_IN_JACK_ID = const(2)
+_EMB_OUT_JACK_ID = const(3)
+_EXT_OUT_JACK_ID = const(4)
+
+# Data flows, as modelled by USB-MIDI and this hypothetical interface, are as follows:
+# Device RX = USB OUT EP => _EMB_IN_JACK => _EMB_OUT_JACK
+# Device TX = _EXT_IN_JACK => _EMB_OUT_JACK => USB IN EP
+
+
+class MIDIInterface(Interface):
+    # Base class to implement a USB MIDI device in Python.
+    #
+    # To be compliant this also regisers a dummy USB Audio interface, but that
+    # interface isn't otherwise used.
+
+    def __init__(self, rxlen=16, txlen=16):
+        # Arguments are size of transmit and receive buffers in bytes.
+
+        super().__init__()
+        self.ep_out = None  # Set during enumeration. RX direction (host to device)
+        self.ep_in = None  # TX direction (device to host)
+        self._rx = Buffer(rxlen)
+        self._tx = Buffer(txlen)
+
+    # Callbacks for handling received MIDI messages.
+    #
+    # Subclasses can choose between overriding on_midi_event
+    # and handling all MIDI events manually, or overriding the
+    # functions for note on/off and control change, only.
+
+    def on_midi_event(self, cin, midi0, midi1, midi2):
+        ch = midi0 & 0x0F
+        if cin == _CIN_NOTE_ON:
+            self.on_note_on(ch, midi1, midi2)
+        elif cin == _CIN_NOTE_OFF:
+            self.on_note_off(ch, midi1, midi2)
+        elif cin == _CIN_CONTROL_CHANGE:
+            self.on_control_change(ch, midi1, midi2)
+
+    def on_note_on(self, channel, pitch, vel):
+        pass  # Override to handle Note On messages
+
+    def on_note_off(self, channel, pitch, vel):
+        pass  # Override to handle Note On messages
+
+    def on_control_change(self, channel, controller, value):
+        pass  # Override to handle Control Change messages
+
+    # Helper functions for sending common MIDI messages
+
+    def note_on(self, channel, pitch, vel=0x40):
+        self.send_event(_CIN_NOTE_ON, _MIDI_NOTE_ON | channel, pitch, vel)
+
+    def note_off(self, channel, pitch, vel=0x40):
+        self.send_event(_CIN_NOTE_OFF, _MIDI_NOTE_OFF | channel, pitch, vel)
+
+    def control_change(self, channel, controller, value):
+        self.send_event(_CIN_CONTROL_CHANGE, _MIDI_CONTROL_CHANGE | channel, controller, value)
+
+    def send_event(self, cin, midi0, midi1=0, midi2=0):
+        # Queue a MIDI Event Packet to send to the host.
+        #
+        # CIN = USB-MIDI Code Index Number, see USB MIDI 1.0 section 4 "USB-MIDI Event Packets"
+        #
+        # Remaining arguments are 0-3 MIDI data bytes.
+        #
+        # Note this function returns when the MIDI Event Packet has been queued,
+        # not when it's been received by the host.
+        #
+        # Returns False if the TX buffer is full and the MIDI Event could not be queued.
+        w = self._tx.pend_write()
+        if len(w) < 4:
+            return False  # TX buffer is full. TODO: block here?
+        w[0] = cin  # leave cable number as 0?
+        w[1] = midi0
+        w[2] = midi1
+        w[3] = midi2
+        self._tx.finish_write(4)
+        self._tx_xfer()
+        return True
+
+    def _tx_xfer(self):
+        # Keep an active IN transfer to send data to the host, whenever
+        # there is data to send.
+        if self.is_open() and not self.xfer_pending(self.ep_in) and self._tx.readable():
+            self.submit_xfer(self.ep_in, self._tx.pend_read(), self._tx_cb)
+
+    def _tx_cb(self, ep, res, num_bytes):
+        if res == 0:
+            self._tx.finish_read(num_bytes)
+        self._tx_xfer()
+
+    def _rx_xfer(self):
+        # Keep an active OUT transfer to receive MIDI events from the host
+        if self.is_open() and not self.xfer_pending(self.ep_out) and self._rx.writable():
+            self.submit_xfer(self.ep_out, self._rx.pend_write(), self._rx_cb)
+
+    def _rx_cb(self, ep, res, num_bytes):
+        if res == 0:
+            self._rx.finish_write(num_bytes)
+            schedule(self._on_rx, None)
+        self._rx_xfer()
+
+    def on_open(self):
+        super().on_open()
+        # kick off any transfers that may have queued while the device was not open
+        self._tx_xfer()
+        self._rx_xfer()
+
+    def _on_rx(self, _):
+        # Receive MIDI events. Called via micropython.schedule, outside of the USB callback function.
+        m = self._rx.pend_read()
+        i = 0
+        while i <= len(m) - 4:
+            cin = m[i] & 0x0F
+            self.on_midi_event(cin, m[i + 1], m[i + 2], m[i + 3])
+            i += 4
+        self._rx.finish_read(i)
+
+    def desc_cfg(self, desc, itf_num, ep_num, strs):
+        # Start by registering a USB Audio Control interface, that is required to point to the
+        # actual MIDI interface
+        desc.interface(itf_num, 0, _INTERFACE_CLASS_AUDIO, _INTERFACE_SUBCLASS_AUDIO_CONTROL)
+
+        # Append the class-specific AudioControl interface descriptor
+        desc.pack(
+            "<BBBHHBB",
+            9,  # bLength
+            0x24,  # bDescriptorType CS_INTERFACE
+            0x01,  # bDescriptorSubtype MS_HEADER
+            0x0100,  # BcdADC
+            0x0009,  # wTotalLength
+            0x01,  # bInCollection,
+            itf_num + 1,  # baInterfaceNr - points to the MIDI Streaming interface
+        )
+
+        # Next add the MIDI Streaming interface descriptor
+        desc.interface(
+            itf_num + 1, 2, _INTERFACE_CLASS_AUDIO, _INTERFACE_SUBCLASS_AUDIO_MIDISTREAMING
+        )
+
+        # Append the class-specific interface descriptors
+
+        # Midi Streaming interface descriptor
+        desc.pack(
+            "<BBBHH",
+            7,  # bLength
+            0x24,  # bDescriptorType CS_INTERFACE
+            0x01,  # bDescriptorSubtype MS_HEADER
+            0x0100,  # BcdADC
+            # wTotalLength: of all class-specific descriptors
+            7
+            + 2
+            * (
+                _JACK_IN_DESC_LEN
+                + _JACK_OUT_DESC_LEN
+                + _STD_DESC_AUDIO_ENDPOINT_LEN
+                + _CLASS_DESC_ENDPOINT_LEN
+            ),
+        )
+
+        # The USB MIDI standard 1.0 allows modelling a baffling range of MIDI
+        # devices with different permutations of Jack descriptors, with a lot of
+        # scope for indicating internal connections in the device (as
+        # "virtualised" by the USB MIDI standard). Much of the options don't
+        # really change the USB behaviour but provide metadata to the host.
+        #
+        # As observed elsewhere online, the standard ends up being pretty
+        # complex and unclear in parts, but there is a clear simple example in
+        # an Appendix. So nearly everyone implements the device from the
+        # Appendix as-is, even when it's not a good fit for their application,
+        # and ignores the rest of the standard.
+        #
+        # For now, this is what this class does as well.
+
+        _jack_in_desc(desc, _JACK_TYPE_EMBEDDED, _EMB_IN_JACK_ID)
+        _jack_in_desc(desc, _JACK_TYPE_EXTERNAL, _EXT_IN_JACK_ID)
+        _jack_out_desc(desc, _JACK_TYPE_EMBEDDED, _EMB_OUT_JACK_ID, _EXT_IN_JACK_ID, 1)
+        _jack_out_desc(desc, _JACK_TYPE_EXTERNAL, _EXT_OUT_JACK_ID, _EMB_IN_JACK_ID, 1)
+
+        # One MIDI endpoint in each direction, plus the
+        # associated CS descriptors
+
+        self.ep_out = ep_num
+        self.ep_in = ep_num | _EP_IN_FLAG
+
+        # rx side, USB "in" endpoint and embedded MIDI IN Jacks
+        _audio_endpoint(desc, self.ep_in, _EMB_OUT_JACK_ID)
+
+        # tx side, USB "out" endpoint and embedded MIDI OUT jacks
+        _audio_endpoint(desc, self.ep_out, _EMB_IN_JACK_ID)
+
+    def num_itfs(self):
+        return 2
+
+    def num_eps(self):
+        return 1
+
+
+def _jack_in_desc(desc, bJackType, bJackID):
+    # Utility function appends a "JACK IN" descriptor with
+    # specified bJackType and bJackID
+    desc.pack(
+        "<BBBBBB",
+        _JACK_IN_DESC_LEN,  # bLength
+        0x24,  # bDescriptorType CS_INTERFACE
+        0x02,  # bDescriptorSubtype MIDI_IN_JACK
+        bJackType,
+        bJackID,
+        0x00,  # iJack, no string descriptor support yet
+    )
+
+
+def _jack_out_desc(desc, bJackType, bJackID, bSourceId, bSourcePin):
+    # Utility function appends a "JACK IN" descriptor with
+    # specified bJackType and bJackID
+    desc.pack(
+        "<BBBBBBBBB",
+        _JACK_OUT_DESC_LEN,  # bLength
+        0x24,  # bDescriptorType CS_INTERFACE
+        0x03,  # bDescriptorSubtype MIDI_OUT_JACK
+        bJackType,
+        bJackID,
+        0x01,  # bNrInputPins
+        bSourceId,  # baSourceID(1)
+        bSourcePin,  # baSourcePin(1)
+        0x00,  # iJack, no string descriptor support yet
+    )
+
+
+def _audio_endpoint(desc, bEndpointAddress, emb_jack_id):
+    # Append a standard USB endpoint descriptor and the USB class endpoint descriptor
+    # for this endpoint.
+    #
+    # Audio Class devices extend the standard endpoint descriptor with two extra bytes,
+    # so we can't easily call desc.endpoint() for the first part.
+    desc.pack(
+        # Standard USB endpoint descriptor (plus audio tweaks)
+        "<BBBBHBBB"
+        # Class endpoint descriptor
+        "BBBBB",
+        _STD_DESC_AUDIO_ENDPOINT_LEN,  # wLength
+        _STD_DESC_ENDPOINT_TYPE,  # bDescriptorType
+        bEndpointAddress,
+        2,  # bmAttributes, bulk
+        64,  # wMaxPacketSize
+        0,  # bInterval
+        0,  # bRefresh (unused)
+        0,  # bSynchInterval (unused)
+        _CLASS_DESC_ENDPOINT_LEN,  # bLength
+        0x25,  # bDescriptorType CS_ENDPOINT
+        0x01,  # bDescriptorSubtype MS_GENERAL
+        1,  # bNumEmbMIDIJack
+        emb_jack_id,  # BaAssocJackID(1)
+    )
diff --git a/micropython/usb/usb-device-mouse/manifest.py b/micropython/usb/usb-device-mouse/manifest.py
new file mode 100644
index 000000000..923535c4c
--- /dev/null
+++ b/micropython/usb/usb-device-mouse/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0")
+require("usb-device-hid")
+package("usb")
diff --git a/micropython/usb/usb-device-mouse/usb/device/mouse.py b/micropython/usb/usb-device-mouse/usb/device/mouse.py
new file mode 100644
index 000000000..d3dea9c61
--- /dev/null
+++ b/micropython/usb/usb-device-mouse/usb/device/mouse.py
@@ -0,0 +1,100 @@
+# MicroPython USB Mouse module
+#
+# MIT license; Copyright (c) 2023-2024 Angus Gratton
+from micropython import const
+import struct
+import machine
+
+from usb.device.hid import HIDInterface
+
+_INTERFACE_PROTOCOL_MOUSE = const(0x02)
+
+
+class MouseInterface(HIDInterface):
+    # A basic three button USB mouse HID interface
+    def __init__(self, interface_str="MicroPython Mouse"):
+        super().__init__(
+            _MOUSE_REPORT_DESC,
+            protocol=_INTERFACE_PROTOCOL_MOUSE,
+            interface_str=interface_str,
+        )
+        self._l = False  # Left button
+        self._m = False  # Middle button
+        self._r = False  # Right button
+        self._buf = bytearray(3)
+
+    def send_report(self, dx=0, dy=0):
+        b = 0
+        if self._l:
+            b |= 1 << 0
+        if self._r:
+            b |= 1 << 1
+        if self._m:
+            b |= 1 << 2
+
+        # Wait for any pending report to be sent to the host
+        # before updating contents of _buf.
+        #
+        # This loop can be removed if you don't care about possibly missing a
+        # transient report, the final report buffer contents will always be the
+        # last one sent to the host (it just might lose one of the ones in the
+        # middle).
+        while self.busy():
+            machine.idle()
+
+        struct.pack_into("Bbb", self._buf, 0, b, dx, dy)
+
+        return super().send_report(self._buf)
+
+    def click_left(self, down=True):
+        self._l = down
+        return self.send_report()
+
+    def click_middle(self, down=True):
+        self._m = down
+        return self.send_report()
+
+    def click_right(self, down=True):
+        self._r = down
+        return self.send_report()
+
+    def move_by(self, dx, dy):
+        if not -127 <= dx <= 127:
+            raise ValueError("dx")
+        if not -127 <= dy <= 127:
+            raise ValueError("dy")
+        return self.send_report(dx, dy)
+
+
+# Basic 3-button mouse HID Report Descriptor.
+# This is based on Appendix E.10 of the HID v1.11 document.
+# fmt: off
+_MOUSE_REPORT_DESC = (
+    b'\x05\x01'  # Usage Page (Generic Desktop)
+        b'\x09\x02'  # Usage (Mouse)
+    b'\xA1\x01'  # Collection (Application)
+        b'\x09\x01'  # Usage (Pointer)
+        b'\xA1\x00'  # Collection (Physical)
+            b'\x05\x09'  # Usage Page (Buttons)
+                b'\x19\x01'  # Usage Minimum (01),
+                b'\x29\x03'  # Usage Maximun (03),
+                b'\x15\x00'  # Logical Minimum (0),
+                b'\x25\x01'  # Logical Maximum (1),
+                b'\x95\x03'  # Report Count (3),
+                b'\x75\x01'  # Report Size (1),
+                b'\x81\x02'  # Input (Data, Variable, Absolute), ;3 button bits
+                b'\x95\x01'  # Report Count (1),
+                b'\x75\x05'  # Report Size (5),
+                b'\x81\x01'  # Input (Constant), ;5 bit padding
+            b'\x05\x01'  # Usage Page (Generic Desktop),
+                b'\x09\x30'  # Usage (X),
+                b'\x09\x31'  # Usage (Y),
+                b'\x15\x81'  # Logical Minimum (-127),
+                b'\x25\x7F'  # Logical Maximum (127),
+                b'\x75\x08'  # Report Size (8),
+                b'\x95\x02'  # Report Count (2),
+                b'\x81\x06'  # Input (Data, Variable, Relative), ;2 position bytes (X & Y)
+        b'\xC0'  # End Collection
+    b'\xC0'  # End Collection
+)
+# fmt: on
diff --git a/micropython/usb/usb-device/manifest.py b/micropython/usb/usb-device/manifest.py
new file mode 100644
index 000000000..0dfab932f
--- /dev/null
+++ b/micropython/usb/usb-device/manifest.py
@@ -0,0 +1,2 @@
+metadata(version="0.1.0")
+package("usb")
diff --git a/micropython/usb/usb-device/tests/test_core_buffer.py b/micropython/usb/usb-device/tests/test_core_buffer.py
new file mode 100644
index 000000000..633e618c7
--- /dev/null
+++ b/micropython/usb/usb-device/tests/test_core_buffer.py
@@ -0,0 +1,97 @@
+# Tests for the Buffer class included in usb.device.core
+#
+# The easiest way to run this is using unix port. From the parent usb-device
+# directory, run as:
+#
+# $ micropython -m tests.test_core_buffer
+#
+import micropython
+from usb.device import core
+
+if not hasattr(core.machine, "disable_irq"):
+    # Inject a fake machine module which allows testing on the unix port, and as
+    # a bonus have tests fail if the buffer allocates inside a critical section.
+    class FakeMachine:
+        def disable_irq(self):
+            return micropython.heap_lock()
+
+        def enable_irq(self, was_locked):
+            if not was_locked:
+                micropython.heap_unlock()
+
+    core.machine = FakeMachine()
+
+
+b = core.Buffer(16)
+
+# Check buffer is empty
+assert b.readable() == 0
+assert b.writable() == 16
+
+# Single write then read
+w = b.pend_write()
+assert len(w) == 16
+w[:8] = b"12345678"
+b.finish_write(8)
+
+# Empty again
+assert b.readable() == 8
+assert b.writable() == 8
+
+r = b.pend_read()
+assert len(r) == 8
+assert r == b"12345678"
+b.finish_read(8)
+
+# Empty buffer again
+assert b.readable() == 0
+assert b.writable() == 16
+
+# Single write then split reads
+b.write(b"abcdefghijklmnop")
+assert b.writable() == 0  # full buffer
+
+r = b.pend_read()
+assert r == b"abcdefghijklmnop"
+b.finish_read(2)
+
+r = b.pend_read()
+assert r == b"cdefghijklmnop"
+b.finish_read(3)
+
+# write to end of buffer
+b.write(b"AB")
+
+r = b.pend_read()
+assert r == b"fghijklmnopAB"
+
+# write while a read is pending
+b.write(b"XY")
+
+# previous pend_read() memoryview should be the same
+assert r == b"fghijklmnopAB"
+
+b.finish_read(4)
+r = b.pend_read()
+assert r == b"jklmnopABXY"  # four bytes consumed from head, one new byte at tail
+
+# read while a write is pending
+w = b.pend_write()
+assert len(w) == 5
+r = b.pend_read()
+assert len(r) == 11
+b.finish_read(3)
+w[:2] = b"12"
+b.finish_write(2)
+
+# Expected final state of buffer
+tmp = bytearray(b.readable())
+assert b.readinto(tmp) == len(tmp)
+assert tmp == b"mnopABXY12"
+
+# Now buffer is empty again
+assert b.readable() == 0
+assert b.readinto(tmp) == 0
+assert b.writable() == 16
+
+print("All Buffer tests passed")
diff --git a/micropython/usb/usb-device/usb/device/__init__.py b/micropython/usb/usb-device/usb/device/__init__.py
new file mode 100644
index 000000000..f77dad4f9
--- /dev/null
+++ b/micropython/usb/usb-device/usb/device/__init__.py
@@ -0,0 +1,2 @@
+from . import core
+from .core import get  # Singleton _Device getter
diff --git a/micropython/usb/usb-device/usb/device/core.py b/micropython/usb/usb-device/usb/device/core.py
new file mode 100644
index 000000000..08277b1f4
--- /dev/null
+++ b/micropython/usb/usb-device/usb/device/core.py
@@ -0,0 +1,851 @@
+# MicroPython Library runtime USB device implementation
+#
+# These contain the classes and utilities that are needed to
+# implement a USB device, not any complete USB drivers.
+#
+# MIT license; Copyright (c) 2022-2024 Angus Gratton
+from micropython import const
+import machine
+import struct
+
+_EP_IN_FLAG = const(1 << 7)
+
+# USB descriptor types
+_STD_DESC_DEV_TYPE = const(0x1)
+_STD_DESC_CONFIG_TYPE = const(0x2)
+_STD_DESC_STRING_TYPE = const(0x3)
+_STD_DESC_INTERFACE_TYPE = const(0x4)
+_STD_DESC_ENDPOINT_TYPE = const(0x5)
+_STD_DESC_INTERFACE_ASSOC = const(0xB)
+
+_ITF_ASSOCIATION_DESC_TYPE = const(0xB)  # Interface Association descriptor
+
+# Standard USB descriptor lengths
+_STD_DESC_CONFIG_LEN = const(9)
+_STD_DESC_ENDPOINT_LEN = const(7)
+_STD_DESC_INTERFACE_LEN = const(9)
+
+_DESC_OFFSET_LEN = const(0)
+_DESC_OFFSET_TYPE = const(1)
+
+_DESC_OFFSET_INTERFACE_NUM = const(2)  # for _STD_DESC_INTERFACE_TYPE
+_DESC_OFFSET_ENDPOINT_NUM = const(2)  # for _STD_DESC_ENDPOINT_TYPE
+
+# Standard control request bmRequest fields, can extract by calling split_bmRequestType()
+_REQ_RECIPIENT_DEVICE = const(0x0)
+_REQ_RECIPIENT_INTERFACE = const(0x1)
+_REQ_RECIPIENT_ENDPOINT = const(0x2)
+_REQ_RECIPIENT_OTHER = const(0x3)
+
+# Offsets into the standard configuration descriptor, to fixup
+_OFFS_CONFIG_iConfiguration = const(6)
+
+_INTERFACE_CLASS_VENDOR = const(0xFF)
+_INTERFACE_SUBCLASS_NONE = const(0x00)
+_PROTOCOL_NONE = const(0x00)
+
+# These need to match the constants in tusb_config.h
+_USB_STR_MANUF = const(0x01)
+_USB_STR_PRODUCT = const(0x02)
+_USB_STR_SERIAL = const(0x03)
+
+# Error constant to match mperrno.h
+_MP_EINVAL = const(22)
+
+_dev = None  # Singleton _Device instance
+
+
+def get():
+    # Getter to access the singleton instance of the
+    # MicroPython _Device object
+    #
+    # (note this isn't the low-level machine.USBDevice object, the low-level object is
+    # get()._usbd.)
+    global _dev
+    if not _dev:
+        _dev = _Device()
+    return _dev
+
+
+class _Device:
+    # Class that implements the Python parts of the MicroPython USBDevice.
+    #
+    # This class should only be instantiated by the singleton getter
+    # function usb.device.get(), never directly.
+    def __init__(self):
+        self._itfs = {}  # Mapping from interface number to interface object, set by init()
+        self._eps = {}  # Mapping from endpoint address to interface object, set by _open_cb()
+        self._ep_cbs = {}  # Mapping from endpoint address to Optional[xfer callback]
+        self._usbd = machine.USBDevice()  # low-level API
+
+    def init(self, *itfs, **kwargs):
+        # Helper function to configure the USB device and activate it in a single call
+        self.active(False)
+        self.config(*itfs, **kwargs)
+        self.active(True)
+
+    def config(  # noqa: PLR0913
+        self,
+        *itfs,
+        builtin_driver=False,
+        manufacturer_str=None,
+        product_str=None,
+        serial_str=None,
+        configuration_str=None,
+        id_vendor=None,
+        id_product=None,
+        bcd_device=None,
+        device_class=0,
+        device_subclass=0,
+        device_protocol=0,
+        config_str=None,
+        max_power_ma=None,
+    ):
+        # Configure the USB device with a set of interfaces, and optionally reconfiguring the
+        # device and configuration descriptor fields
+
+        _usbd = self._usbd
+
+        if self.active():
+            raise OSError(_MP_EINVAL)  # Must set active(False) first
+
+        # Convenience: Allow builtin_driver to be True, False or one of
+        # the machine.USBDevice.BUILTIN_ constants
+        if isinstance(builtin_driver, bool):
+            builtin_driver = _usbd.BUILTIN_DEFAULT if builtin_driver else _usbd.BUILTIN_NONE
+        _usbd.builtin_driver = builtin_driver
+
+        # Putting None for any strings that should fall back to the "built-in" value
+        # Indexes in this list depends on _USB_STR_MANUF, _USB_STR_PRODUCT, _USB_STR_SERIAL
+        strs = [None, manufacturer_str, product_str, serial_str]
+
+        # Build the device descriptor
+        FMT = "<BBHBBBBHHHBBBB"
+        # read the static descriptor fields
+        f = struct.unpack(FMT, builtin_driver.desc_dev)
+
+        def maybe_set(value, idx):
+            # Override a numeric descriptor value or keep builtin value f[idx] if 'value' is None
+            if value is not None:
+                return value
+            return f[idx]
+
+        # Either copy each descriptor field directly from the builtin device descriptor, or 'maybe'
+        # set it to the custom value from the object
+        desc_dev = struct.pack(
+            FMT,
+            f[0],  # bLength
+            f[1],  # bDescriptorType
+            f[2],  # bcdUSB
+            device_class,  # bDeviceClass
+            device_subclass,  # bDeviceSubClass
+            device_protocol,  # bDeviceProtocol
+            f[6],  # bMaxPacketSize0, TODO: allow overriding this value?
+            maybe_set(id_vendor, 7),  # idVendor
+            maybe_set(id_product, 8),  # idProduct
+            maybe_set(bcd_device, 9),  # bcdDevice
+            _USB_STR_MANUF,  # iManufacturer
+            _USB_STR_PRODUCT,  # iProduct
+            _USB_STR_SERIAL,  # iSerialNumber
+            1,
+        )  # bNumConfigurations
+
+        # Iterate interfaces to build the configuration descriptor
+
+        # Keep track of the interface and endpoint indexes
+        itf_num = builtin_driver.itf_max
+        ep_num = max(builtin_driver.ep_max, 1)  # Endpoint 0 always reserved for control
+        while len(strs) < builtin_driver.str_max:
+            strs.append(None)  # Reserve other string indexes used by builtin drivers
+        initial_cfg = builtin_driver.desc_cfg or (b"\x00" * _STD_DESC_CONFIG_LEN)
+
+        self._itfs = {}
+
+        # Determine the total length of the configuration descriptor, by making dummy
+        # calls to build the config descriptor
+        desc = Descriptor(None)
+        desc.extend(initial_cfg)
+        for itf in itfs:
+            itf.desc_cfg(desc, 0, 0, [])
+
+        # Allocate the real Descriptor helper to write into it, starting
+        # after the standard configuration descriptor
+        desc = Descriptor(bytearray(desc.o))
+        desc.extend(initial_cfg)
+        for itf in itfs:
+            itf.desc_cfg(desc, itf_num, ep_num, strs)
+
+            for _ in range(itf.num_itfs()):
+                self._itfs[itf_num] = itf  # Mapping from interface numbers to interfaces
+                itf_num += 1
+
+            ep_num += itf.num_eps()
+
+        # Go back and update the Standard Configuration Descriptor
+        # header at the start with values based on the complete
+        # descriptor.
+        #
+        # See USB 2.0 specification section 9.6.3 p264 for details.
+        bmAttributes = (
+            (1 << 7)  # Reserved
+            | (0 if max_power_ma else (1 << 6))  # Self-Powered
+            # Remote Wakeup not currently supported
+        )
+
+        # Configuration string is optional but supported
+        iConfiguration = 0
+        if configuration_str:
+            iConfiguration = len(strs)
+            strs.append(configuration_str)
+
+        if max_power_ma is not None:
+            # Convert from mA to the units used in the descriptor
+            max_power_ma //= 2
+        else:
+            try:
+                # Default to whatever value the builtin driver reports
+                max_power_ma = _usbd.BUILTIN_DEFAULT.desc_cfg[8]
+            except IndexError:
+                # If no built-in driver, default to 250mA
+                max_power_ma = 125
+
+        desc.pack_into(
+            "<BBHBBBBB",
+            0,
+            _STD_DESC_CONFIG_LEN,  # bLength
+            _STD_DESC_CONFIG_TYPE,  # bDescriptorType
+            len(desc.b),  # wTotalLength
+            itf_num,
+            1,  # bConfigurationValue
+            iConfiguration,
+            bmAttributes,
+            max_power_ma,
+        )
+
+        _usbd.config(
+            desc_dev,
+            desc.b,
+            strs,
+            self._open_itf_cb,
+            self._reset_cb,
+            self._control_xfer_cb,
+            self._xfer_cb,
+        )
+
+    def active(self, *optional_value):
+        # Thin wrapper around the USBDevice active() function.
+        #
+        # Note: active only means the USB device is available, not that it has
+        # actually been connected to and configured by a USB host. Use the
+        # Interface.is_open() function to check if the host has configured an
+        # interface of the device.
+        return self._usbd.active(*optional_value)
+
+    def _open_itf_cb(self, desc):
+        # Singleton callback from TinyUSB custom class driver, when USB host does
+        # Set Configuration. Called once per interface or IAD.
+
+        # Note that even if the configuration descriptor contains an IAD, 'desc'
+        # starts from the first interface descriptor in the IAD and not the IAD
+        # descriptor.
+
+        itf_num = desc[_DESC_OFFSET_INTERFACE_NUM]
+        itf = self._itfs[itf_num]
+
+        # Scan the full descriptor:
+        # - Build _eps and _ep_addr from the endpoint descriptors
+        # - Find the highest numbered interface provided to the callback
+        #   (which will be the first interface, unless we're scanning
+        #   multiple interfaces inside an IAD.)
+        offs = 0
+        max_itf = itf_num
+        while offs < len(desc):
+            dl = desc[offs + _DESC_OFFSET_LEN]
+            dt = desc[offs + _DESC_OFFSET_TYPE]
+            if dt == _STD_DESC_ENDPOINT_TYPE:
+                ep_addr = desc[offs + _DESC_OFFSET_ENDPOINT_NUM]
+                self._eps[ep_addr] = itf
+                self._ep_cbs[ep_addr] = None
+            elif dt == _STD_DESC_INTERFACE_TYPE:
+                max_itf = max(max_itf, desc[offs + _DESC_OFFSET_INTERFACE_NUM])
+            offs += dl
+
+        # If 'desc' is not the inside of an Interface Association Descriptor but
+        # 'itf' object still represents multiple USB interfaces (i.e. MIDI),
+        # defer calling 'itf.on_open()' until this callback fires for the
+        # highest numbered USB interface.
+        #
+        # This means on_open() is only called once, and that it can
+        # safely submit transfers on any of the USB interfaces' endpoints.
+        if self._itfs.get(max_itf + 1, None) != itf:
+            itf.on_open()
+
+    def _reset_cb(self):
+        # Callback when the USB device is reset by the host
+
+        # Allow interfaces to respond to the reset
+        for itf in self._itfs.values():
+            itf.on_reset()
+
+        # Rebuilt when host re-enumerates
+        self._eps = {}
+        self._ep_cbs = {}
+
+    def _submit_xfer(self, ep_addr, data, done_cb=None):
+        # Singleton function to submit a USB transfer (of any type except control).
+        #
+        # Generally, drivers should call Interface.submit_xfer() instead. See
+        # that function for documentation about the possible parameter values.
+        if ep_addr not in self._eps:
+            raise ValueError("ep_addr")
+        if self._ep_cbs[ep_addr]:
+            raise RuntimeError("xfer_pending")
+
+        # USBDevice callback may be called immediately, before Python execution
+        # continues, so set it first.
+        #
+        # To allow xfer_pending checks to work, store True instead of None.
+        self._ep_cbs[ep_addr] = done_cb or True
+        return self._usbd.submit_xfer(ep_addr, data)
+
+    def _xfer_cb(self, ep_addr, result, xferred_bytes):
+        # Singleton callback from TinyUSB custom class driver when a transfer completes.
+        cb = self._ep_cbs.get(ep_addr, None)
+        self._ep_cbs[ep_addr] = None
+        if callable(cb):
+            cb(ep_addr, result, xferred_bytes)
+
+    def _control_xfer_cb(self, stage, request):
+        # Singleton callback from TinyUSB custom class driver when a control
+        # transfer is in progress.
+        #
+        # stage determines appropriate responses (possible values
+        # utils.STAGE_SETUP, utils.STAGE_DATA, utils.STAGE_ACK).
+        #
+        # The TinyUSB class driver framework only calls this function for
+        # particular types of control transfer, other standard control transfers
+        # are handled by TinyUSB itself.
+        wIndex = request[4] + (request[5] << 8)
+        recipient, _, _ = split_bmRequestType(request[0])
+
+        itf = None
+        result = None
+
+        if recipient == _REQ_RECIPIENT_DEVICE:
+            itf = self._itfs.get(wIndex & 0xFFFF, None)
+            if itf:
+                result = itf.on_device_control_xfer(stage, request)
+        elif recipient == _REQ_RECIPIENT_INTERFACE:
+            itf = self._itfs.get(wIndex & 0xFFFF, None)
+            if itf:
+                result = itf.on_interface_control_xfer(stage, request)
+        elif recipient == _REQ_RECIPIENT_ENDPOINT:
+            ep_num = wIndex & 0xFFFF
+            itf = self._eps.get(ep_num, None)
+            if itf:
+                result = itf.on_endpoint_control_xfer(stage, request)
+
+        if not itf:
+            # At time this code was written, only the control transfers shown
+            # above are passed to the class driver callback. See
+            # invoke_class_control() in tinyusb usbd.c
+            raise RuntimeError(f"Unexpected control request type {request[0]:#x}")
+
+        # Expecting any of the following possible replies from
+        # on_NNN_control_xfer():
+        #
+        # True - Continue transfer, no data
+        # False - STALL transfer
+        # Object with buffer interface - submit this data for the control transfer
+        return result
+
+
+class Interface:
+    # Abstract base class to implement USB Interface (and associated endpoints),
+    # or a collection of USB Interfaces, in Python
+    #
+    # (Despite the name an object of type Interface can represent multiple
+    # associated interfaces, with or without an Interface Association Descriptor
+    # prepended to them. Override num_itfs() if assigning >1 USB interface.)
+
+    def __init__(self):
+        self._open = False
+
+    def desc_cfg(self, desc, itf_num, ep_num, strs):
+        # Function to build configuration descriptor contents for this interface
+        # or group of interfaces. This is called on each interface from
+        # USBDevice.init().
+        #
+        # This function should insert:
+        #
+        # - At least one standard Interface descriptor (can call
+        # - desc.interface()).
+        #
+        # Plus, optionally:
+        #
+        # - One or more endpoint descriptors (can call desc.endpoint()).
+        # - An Interface Association Descriptor, prepended before.
+        # - Other class-specific configuration descriptor data.
+        #
+        # This function is called twice per call to USBDevice.init(). The first
+        # time the values of all arguments are dummies that are used only to
+        # calculate the total length of the descriptor. Therefore, anything this
+        # function does should be idempotent and it should add the same
+        # descriptors each time. If saving interface numbers or endpoint numbers
+        # for later
+        #
+        # Parameters:
+        #
+        # - desc - Descriptor helper to write the configuration descriptor bytes into.
+        #   The first time this function is called 'desc' is a dummy object
+        #   with no backing buffer (exists to count the number of bytes needed).
+        #
+        # - itf_num - First bNumInterfaces value to assign. The descriptor
+        #   should contain the same number of interfaces returned by num_itfs(),
+        #   starting from this value.
+        #
+        # - ep_num - Address of the first available endpoint number to use for
+        #   endpoint descriptor addresses. Subclasses should save the
+        #   endpoint addresses selected, to look up later (although note the first
+        #   time this function is called, the values will be dummies.)
+        #
+        # - strs - list of string descriptors for this USB device. This function
+        #   can append to this list, and then insert the index of the new string
+        #   in the list into the configuration descriptor.
+        raise NotImplementedError
+
+    def num_itfs(self):
+        # Return the number of actual USB Interfaces represented by this object
+        # (as set in desc_cfg().)
+        #
+        # Only needs to be overriden if implementing a Interface class that
+        # represents more than one USB Interface descriptor (i.e. MIDI), or an
+        # Interface Association Descriptor (i.e. USB-CDC).
+        return 1
+
+    def num_eps(self):
+        # Return the number of USB Endpoint numbers represented by this object
+        # (as set in desc_cfg().)
+        #
+        # Note for each count returned by this function, the interface may
+        # choose to have both an IN and OUT endpoint (i.e. IN flag is not
+        # considered a value here.)
+        #
+        # This value can be zero, if the USB Host only communicates with this
+        # interface using control transfers.
+        return 0
+
+    def on_open(self):
+        # Callback called when the USB host accepts the device configuration.
+        #
+        # Override this function to initiate any operations that the USB interface
+        # should do when the USB device is configured to the host.
+        self._open = True
+
+    def on_reset(self):
+        # Callback called on every registered interface when the USB device is
+        # reset by the host. This can happen when the USB device is unplugged,
+        # or if the host triggers a reset for some other reason.
+        #
+        # Override this function to cancel any pending operations specific to
+        # the interface (outstanding USB transfers are already cancelled).
+        #
+        # At this point, no USB functionality is available - on_open() will
+        # be called later if/when the USB host re-enumerates and configures the
+        # interface.
+        self._open = False
+
+    def is_open(self):
+        # Returns True if the interface has been configured by the host and is in
+        # active use.
+        return self._open
+
+    def on_device_control_xfer(self, stage, request):
+        # Control transfer callback. Override to handle a non-standard device
+        # control transfer where bmRequestType Recipient is Device, Type is
+        # utils.REQ_TYPE_CLASS, and the lower byte of wIndex indicates this interface.
+        #
+        # (See USB 2.0 specification 9.4 Standard Device Requests, p250).
+        #
+        # This particular request type seems pretty uncommon for a device class
+        # driver to need to handle, most hosts will not send this so most
+        # implementations won't need to override it.
+        #
+        # Parameters:
+        #
+        # - stage is one of utils.STAGE_SETUP, utils.STAGE_DATA, utils.STAGE_ACK.
+        #
+        # - request is a memoryview into a USB request packet, as per USB 2.0
+        #   specification 9.3 USB Device Requests, p250.  the memoryview is only
+        #   valid while the callback is running.
+        #
+        # The function can call split_bmRequestType(request[0]) to split
+        # bmRequestType into (Recipient, Type, Direction).
+        #
+        # Result, any of:
+        #
+        # - True to continue the request, False to STALL the endpoint.
+        # - Buffer interface object to provide a buffer to the host as part of the
+        #   transfer, if applicable.
+        return False
+
+    def on_interface_control_xfer(self, stage, request):
+        # Control transfer callback. Override to handle a device control
+        # transfer where bmRequestType Recipient is Interface, and the lower byte
+        # of wIndex indicates this interface.
+        #
+        # (See USB 2.0 specification 9.4 Standard Device Requests, p250).
+        #
+        # bmRequestType Type field may have different values. It's not necessary
+        # to handle the mandatory Standard requests (bmRequestType Type ==
+        # utils.REQ_TYPE_STANDARD), if the driver returns False in these cases then
+        # TinyUSB will provide the necessary responses.
+        #
+        # See on_device_control_xfer() for a description of the arguments and
+        # possible return values.
+        return False
+
+    def on_endpoint_control_xfer(self, stage, request):
+        # Control transfer callback. Override to handle a device
+        # control transfer where bmRequestType Recipient is Endpoint and
+        # the lower byte of wIndex indicates an endpoint address associated
+        # with this interface.
+        #
+        # bmRequestType Type will generally have any value except
+        # utils.REQ_TYPE_STANDARD, as Standard endpoint requests are handled by
+        # TinyUSB. The exception is the the Standard "Set Feature" request. This
+        # is handled by Tiny USB but also passed through to the driver in case it
+        # needs to change any internal state, but most drivers can ignore and
+        # return False in this case.
+        #
+        # (See USB 2.0 specification 9.4 Standard Device Requests, p250).
+        #
+        # See on_device_control_xfer() for a description of the parameters and
+        # possible return values.
+        return False
+
+    def xfer_pending(self, ep_addr):
+        # Return True if a transfer is already pending on ep_addr.
+        #
+        # Only one transfer can be submitted at a time.
+        return _dev and bool(_dev._ep_cbs[ep_addr])
+
+    def submit_xfer(self, ep_addr, data, done_cb=None):
+        # Submit a USB transfer (of any type except control)
+        #
+        # Parameters:
+        #
+        # - ep_addr. Address of the endpoint to submit the transfer on. Caller is
+        #   responsible for ensuring that ep_addr is correct and belongs to this
+        #   interface. Only one transfer can be active at a time on each endpoint.
+        #
+        # - data. Buffer containing data to send, or for data to be read into
+        #   (depending on endpoint direction).
+        #
+        # - done_cb. Optional callback function for when the transfer
+        # completes. The callback is called with arguments (ep_addr, result,
+        # xferred_bytes) where result is one of xfer_result_t enum (see top of
+        # this file), and xferred_bytes is an integer.
+        #
+        # If the function returns, the transfer is queued.
+        #
+        # The function will raise RuntimeError under the following conditions:
+        #
+        # - The interface is not "open" (i.e. has not been enumerated and configured
+        #   by the host yet.)
+        #
+        # - A transfer is already pending on this endpoint (use xfer_pending() to check
+        #   before sending if needed.)
+        #
+        # - A DCD error occurred when queueing the transfer on the hardware.
+        #
+        #
+        # Will raise TypeError if 'data' isn't he correct type of buffer for the
+        # endpoint transfer direction.
+        #
+        # Note that done_cb may be called immediately, possibly before this
+        # function has returned to the caller.
+        if not self._open:
+            raise RuntimeError("Not open")
+        _dev._submit_xfer(ep_addr, data, done_cb)
+
+    def stall(self, ep_addr, *args):
+        # Set or get the endpoint STALL state.
+        #
+        # To get endpoint stall stage, call with a single argument.
+        # To set endpoint stall state, call with an additional boolean
+        # argument to set or clear.
+        #
+        # Generally endpoint STALL is handled automatically, but there are some
+        # device classes that need to explicitly stall or unstall an endpoint
+        # under certain conditions.
+        if not self._open or ep_addr not in self._eps:
+            raise RuntimeError
+        _dev._usbd.stall(ep_addr, *args)
+
+
+class Descriptor:
+    # Wrapper class for writing a descriptor in-place into a provided buffer
+    #
+    # Doesn't resize the buffer.
+    #
+    # Can be initialised with b=None to perform a dummy pass that calculates the
+    # length needed for the buffer.
+    def __init__(self, b):
+        self.b = b
+        self.o = 0  # offset of data written to the buffer
+
+    def pack(self, fmt, *args):
+        # Utility function to pack new data into the descriptor
+        # buffer, starting at the current offset.
+        #
+        # Arguments are the same as struct.pack(), but it fills the
+        # pre-allocated descriptor buffer (growing if needed), instead of
+        # returning anything.
+        self.pack_into(fmt, self.o, *args)
+
+    def pack_into(self, fmt, offs, *args):
+        # Utility function to pack new data into the descriptor at offset 'offs'.
+        #
+        # If the data written is before 'offs' then self.o isn't incremented,
+        # otherwise it's incremented to point at the end of the written data.
+        end = offs + struct.calcsize(fmt)
+        if self.b:
+            struct.pack_into(fmt, self.b, offs, *args)
+        self.o = max(self.o, end)
+
+    def extend(self, a):
+        # Extend the descriptor with some bytes-like data
+        if self.b:
+            self.b[self.o : self.o + len(a)] = a
+        self.o += len(a)
+
+    # TODO: At the moment many of these arguments are named the same as the relevant field
+    # in the spec, as this is easier to understand. Can save some code size by collapsing them
+    # down.
+
+    def interface(
+        self,
+        bInterfaceNumber,
+        bNumEndpoints,
+        bInterfaceClass=_INTERFACE_CLASS_VENDOR,
+        bInterfaceSubClass=_INTERFACE_SUBCLASS_NONE,
+        bInterfaceProtocol=_PROTOCOL_NONE,
+        iInterface=0,
+    ):
+        # Utility function to append a standard Interface descriptor, with
+        # the properties specified in the parameter list.
+        #
+        # Defaults for bInterfaceClass, SubClass and Protocol are a "vendor"
+        # device.
+        #
+        # Note that iInterface is a string index number. If set, it should be set
+        # by the caller Interface to the result of self._get_str_index(s),
+        # where 's' is a string found in self.strs.
+        self.pack(
+            "BBBBBBBBB",
+            _STD_DESC_INTERFACE_LEN,  # bLength
+            _STD_DESC_INTERFACE_TYPE,  # bDescriptorType
+            bInterfaceNumber,
+            0,  # bAlternateSetting, not currently supported
+            bNumEndpoints,
+            bInterfaceClass,
+            bInterfaceSubClass,
+            bInterfaceProtocol,
+            iInterface,
+        )
+
+    def endpoint(self, bEndpointAddress, bmAttributes, wMaxPacketSize, bInterval=1):
+        # Utility function to append a standard Endpoint descriptor, with
+        # the properties specified in the parameter list.
+        #
+        # See USB 2.0 specification section 9.6.6 Endpoint p269
+        #
+        # As well as a numeric value, bmAttributes can be a string value to represent
+        # common endpoint types: "control", "bulk", "interrupt".
+        if bmAttributes == "control":
+            bmAttributes = 0
+        elif bmAttributes == "bulk":
+            bmAttributes = 2
+        elif bmAttributes == "interrupt":
+            bmAttributes = 3
+
+        self.pack(
+            "<BBBBHB",
+            _STD_DESC_ENDPOINT_LEN,
+            _STD_DESC_ENDPOINT_TYPE,
+            bEndpointAddress,
+            bmAttributes,
+            wMaxPacketSize,
+            bInterval,
+        )
+
+    def interface_assoc(
+        self,
+        bFirstInterface,
+        bInterfaceCount,
+        bFunctionClass,
+        bFunctionSubClass,
+        bFunctionProtocol=_PROTOCOL_NONE,
+        iFunction=0,
+    ):
+        # Utility function to append an Interface Association descriptor,
+        # with the properties specified in the parameter list.
+        #
+        # See USB ECN: Interface Association Descriptor.
+        self.pack(
+            "<BBBBBBBB",
+            8,
+            _ITF_ASSOCIATION_DESC_TYPE,
+            bFirstInterface,
+            bInterfaceCount,
+            bFunctionClass,
+            bFunctionSubClass,
+            bFunctionProtocol,
+            iFunction,
+        )
+
+
+def split_bmRequestType(bmRequestType):
+    # Utility function to split control transfer field bmRequestType into a tuple of 3 fields:
+    #
+    # Recipient
+    # Type
+    # Data transfer direction
+    #
+    # See USB 2.0 specification section 9.3 USB Device Requests and 9.3.1 bmRequestType, p248.
+    return (
+        bmRequestType & 0x1F,
+        (bmRequestType >> 5) & 0x03,
+        (bmRequestType >> 7) & 0x01,
+    )
+
+
+class Buffer:
+    # An interrupt-safe producer/consumer buffer that wraps a bytearray object.
+    #
+    # Kind of like a ring buffer, but supports the idea of returning a
+    # memoryview for either read or write of multiple bytes (suitable for
+    # passing to a buffer function without needing to allocate another buffer to
+    # read into.)
+    #
+    # Consumer can call pend_read() to get a memoryview to read from, and then
+    # finish_read(n) when done to indicate it read 'n' bytes from the
+    # memoryview. There is also a readinto() convenience function.
+    #
+    # Producer must call pend_write() to get a memorybuffer to write into, and
+    # then finish_write(n) when done to indicate it wrote 'n' bytes into the
+    # memoryview. There is also a normal write() convenience function.
+    #
+    # - Only one producer and one consumer is supported.
+    #
+    # - Calling pend_read() and pend_write() is effectively idempotent, they can be
+    #   called more than once without a corresponding finish_x() call if necessary
+    #   (provided only one thread does this, as per the previous point.)
+    #
+    # - Calling finish_write() and finish_read() is hard interrupt safe (does
+    #   not allocate). pend_read() and pend_write() each allocate 1 block for
+    #   the memoryview that is returned.
+    #
+    # The buffer contents are always laid out as:
+    #
+    # - Slice [:_n] = bytes of valid data waiting to read
+    # - Slice [_n:_w] = unused space
+    # - Slice [_w:] = bytes of pending write buffer waiting to be written
+    #
+    # This buffer should be fast when most reads and writes are balanced and use
+    # the whole buffer. When this doesn't happen, performance degrades to
+    # approximate a Python-based single byte ringbuffer.
+    #
+    def __init__(self, length):
+        self._b = memoryview(bytearray(length))
+        # number of bytes in buffer read to read, starting at index 0. Updated
+        # by both producer & consumer.
+        self._n = 0
+        # start index of a pending write into the buffer, if any. equals
+        # len(self._b) if no write is pending. Updated by producer only.
+        self._w = length
+
+    def writable(self):
+        # Number of writable bytes in the buffer. Assumes no pending write is outstanding.
+        return len(self._b) - self._n
+
+    def readable(self):
+        # Number of readable bytes in the buffer. Assumes no pending read is outstanding.
+        return self._n
+
+    def pend_write(self, wmax=None):
+        # Returns a memoryview that the producer can write bytes into.
+        # start the write at self._n, the end of data waiting to read
+        #
+        # If wmax is set then the memoryview is pre-sliced to be at most
+        # this many bytes long.
+        #
+        # (No critical section needed as self._w is only updated by the producer.)
+        self._w = self._n
+        end = (self._w + wmax) if wmax else len(self._b)
+        return self._b[self._w : end]
+
+    def finish_write(self, nbytes):
+        # Called by the producer to indicate it wrote nbytes into the buffer.
+        ist = machine.disable_irq()
+        try:
+            assert nbytes <= len(self._b) - self._w  # can't say we wrote more than was pended
+            if self._n == self._w:
+                # no data was read while the write was happening, so the buffer is already in place
+                # (this is the fast path)
+                self._n += nbytes
+            else:
+                # Slow path: data was read while the write was happening, so
+                # shuffle the newly written bytes back towards index 0 to avoid fragmentation
+                #
+                # As this updates self._n we have to do it in the critical
+                # section, so do it byte by byte to avoid allocating.
+                while nbytes > 0:
+                    self._b[self._n] = self._b[self._w]
+                    self._n += 1
+                    self._w += 1
+                    nbytes -= 1
+
+            self._w = len(self._b)
+        finally:
+            machine.enable_irq(ist)
+
+    def write(self, w):
+        # Helper method for the producer to write into the buffer in one call
+        pw = self.pend_write()
+        to_w = min(len(w), len(pw))
+        if to_w:
+            pw[:to_w] = w[:to_w]
+            self.finish_write(to_w)
+        return to_w
+
+    def pend_read(self):
+        # Return a memoryview slice that the consumer can read bytes from
+        return self._b[: self._n]
+
+    def finish_read(self, nbytes):
+        # Called by the consumer to indicate it read nbytes from the buffer.
+        if not nbytes:
+            return
+        ist = machine.disable_irq()
+        try:
+            assert nbytes <= self._n  # can't say we read more than was available
+            i = 0
+            self._n -= nbytes
+            while i < self._n:
+                # consumer only read part of the buffer, so shuffle remaining
+                # read data back towards index 0 to avoid fragmentation
+                self._b[i] = self._b[i + nbytes]
+                i += 1
+        finally:
+            machine.enable_irq(ist)
+
+    def readinto(self, b):
+        # Helper method for the consumer to read out of the buffer in one call
+        pr = self.pend_read()
+        to_r = min(len(pr), len(b))
+        if to_r:
+            b[:to_r] = pr[:to_r]
+            self.finish_read(to_r)
+        return to_r

From 57cbc3484060f646deb0f4f652abcca4732b3458 Mon Sep 17 00:00:00 2001
From: Olivier Lenoir <olivier.len02@gmail.com>
Date: Fri, 1 Mar 2024 12:18:35 +0100
Subject: [PATCH 250/343] mip: Add support to mip install from GitLab.

Modify _rewrite_url() to allow mip install from `gitlab:` repository.

Signed-off-by: Olivier Lenoir <olivier.len02@gmail.com>
---
 micropython/mip/mip/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/micropython/mip/mip/__init__.py b/micropython/mip/mip/__init__.py
index 68daf32fe..0c3c6f204 100644
--- a/micropython/mip/mip/__init__.py
+++ b/micropython/mip/mip/__init__.py
@@ -73,6 +73,18 @@ def _rewrite_url(url, branch=None):
             + "/"
             + "/".join(url[2:])
         )
+    elif url.startswith("gitlab:"):
+        url = url[7:].split("/")
+        url = (
+            "https://gitlab.com/"
+            + url[0]
+            + "/"
+            + url[1]
+            + "/-/raw/"
+            + branch
+            + "/"
+            + "/".join(url[2:])
+        )
     return url
 
 
@@ -128,6 +140,7 @@ def _install_package(package, index, target, version, mpy):
         package.startswith("http://")
         or package.startswith("https://")
         or package.startswith("github:")
+        or package.startswith("gitlab:")
     ):
         if package.endswith(".py") or package.endswith(".mpy"):
             print("Downloading {} to {}".format(package, target))

From 7206da4645ded27acf1ad9e9ecfdf080c81ccb05 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 May 2024 13:53:01 +1000
Subject: [PATCH 251/343] mip: Bump minor version.

The previous commit added a new feature (ability to install from GitLab).

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/mip/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
index 00efa5454..88fb08da1 100644
--- a/micropython/mip/manifest.py
+++ b/micropython/mip/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0", description="On-device package installer for network-capable boards")
+metadata(version="0.3.0", description="On-device package installer for network-capable boards")
 
 require("requests")
 

From a2e4efa09a4c0b709b227d689e878029d5c83d0c Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Tue, 16 Apr 2024 13:43:20 +1000
Subject: [PATCH 252/343] collections: Remove micropython-lib Python
 implementation of deque.

It's no longer necessary since the built-in C version of this type now
implements all the functionality here.

Signed-off-by: Matt Trentini <matt.trentini@gmail.com>
---
 .../collections-deque/collections/deque.py    | 36 -------------------
 python-stdlib/collections-deque/manifest.py   |  4 ---
 .../collections/collections/__init__.py       |  4 ---
 python-stdlib/collections/manifest.py         |  2 +-
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 python-stdlib/collections-deque/collections/deque.py
 delete mode 100644 python-stdlib/collections-deque/manifest.py

diff --git a/python-stdlib/collections-deque/collections/deque.py b/python-stdlib/collections-deque/collections/deque.py
deleted file mode 100644
index 1d8c62d4b..000000000
--- a/python-stdlib/collections-deque/collections/deque.py
+++ /dev/null
@@ -1,36 +0,0 @@
-class deque:
-    def __init__(self, iterable=None):
-        if iterable is None:
-            self.q = []
-        else:
-            self.q = list(iterable)
-
-    def popleft(self):
-        return self.q.pop(0)
-
-    def popright(self):
-        return self.q.pop()
-
-    def pop(self):
-        return self.q.pop()
-
-    def append(self, a):
-        self.q.append(a)
-
-    def appendleft(self, a):
-        self.q.insert(0, a)
-
-    def extend(self, a):
-        self.q.extend(a)
-
-    def __len__(self):
-        return len(self.q)
-
-    def __bool__(self):
-        return bool(self.q)
-
-    def __iter__(self):
-        yield from self.q
-
-    def __str__(self):
-        return "deque({})".format(self.q)
diff --git a/python-stdlib/collections-deque/manifest.py b/python-stdlib/collections-deque/manifest.py
deleted file mode 100644
index 0133d2bad..000000000
--- a/python-stdlib/collections-deque/manifest.py
+++ /dev/null
@@ -1,4 +0,0 @@
-metadata(version="0.1.3")
-
-require("collections")
-package("collections")
diff --git a/python-stdlib/collections/collections/__init__.py b/python-stdlib/collections/collections/__init__.py
index 7f3be5673..36dfc1c41 100644
--- a/python-stdlib/collections/collections/__init__.py
+++ b/python-stdlib/collections/collections/__init__.py
@@ -6,10 +6,6 @@
     from .defaultdict import defaultdict
 except ImportError:
     pass
-try:
-    from .deque import deque
-except ImportError:
-    pass
 
 
 class MutableMapping:
diff --git a/python-stdlib/collections/manifest.py b/python-stdlib/collections/manifest.py
index d5ef69472..0ce56d1fa 100644
--- a/python-stdlib/collections/manifest.py
+++ b/python-stdlib/collections/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.2")
+metadata(version="0.2.0")
 
 package("collections")

From cb281a417726e35b33eb5304ba1ac86d979bcfbc Mon Sep 17 00:00:00 2001
From: Jon Foster <jon@jon-foster.co.uk>
Date: Sat, 23 Mar 2024 17:55:45 +0000
Subject: [PATCH 253/343] ntptime: Fix Year 2036 bug.

Fix NTP client - it would report the wrong time after 7 Feb 2036.

Signed-off-by: Jon Foster <jon@jon-foster.co.uk>
---
 micropython/net/ntptime/manifest.py |  2 +-
 micropython/net/ntptime/ntptime.py  | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/micropython/net/ntptime/manifest.py b/micropython/net/ntptime/manifest.py
index 97e3c14a3..15f832966 100644
--- a/micropython/net/ntptime/manifest.py
+++ b/micropython/net/ntptime/manifest.py
@@ -1,3 +1,3 @@
-metadata(description="NTP client.", version="0.1.0")
+metadata(description="NTP client.", version="0.1.1")
 
 module("ntptime.py", opt=3)
diff --git a/micropython/net/ntptime/ntptime.py b/micropython/net/ntptime/ntptime.py
index ff0d9d202..25cc62ad1 100644
--- a/micropython/net/ntptime/ntptime.py
+++ b/micropython/net/ntptime/ntptime.py
@@ -22,12 +22,37 @@ def time():
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     try:
         s.settimeout(timeout)
-        res = s.sendto(NTP_QUERY, addr)
+        s.sendto(NTP_QUERY, addr)
         msg = s.recv(48)
     finally:
         s.close()
     val = struct.unpack("!I", msg[40:44])[0]
 
+    # 2024-01-01 00:00:00 converted to an NTP timestamp
+    MIN_NTP_TIMESTAMP = 3913056000
+
+    # Y2036 fix
+    #
+    # The NTP timestamp has a 32-bit count of seconds, which will wrap back
+    # to zero on 7 Feb 2036 at 06:28:16.
+    #
+    # We know that this software was written during 2024 (or later).
+    # So we know that timestamps less than MIN_NTP_TIMESTAMP are impossible.
+    # So if the timestamp is less than MIN_NTP_TIMESTAMP, that probably means
+    # that the NTP time wrapped at 2^32 seconds.  (Or someone set the wrong
+    # time on their NTP server, but we can't really do anything about that).
+    #
+    # So in that case, we need to add in those extra 2^32 seconds, to get the
+    # correct timestamp.
+    #
+    # This means that this code will work until the year 2160.  More precisely,
+    # this code will not work after 7th Feb 2160 at 06:28:15.
+    #
+    if val < MIN_NTP_TIMESTAMP:
+        val += 0x100000000
+
+    # Convert timestamp from NTP format to our internal format
+
     EPOCH_YEAR = utime.gmtime(0)[0]
     if EPOCH_YEAR == 2000:
         # (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60

From 6c6fab1db1212b80293887be810ae6466fa69fa8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 May 2024 15:05:35 +1000
Subject: [PATCH 254/343] all: Enable ruff F841 'Local variable is assigned to
 but never used'.

Most of these look like they were used for print debugging and then kept in
when the print statements were removed or commented.

Some look like missing or incomplete functionality, these have been marked
with comments where possible.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../aioble/examples/l2cap_file_client.py      |  4 +--
 .../aioble/examples/l2cap_file_server.py      |  5 +---
 .../aioble/multitests/ble_descriptor.py       |  4 +--
 micropython/espflash/espflash.py              |  1 -
 micropython/ucontextlib/tests.py              |  2 +-
 micropython/udnspkt/udnspkt.py                | 26 +++++++------------
 .../urllib.urequest/urllib/urequest.py        |  6 ++---
 pyproject.toml                                |  1 -
 python-ecosys/aiohttp/aiohttp/__init__.py     |  1 -
 python-ecosys/cbor2/cbor2/_decoder.py         |  2 +-
 10 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_client.py b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
index 68770f043..54b357d4f 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_client.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
@@ -85,7 +85,7 @@ async def size(self, path):
     async def download(self, path, dest):
         size = await self.size(path)
 
-        send_seq = await self._command(_COMMAND_SEND, path.encode())
+        await self._command(_COMMAND_SEND, path.encode())
 
         with open(dest, "wb") as f:  # noqa: ASYNC101
             total = 0
@@ -97,7 +97,7 @@ async def download(self, path, dest):
                 total += n
 
     async def list(self, path):
-        send_seq = await self._command(_COMMAND_LIST, path.encode())
+        await self._command(_COMMAND_LIST, path.encode())
         results = bytearray()
         buf = bytearray(self._channel.our_mtu)
         mv = memoryview(buf)
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_server.py b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
index c3730ffd0..c6aef6587 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_server.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
@@ -132,15 +132,12 @@ async def control_task(connection):
                 file = msg[2:].decode()
 
                 if command == _COMMAND_SEND:
-                    op_seq = seq
                     send_file = file
                     l2cap_event.set()
                 elif command == _COMMAND_RECV:
-                    op_seq = seq
                     recv_file = file
                     l2cap_event.set()
                 elif command == _COMMAND_LIST:
-                    op_seq = seq
                     list_path = file
                     l2cap_event.set()
                 elif command == _COMMAND_SIZE:
@@ -148,7 +145,7 @@ async def control_task(connection):
                         stat = os.stat(file)
                         size = stat[6]
                         status = 0
-                    except OSError as e:
+                    except OSError:
                         size = 0
                         status = _STATUS_NOT_FOUND
                     control_characteristic.notify(
diff --git a/micropython/bluetooth/aioble/multitests/ble_descriptor.py b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
index 2354dff6b..c45f1413c 100644
--- a/micropython/bluetooth/aioble/multitests/ble_descriptor.py
+++ b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
@@ -32,9 +32,7 @@ async def instance0_task():
     char1_desc1.write("char1_desc1")
     char1_desc2 = aioble.Descriptor(char1, CHAR1_DESC2_UUID, read=True, write=True)
     char1_desc2.write("char1_desc2")
-    char2 = aioble.Characteristic(
-        service, CHAR2_UUID, read=True, write=True, notify=True, indicate=True
-    )
+    aioble.Characteristic(service, CHAR2_UUID, read=True, write=True, notify=True, indicate=True)
     char3 = aioble.Characteristic(
         service, CHAR3_UUID, read=True, write=True, notify=True, indicate=True
     )
diff --git a/micropython/espflash/espflash.py b/micropython/espflash/espflash.py
index cc025836c..6d9583405 100644
--- a/micropython/espflash/espflash.py
+++ b/micropython/espflash/espflash.py
@@ -258,7 +258,6 @@ def flash_write_file(self, path, blksize=0x1000):
         print(f"Flash write size: {size} total_blocks: {total_blocks} block size: {blksize}")
         with open(path, "rb") as f:
             seq = 0
-            subseq = 0
             for i in range(total_blocks):
                 buf = f.read(blksize)
                 # Update digest
diff --git a/micropython/ucontextlib/tests.py b/micropython/ucontextlib/tests.py
index 4fd026ae7..163175d82 100644
--- a/micropython/ucontextlib/tests.py
+++ b/micropython/ucontextlib/tests.py
@@ -24,7 +24,7 @@ def test_context_manager(self):
     def test_context_manager_on_error(self):
         exc = Exception()
         try:
-            with self._manager(123) as x:
+            with self._manager(123):
                 raise exc
         except Exception as e:
             self.assertEqual(exc, e)
diff --git a/micropython/udnspkt/udnspkt.py b/micropython/udnspkt/udnspkt.py
index e55285975..2cb11ab92 100644
--- a/micropython/udnspkt/udnspkt.py
+++ b/micropython/udnspkt/udnspkt.py
@@ -43,36 +43,28 @@ def parse_resp(buf, is_ipv6):
     if is_ipv6:
         typ = 28  # AAAA
 
-    id = buf.readbin(">H")
+    buf.readbin(">H")  # id
     flags = buf.readbin(">H")
     assert flags & 0x8000
-    qcnt = buf.readbin(">H")
+    buf.readbin(">H")  # qcnt
     acnt = buf.readbin(">H")
-    nscnt = buf.readbin(">H")
-    addcnt = buf.readbin(">H")
-    # print(qcnt, acnt, nscnt, addcnt)
+    buf.readbin(">H")  # nscnt
+    buf.readbin(">H")  # addcnt
 
     skip_fqdn(buf)
-    v = buf.readbin(">H")
-    # print(v)
-    v = buf.readbin(">H")
-    # print(v)
+    buf.readbin(">H")
+    buf.readbin(">H")
 
     for i in range(acnt):
         # print("Resp #%d" % i)
         # v = read_fqdn(buf)
         # print(v)
         skip_fqdn(buf)
-        t = buf.readbin(">H")
-        # print("Type", t)
-        v = buf.readbin(">H")
-        # print("Class", v)
-        v = buf.readbin(">I")
-        # print("TTL", v)
+        t = buf.readbin(">H")  # Type
+        buf.readbin(">H")  # Class
+        buf.readbin(">I")  # TTL
         rlen = buf.readbin(">H")
-        # print("rlen", rlen)
         rval = buf.read(rlen)
-        # print(rval)
 
         if t == typ:
             return rval
diff --git a/micropython/urllib.urequest/urllib/urequest.py b/micropython/urllib.urequest/urllib/urequest.py
index 2eff43c36..5154c0f05 100644
--- a/micropython/urllib.urequest/urllib/urequest.py
+++ b/micropython/urllib.urequest/urllib/urequest.py
@@ -48,10 +48,10 @@ def urlopen(url, data=None, method="GET"):
         if data:
             s.write(data)
 
-        l = s.readline()
-        l = l.split(None, 2)
+        l = s.readline()  # Status-Line
+        # l = l.split(None, 2)
         # print(l)
-        status = int(l[1])
+        # status = int(l[1])  # FIXME: Status-Code element is not currently checked
         while True:
             l = s.readline()
             if not l or l == b"\r\n":
diff --git a/pyproject.toml b/pyproject.toml
index 3b2524545..15bb05375 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -63,7 +63,6 @@ ignore = [
   "F405",
   "E501",
   "F541",
-  "F841",
   "ISC001",
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
index 23d227a6f..79a676de7 100644
--- a/python-ecosys/aiohttp/aiohttp/__init__.py
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -104,7 +104,6 @@ async def __aexit__(self, *args):
 
     async def _request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}):
         redir_cnt = 0
-        redir_url = None
         while redir_cnt < 2:
             reader = await self.request_raw(method, url, data, json, ssl, params, headers)
             _headers = []
diff --git a/python-ecosys/cbor2/cbor2/_decoder.py b/python-ecosys/cbor2/cbor2/_decoder.py
index e38f078f3..5d509a535 100644
--- a/python-ecosys/cbor2/cbor2/_decoder.py
+++ b/python-ecosys/cbor2/cbor2/_decoder.py
@@ -159,7 +159,7 @@ def decode_simple_value(decoder):
 
 
 def decode_float16(decoder):
-    payload = decoder.read(2)
+    decoder.read(2)
     raise NotImplementedError  # no float16 unpack function
 
 

From 992eecfed416b042ba5ef80c0b0bf2ca3887549f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 May 2024 15:47:26 +1000
Subject: [PATCH 255/343] all: Enable Ruff lint F541 'f-string without any
 placeholders'.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/espflash/espflash.py                | 6 +++---
 micropython/lora/lora-async/lora/async_modem.py | 2 +-
 pyproject.toml                                  | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/micropython/espflash/espflash.py b/micropython/espflash/espflash.py
index 6d9583405..74988777a 100644
--- a/micropython/espflash/espflash.py
+++ b/micropython/espflash/espflash.py
@@ -235,7 +235,7 @@ def flash_read_size(self):
 
     def flash_attach(self):
         self._command(_CMD_SPI_ATTACH, struct.pack("<II", 0, 0))
-        print(f"Flash attached")
+        print("Flash attached")
 
     def flash_config(self, flash_size=2 * 1024 * 1024):
         self._command(
@@ -288,7 +288,7 @@ def flash_write_file(self, path, blksize=0x1000):
     def flash_verify_file(self, path, digest=None, offset=0):
         if digest is None:
             if self.md5sum is None:
-                raise Exception(f"MD5 checksum missing.")
+                raise Exception("MD5 checksum missing.")
             digest = binascii.hexlify(self.md5sum.digest())
 
         size = os.stat(path)[6]
@@ -300,7 +300,7 @@ def flash_verify_file(self, path, digest=None, offset=0):
         if digest == data[0:32]:
             print("Firmware verified.")
         else:
-            raise Exception(f"Firmware verification failed.")
+            raise Exception("Firmware verification failed.")
 
     def reboot(self):
         payload = struct.pack("<I", 0)
diff --git a/micropython/lora/lora-async/lora/async_modem.py b/micropython/lora/lora-async/lora/async_modem.py
index e46d625fb..ce9423f84 100644
--- a/micropython/lora/lora-async/lora/async_modem.py
+++ b/micropython/lora/lora-async/lora/async_modem.py
@@ -109,7 +109,7 @@ async def _wait(self, will_irq, idx, timeout_ms):
             await asyncio.sleep_ms(timeout_ms)
 
         if _DEBUG:
-            print(f"wait complete")
+            print("wait complete")
 
     def _callback(self):
         # IRQ callback from BaseModem._radio_isr. May be in Hard IRQ context.
diff --git a/pyproject.toml b/pyproject.toml
index 15bb05375..1c4d781ad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,6 @@ ignore = [
   "F403",
   "F405",
   "E501",
-  "F541",
   "ISC001",
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith

From 00fc3fd37b448c032cb270da35f3a2706e0044da Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 14 May 2024 15:38:47 +1000
Subject: [PATCH 256/343] all: Enable ruff E401 and E402 import lints.

Mostly small cleanups to put each top-level import on its own line.  But
explicitly disable the lint for examples/tests which insert the current
directory into the path before importing.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .../bluetooth/aioble/examples/l2cap_file_client.py        | 1 +
 .../bluetooth/aioble/examples/l2cap_file_server.py        | 1 +
 micropython/bluetooth/aioble/examples/temp_client.py      | 1 +
 micropython/bluetooth/aioble/examples/temp_sensor.py      | 1 +
 .../aioble/multitests/ble_buffered_characteristic.py      | 4 +++-
 .../bluetooth/aioble/multitests/ble_characteristic.py     | 4 +++-
 micropython/bluetooth/aioble/multitests/ble_descriptor.py | 4 +++-
 micropython/bluetooth/aioble/multitests/ble_notify.py     | 4 +++-
 micropython/bluetooth/aioble/multitests/ble_shutdown.py   | 4 +++-
 .../bluetooth/aioble/multitests/ble_write_capture.py      | 4 +++-
 .../bluetooth/aioble/multitests/ble_write_order.py        | 4 +++-
 .../bluetooth/aioble/multitests/perf_gatt_notify.py       | 4 +++-
 micropython/bluetooth/aioble/multitests/perf_l2cap.py     | 4 +++-
 micropython/drivers/display/lcd160cr/lcd160cr.py          | 3 ++-
 micropython/drivers/display/lcd160cr/lcd160cr_test.py     | 5 ++++-
 micropython/drivers/storage/sdcard/sdtest.py              | 4 +++-
 pyproject.toml                                            | 8 +++-----
 python-ecosys/aiohttp/aiohttp/__init__.py                 | 3 ++-
 python-ecosys/aiohttp/examples/client.py                  | 1 +
 python-ecosys/aiohttp/examples/compression.py             | 1 +
 python-ecosys/aiohttp/examples/get.py                     | 1 +
 python-ecosys/aiohttp/examples/headers.py                 | 1 +
 python-ecosys/aiohttp/examples/methods.py                 | 1 +
 python-ecosys/aiohttp/examples/params.py                  | 1 +
 python-ecosys/aiohttp/examples/ws.py                      | 1 +
 python-ecosys/aiohttp/examples/ws_repl_echo.py            | 1 +
 python-ecosys/iperf3/iperf3.py                            | 7 +++++--
 27 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_client.py b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
index 54b357d4f..2a75bc308 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_client.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
@@ -5,6 +5,7 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_server.py b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
index c6aef6587..0c45bd1ff 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_server.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
@@ -16,6 +16,7 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
diff --git a/micropython/bluetooth/aioble/examples/temp_client.py b/micropython/bluetooth/aioble/examples/temp_client.py
index ceb1d0465..56715838c 100644
--- a/micropython/bluetooth/aioble/examples/temp_client.py
+++ b/micropython/bluetooth/aioble/examples/temp_client.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
diff --git a/micropython/bluetooth/aioble/examples/temp_sensor.py b/micropython/bluetooth/aioble/examples/temp_sensor.py
index 46cb966e4..bdd8c1c5e 100644
--- a/micropython/bluetooth/aioble/examples/temp_sensor.py
+++ b/micropython/bluetooth/aioble/examples/temp_sensor.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
diff --git a/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
index 18ce7da64..91307908f 100644
--- a/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
+++ b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/ble_characteristic.py b/micropython/bluetooth/aioble/multitests/ble_characteristic.py
index 145cf5f80..b5d1df2fe 100644
--- a/micropython/bluetooth/aioble/multitests/ble_characteristic.py
+++ b/micropython/bluetooth/aioble/multitests/ble_characteristic.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/ble_descriptor.py b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
index c45f1413c..888222ff5 100644
--- a/micropython/bluetooth/aioble/multitests/ble_descriptor.py
+++ b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/ble_notify.py b/micropython/bluetooth/aioble/multitests/ble_notify.py
index be2779e40..200e784c2 100644
--- a/micropython/bluetooth/aioble/multitests/ble_notify.py
+++ b/micropython/bluetooth/aioble/multitests/ble_notify.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/ble_shutdown.py b/micropython/bluetooth/aioble/multitests/ble_shutdown.py
index e7ab58570..dea915bfb 100644
--- a/micropython/bluetooth/aioble/multitests/ble_shutdown.py
+++ b/micropython/bluetooth/aioble/multitests/ble_shutdown.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_capture.py b/micropython/bluetooth/aioble/multitests/ble_write_capture.py
index 96291a196..23c6d4422 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_capture.py
+++ b/micropython/bluetooth/aioble/multitests/ble_write_capture.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_order.py b/micropython/bluetooth/aioble/multitests/ble_write_order.py
index 8bd15e400..10b44bca1 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_order.py
+++ b/micropython/bluetooth/aioble/multitests/ble_write_order.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
index 193ac69d3..d601a0ee2 100644
--- a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
+++ b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
@@ -2,10 +2,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/bluetooth/aioble/multitests/perf_l2cap.py b/micropython/bluetooth/aioble/multitests/perf_l2cap.py
index 32810d15b..9ccf54262 100644
--- a/micropython/bluetooth/aioble/multitests/perf_l2cap.py
+++ b/micropython/bluetooth/aioble/multitests/perf_l2cap.py
@@ -1,9 +1,11 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
-import time, machine
+import machine
+import time
 
 import uasyncio as asyncio
 import aioble
diff --git a/micropython/drivers/display/lcd160cr/lcd160cr.py b/micropython/drivers/display/lcd160cr/lcd160cr.py
index f792418aa..b86cbff0d 100644
--- a/micropython/drivers/display/lcd160cr/lcd160cr.py
+++ b/micropython/drivers/display/lcd160cr/lcd160cr.py
@@ -2,9 +2,10 @@
 # MIT license; Copyright (c) 2017 Damien P. George
 
 from micropython import const
+import machine
 from utime import sleep_ms
 from ustruct import calcsize, pack_into
-import uerrno, machine
+import uerrno
 
 # for set_orient
 PORTRAIT = const(0)
diff --git a/micropython/drivers/display/lcd160cr/lcd160cr_test.py b/micropython/drivers/display/lcd160cr/lcd160cr_test.py
index c717a3fd5..b2a9c0c6a 100644
--- a/micropython/drivers/display/lcd160cr/lcd160cr_test.py
+++ b/micropython/drivers/display/lcd160cr/lcd160cr_test.py
@@ -1,7 +1,10 @@
 # Driver test for official MicroPython LCD160CR display
 # MIT license; Copyright (c) 2017 Damien P. George
 
-import time, math, framebuf, lcd160cr
+import framebuf
+import lcd160cr
+import math
+import time
 
 
 def get_lcd(lcd):
diff --git a/micropython/drivers/storage/sdcard/sdtest.py b/micropython/drivers/storage/sdcard/sdtest.py
index 018ef7c64..ce700e2a8 100644
--- a/micropython/drivers/storage/sdcard/sdtest.py
+++ b/micropython/drivers/storage/sdcard/sdtest.py
@@ -1,6 +1,8 @@
 # Test for sdcard block protocol
 # Peter hinch 30th Jan 2016
-import os, sdcard, machine
+import machine
+import os
+import sdcard
 
 
 def sdtest():
diff --git a/pyproject.toml b/pyproject.toml
index 1c4d781ad..4776ddfe9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,14 +54,12 @@ select = [
   # "UP",   # pyupgrade
 ]
 ignore = [
-  "E401",
-  "E402",
   "E722",
-  "E741",
+  "E741",  # 'l' is currently widely used
   "F401",
   "F403",
   "F405",
-  "E501",
+  "E501",  # line length, recommended to disable
   "ISC001",
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
@@ -74,7 +72,7 @@ ignore = [
   "PLW2901",
   "RUF012",
   "RUF100",
-  "W191",
+  "W191",  # tab-indent, redundant when using formatter
 ]
 line-length = 99
 target-version = "py37"
diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
index 79a676de7..1565163c4 100644
--- a/python-ecosys/aiohttp/aiohttp/__init__.py
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -22,7 +22,8 @@ def _decode(self, data):
         c_encoding = self.headers.get("Content-Encoding")
         if c_encoding in ("gzip", "deflate", "gzip,deflate"):
             try:
-                import deflate, io
+                import deflate
+                import io
 
                 if c_encoding == "deflate":
                     with deflate.DeflateIO(io.BytesIO(data), deflate.ZLIB) as d:
diff --git a/python-ecosys/aiohttp/examples/client.py b/python-ecosys/aiohttp/examples/client.py
index 471737b26..0a6476064 100644
--- a/python-ecosys/aiohttp/examples/client.py
+++ b/python-ecosys/aiohttp/examples/client.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/compression.py b/python-ecosys/aiohttp/examples/compression.py
index 21f9cf7fd..a1c6276b2 100644
--- a/python-ecosys/aiohttp/examples/compression.py
+++ b/python-ecosys/aiohttp/examples/compression.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/get.py b/python-ecosys/aiohttp/examples/get.py
index 43507a6e7..087d6fb51 100644
--- a/python-ecosys/aiohttp/examples/get.py
+++ b/python-ecosys/aiohttp/examples/get.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/headers.py b/python-ecosys/aiohttp/examples/headers.py
index c3a92fc49..ec5c00a80 100644
--- a/python-ecosys/aiohttp/examples/headers.py
+++ b/python-ecosys/aiohttp/examples/headers.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/methods.py b/python-ecosys/aiohttp/examples/methods.py
index 118777c4e..af38ff652 100644
--- a/python-ecosys/aiohttp/examples/methods.py
+++ b/python-ecosys/aiohttp/examples/methods.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/params.py b/python-ecosys/aiohttp/examples/params.py
index 8c47e2097..9aecb2ab8 100644
--- a/python-ecosys/aiohttp/examples/params.py
+++ b/python-ecosys/aiohttp/examples/params.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/ws.py b/python-ecosys/aiohttp/examples/ws.py
index e989a39c5..b96ee6819 100644
--- a/python-ecosys/aiohttp/examples/ws.py
+++ b/python-ecosys/aiohttp/examples/ws.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/aiohttp/examples/ws_repl_echo.py b/python-ecosys/aiohttp/examples/ws_repl_echo.py
index 9393620e3..c41a4ee5e 100644
--- a/python-ecosys/aiohttp/examples/ws_repl_echo.py
+++ b/python-ecosys/aiohttp/examples/ws_repl_echo.py
@@ -1,5 +1,6 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.insert(0, ".")
 import aiohttp
 import asyncio
diff --git a/python-ecosys/iperf3/iperf3.py b/python-ecosys/iperf3/iperf3.py
index a5c54445d..363d10d59 100644
--- a/python-ecosys/iperf3/iperf3.py
+++ b/python-ecosys/iperf3/iperf3.py
@@ -12,9 +12,12 @@
     iperf3.client('192.168.1.5', udp=True, reverse=True)
 """
 
-import sys, struct
-import time, select, socket
 import json
+import select
+import socket
+import struct
+import sys
+import time
 
 # Provide a urandom() function, supporting devices without os.urandom().
 try:

From 2b0d7610cef301881fea2c1e8994227367196093 Mon Sep 17 00:00:00 2001
From: AuroraTea <1352685369@qq.com>
Date: Sun, 14 Apr 2024 16:35:52 +0800
Subject: [PATCH 257/343] aiohttp: Fix type of header's Sec-WebSocket-Key.

The function `binascii.b2a_base64()` returns a `bytes`, but here needs a
string.  Otherwise, the value of `Sec-WebSocket-Key` in the headers will be
`b'<BASE64-ENCODED_RANDOM_VALUE>'`.

Signed-off-by: AuroraTea <1352685369@qq.com>
---
 python-ecosys/aiohttp/aiohttp/aiohttp_ws.py | 4 ++--
 python-ecosys/aiohttp/manifest.py           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
index e5575a11c..07d833730 100644
--- a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
+++ b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
@@ -86,7 +86,7 @@ def _parse_frame_header(cls, header):
 
     def _process_websocket_frame(self, opcode, payload):
         if opcode == self.TEXT:
-            payload = payload.decode()
+            payload = str(payload, "utf-8")
         elif opcode == self.BINARY:
             pass
         elif opcode == self.CLOSE:
@@ -143,7 +143,7 @@ async def handshake(self, uri, ssl, req):
         headers["Host"] = f"{uri.hostname}:{uri.port}"
         headers["Connection"] = "Upgrade"
         headers["Upgrade"] = "websocket"
-        headers["Sec-WebSocket-Key"] = key
+        headers["Sec-WebSocket-Key"] = str(key, "utf-8")
         headers["Sec-WebSocket-Version"] = "13"
         headers["Origin"] = f"{_http_proto}://{uri.hostname}:{uri.port}"
 
diff --git a/python-ecosys/aiohttp/manifest.py b/python-ecosys/aiohttp/manifest.py
index 9cb2ef50f..748970e5b 100644
--- a/python-ecosys/aiohttp/manifest.py
+++ b/python-ecosys/aiohttp/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="HTTP client module for MicroPython asyncio module",
-    version="0.0.2",
+    version="0.0.3",
     pypi="aiohttp",
 )
 

From 191494ede7fb11585b2cba418f5eeee8d3d3aab0 Mon Sep 17 00:00:00 2001
From: Stephen More <stephen.more@gmail.com>
Date: Mon, 25 Mar 2024 08:49:00 -0400
Subject: [PATCH 258/343] aioble/examples/temp_sensor.py: Properly notify on
 update.

This ensures that the peripheral notifies subscribed clients when the
characteristic is written to.

Signed-off-by: Stephen More <stephen.more@gmail.com>
---
 micropython/bluetooth/aioble/examples/temp_sensor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/bluetooth/aioble/examples/temp_sensor.py b/micropython/bluetooth/aioble/examples/temp_sensor.py
index bdd8c1c5e..8ab3df700 100644
--- a/micropython/bluetooth/aioble/examples/temp_sensor.py
+++ b/micropython/bluetooth/aioble/examples/temp_sensor.py
@@ -40,7 +40,7 @@ def _encode_temperature(temp_deg_c):
 async def sensor_task():
     t = 24.5
     while True:
-        temp_characteristic.write(_encode_temperature(t))
+        temp_characteristic.write(_encode_temperature(t), send_update=True)
         t += random.uniform(-0.5, 0.5)
         await asyncio.sleep_ms(1000)
 

From d4362d5cc3a6d90fabc9a684e1e7c5a29cc47f6e Mon Sep 17 00:00:00 2001
From: Stephen More <stephen.more@gmail.com>
Date: Mon, 25 Mar 2024 16:10:09 -0400
Subject: [PATCH 259/343] aioble/examples/temp_sensor.py: Wait forever for
 client to disconnect.

This sets the disconnected timeout to None, so that the peripheral waits
forever for the client to disconnect.  Previously the peripheral would
abort the connection after 60 seconds (because that's the default timeout).

Signed-off-by: Stephen More <stephen.more@gmail.com>
---
 micropython/bluetooth/aioble/examples/temp_sensor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/bluetooth/aioble/examples/temp_sensor.py b/micropython/bluetooth/aioble/examples/temp_sensor.py
index 8ab3df700..29f774bee 100644
--- a/micropython/bluetooth/aioble/examples/temp_sensor.py
+++ b/micropython/bluetooth/aioble/examples/temp_sensor.py
@@ -56,7 +56,7 @@ async def peripheral_task():
             appearance=_ADV_APPEARANCE_GENERIC_THERMOMETER,
         ) as connection:
             print("Connection from", connection.device)
-            await connection.disconnected()
+            await connection.disconnected(timeout_ms=None)
 
 
 # Run both tasks.

From da46c4b9f7b4dd590c8223ee860d33d28c965e79 Mon Sep 17 00:00:00 2001
From: Brian Pugh <bnp117@gmail.com>
Date: Fri, 19 May 2023 09:10:09 -0700
Subject: [PATCH 260/343] pathlib: Add __rtruediv__ magic method to
 pathlib.Path.

MicroPython now supports this behaviour of __rtruediv__.
---
 python-stdlib/pathlib/pathlib.py            |  3 +++
 python-stdlib/pathlib/tests/test_pathlib.py | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/python-stdlib/pathlib/pathlib.py b/python-stdlib/pathlib/pathlib.py
index d01d81d32..e0f961373 100644
--- a/python-stdlib/pathlib/pathlib.py
+++ b/python-stdlib/pathlib/pathlib.py
@@ -47,6 +47,9 @@ def __init__(self, *segments):
     def __truediv__(self, other):
         return Path(self._path, str(other))
 
+    def __rtruediv__(self, other):
+        return Path(other, self._path)
+
     def __repr__(self):
         return f'{type(self).__name__}("{self._path}")'
 
diff --git a/python-stdlib/pathlib/tests/test_pathlib.py b/python-stdlib/pathlib/tests/test_pathlib.py
index c52cd9705..e632e1242 100644
--- a/python-stdlib/pathlib/tests/test_pathlib.py
+++ b/python-stdlib/pathlib/tests/test_pathlib.py
@@ -322,3 +322,14 @@ def test_with_suffix(self):
         self.assertTrue(Path("foo/test").with_suffix(".tar") == Path("foo/test.tar"))
         self.assertTrue(Path("foo/bar.bin").with_suffix(".txt") == Path("foo/bar.txt"))
         self.assertTrue(Path("bar.txt").with_suffix("") == Path("bar"))
+
+    def test_rtruediv(self):
+        """Works as of micropython ea7031f"""
+        res = "foo" / Path("bar")
+        self.assertTrue(res == Path("foo/bar"))
+
+    def test_rtruediv_inplace(self):
+        """Works as of micropython ea7031f"""
+        res = "foo"
+        res /= Path("bar")
+        self.assertTrue(res == Path("foo/bar"))

From f0b683218efafae904db060eff48d58eaf59c142 Mon Sep 17 00:00:00 2001
From: Rob Knegjens <rob@knegjens.net>
Date: Tue, 5 Apr 2022 12:05:06 -0700
Subject: [PATCH 261/343] aioble/examples/temp_client.py: Check connection
 before reading temp.

Only read from the temp characteristic if the connection is still active.
Improves the example by avoiding a TypeError exception if/when the sensor
disconnects.
---
 micropython/bluetooth/aioble/examples/temp_client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/bluetooth/aioble/examples/temp_client.py b/micropython/bluetooth/aioble/examples/temp_client.py
index 56715838c..42752d8c9 100644
--- a/micropython/bluetooth/aioble/examples/temp_client.py
+++ b/micropython/bluetooth/aioble/examples/temp_client.py
@@ -55,7 +55,7 @@ async def main():
             print("Timeout discovering services/characteristics")
             return
 
-        while True:
+        while connection.is_connected():
             temp_deg_c = _decode_temperature(await temp_characteristic.read())
             print("Temperature: {:.2f}".format(temp_deg_c))
             await asyncio.sleep_ms(1000)

From e7f605df335f5d30bb1f534981aa42f95935e8d3 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 16 Sep 2022 12:11:25 +1000
Subject: [PATCH 262/343] aioble/device.py: Always create connection._event.

If the client disconnects immediately after connection, the irq can be run
before the initial connect handler has finished.
---
 micropython/bluetooth/aioble/aioble/device.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/micropython/bluetooth/aioble/aioble/device.py b/micropython/bluetooth/aioble/aioble/device.py
index 265d62157..30a54a4fd 100644
--- a/micropython/bluetooth/aioble/aioble/device.py
+++ b/micropython/bluetooth/aioble/aioble/device.py
@@ -164,7 +164,7 @@ def __init__(self, device):
 
         # This event is fired by the IRQ both for connection and disconnection
         # and controls the device_task.
-        self._event = None
+        self._event = asyncio.ThreadSafeFlag()
 
         # If we're waiting for a pending MTU exchange.
         self._mtu_event = None
@@ -207,9 +207,6 @@ async def device_task(self):
             t._task.cancel()
 
     def _run_task(self):
-        # Event will be already created this if we initiated connection.
-        self._event = self._event or asyncio.ThreadSafeFlag()
-
         self._task = asyncio.create_task(self.device_task())
 
     async def disconnect(self, timeout_ms=2000):

From db7f9a18d4833275637bb53411d6671cd83bc533 Mon Sep 17 00:00:00 2001
From: Rob Knegjens <rob@knegjens.net>
Date: Wed, 6 Apr 2022 13:27:24 -0700
Subject: [PATCH 263/343] aioble/device.py: Make default timeout None for
 disconnected() method.

The value for the `timeout_ms` optional argument to
`DeviceConnection.disconnected()` async method is changed from 60000 to
None.  This way users awaiting a device disconnection using `await
connection.disconnected()` won't be surprised by a 1 minute timeout.
---
 micropython/bluetooth/aioble-core/manifest.py | 2 +-
 micropython/bluetooth/aioble/aioble/device.py | 2 +-
 micropython/bluetooth/aioble/manifest.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/micropython/bluetooth/aioble-core/manifest.py b/micropython/bluetooth/aioble-core/manifest.py
index 2448769e6..c2d335b5c 100644
--- a/micropython/bluetooth/aioble-core/manifest.py
+++ b/micropython/bluetooth/aioble-core/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.3.0")
 
 package(
     "aioble",
diff --git a/micropython/bluetooth/aioble/aioble/device.py b/micropython/bluetooth/aioble/aioble/device.py
index 30a54a4fd..8844eb42a 100644
--- a/micropython/bluetooth/aioble/aioble/device.py
+++ b/micropython/bluetooth/aioble/aioble/device.py
@@ -212,7 +212,7 @@ def _run_task(self):
     async def disconnect(self, timeout_ms=2000):
         await self.disconnected(timeout_ms, disconnect=True)
 
-    async def disconnected(self, timeout_ms=60000, disconnect=False):
+    async def disconnected(self, timeout_ms=None, disconnect=False):
         if not self.is_connected():
             return
 
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 2979a726b..565d6060f 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.4.1")
+metadata(version="0.5.0")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From e5389eb26ab4a48a0414b3a7a6d83bd7fadf1abe Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@gmail.com>
Date: Wed, 10 Jan 2024 13:40:24 -0800
Subject: [PATCH 264/343] aioble/peripheral.py: Place multiple UUIDs in single
 advertisement LTV.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When multiple UUIDs of the same size are advertised, they should all be
listed in a single LTV.  Supplement to the Bluetooth Core Specification,
Part A, §1.1.1:  "A packet or data block shall not contain more than one
instance for each Service UUID data size."

When aioble construct the advertisement data, it is creating a new data
block for each UUID that contains only that single UUID.  Rather than,
e.g., a single 16-bit UUID block with a list of multiple UUIDs.

Not only is this against the specification, it wastes two bytes of limited
advertisement space per UUID beyond the first for the repeated data block
length and type fields.

Fix this by grouping each UUID size together.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
---
 .../bluetooth/aioble-peripheral/manifest.py       |  2 +-
 micropython/bluetooth/aioble/aioble/peripheral.py | 15 +++++++--------
 micropython/bluetooth/aioble/manifest.py          |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/micropython/bluetooth/aioble-peripheral/manifest.py b/micropython/bluetooth/aioble-peripheral/manifest.py
index dd4dd122d..0aec4d21e 100644
--- a/micropython/bluetooth/aioble-peripheral/manifest.py
+++ b/micropython/bluetooth/aioble-peripheral/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/aioble/peripheral.py b/micropython/bluetooth/aioble/aioble/peripheral.py
index 099f2c557..a156ccd21 100644
--- a/micropython/bluetooth/aioble/aioble/peripheral.py
+++ b/micropython/bluetooth/aioble/aioble/peripheral.py
@@ -129,14 +129,13 @@ async def advertise(
         # Services are prioritised to go in the advertising data because iOS supports
         # filtering scan results by service only, so services must come first.
         if services:
-            for uuid in services:
-                b = bytes(uuid)
-                if len(b) == 2:
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID16_COMPLETE, b)
-                elif len(b) == 4:
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID32_COMPLETE, b)
-                elif len(b) == 16:
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID128_COMPLETE, b)
+            for uuid_len, code in (
+                (2, _ADV_TYPE_UUID16_COMPLETE),
+                (4, _ADV_TYPE_UUID32_COMPLETE),
+                (16, _ADV_TYPE_UUID128_COMPLETE),
+            ):
+                if uuids := [bytes(uuid) for uuid in services if len(bytes(uuid)) == uuid_len]:
+                    resp_data = _append(adv_data, resp_data, code, b"".join(uuids))
 
         if name:
             resp_data = _append(adv_data, resp_data, _ADV_TYPE_NAME, name)
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 565d6060f..8a9df1aac 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.5.0")
+metadata(version="0.5.1")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From 46e243c592ab12d905248a2138e4910e25a88ace Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 May 2024 17:37:41 +1000
Subject: [PATCH 265/343] aioble/central.py: Fix ScanResult.services when
 decoding UUIDs.

Fixes are needed to support the cases of:
- There may be more than one UUID per advertising field.
- The UUID advertising field may be empty (no UUIDs).
- Constructing 32-bit `bluetooth.UUID()` entities, which must be done by
  passing in a 4-byte bytes object, not an integer.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/bluetooth/aioble-central/manifest.py |  2 +-
 micropython/bluetooth/aioble/aioble/central.py   | 14 ++++++++------
 micropython/bluetooth/aioble/manifest.py         |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/micropython/bluetooth/aioble-central/manifest.py b/micropython/bluetooth/aioble-central/manifest.py
index 128c90642..9564ecf77 100644
--- a/micropython/bluetooth/aioble-central/manifest.py
+++ b/micropython/bluetooth/aioble-central/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.1")
+metadata(version="0.2.2")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/aioble/central.py b/micropython/bluetooth/aioble/aioble/central.py
index adfc9729e..2f1492d08 100644
--- a/micropython/bluetooth/aioble/aioble/central.py
+++ b/micropython/bluetooth/aioble/aioble/central.py
@@ -195,12 +195,14 @@ def name(self):
 
     # Generator that enumerates the service UUIDs that are advertised.
     def services(self):
-        for u in self._decode_field(_ADV_TYPE_UUID16_INCOMPLETE, _ADV_TYPE_UUID16_COMPLETE):
-            yield bluetooth.UUID(struct.unpack("<H", u)[0])
-        for u in self._decode_field(_ADV_TYPE_UUID32_INCOMPLETE, _ADV_TYPE_UUID32_COMPLETE):
-            yield bluetooth.UUID(struct.unpack("<I", u)[0])
-        for u in self._decode_field(_ADV_TYPE_UUID128_INCOMPLETE, _ADV_TYPE_UUID128_COMPLETE):
-            yield bluetooth.UUID(u)
+        for uuid_len, codes in (
+            (2, (_ADV_TYPE_UUID16_INCOMPLETE, _ADV_TYPE_UUID16_COMPLETE)),
+            (4, (_ADV_TYPE_UUID32_INCOMPLETE, _ADV_TYPE_UUID32_COMPLETE)),
+            (16, (_ADV_TYPE_UUID128_INCOMPLETE, _ADV_TYPE_UUID128_COMPLETE)),
+        ):
+            for u in self._decode_field(*codes):
+                for i in range(0, len(u), uuid_len):
+                    yield bluetooth.UUID(u[i : i + uuid_len])
 
     # Generator that returns (manufacturer_id, data) tuples.
     def manufacturer(self, filter=None):
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 8a9df1aac..824647429 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.5.1")
+metadata(version="0.5.2")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From 63736c182a7a28ba3b94bbca5ce4ca20be5580c6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 May 2024 17:45:42 +1000
Subject: [PATCH 266/343] aioble/multitests: Add test for advertising and
 scanning services.

This tests both encoding and decoding multiple 16-bit and 32-bit services
within the one advertising field.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../multitests/ble_advertise_services.py      | 71 +++++++++++++++++++
 .../multitests/ble_advertise_services.py.exp  |  8 +++
 2 files changed, 79 insertions(+)
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_advertise_services.py
 create mode 100644 micropython/bluetooth/aioble/multitests/ble_advertise_services.py.exp

diff --git a/micropython/bluetooth/aioble/multitests/ble_advertise_services.py b/micropython/bluetooth/aioble/multitests/ble_advertise_services.py
new file mode 100644
index 000000000..d849c387f
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_advertise_services.py
@@ -0,0 +1,71 @@
+# Test advertising multiple services, and scanning them.
+
+import sys
+
+# ruff: noqa: E402
+sys.path.append("")
+
+import asyncio
+import aioble
+import bluetooth
+
+TIMEOUT_MS = 5000
+
+_SERVICE_16_A = bluetooth.UUID(0x180F)  # Battery Service
+_SERVICE_16_B = bluetooth.UUID(0x181A)  # Environmental Sensing Service
+_SERVICE_32_A = bluetooth.UUID("AB12")  # random
+_SERVICE_32_B = bluetooth.UUID("CD34")  # random
+
+
+# Acting in peripheral role (advertising).
+async def instance0_task():
+    multitest.globals(BDADDR=aioble.config("mac"))
+    multitest.next()
+
+    # Advertise, and wait for central to connect to us.
+    print("advertise")
+    async with await aioble.advertise(
+        20_000,
+        name="MPY",
+        services=[_SERVICE_16_A, _SERVICE_16_B, _SERVICE_32_A, _SERVICE_32_B],
+        timeout_ms=TIMEOUT_MS,
+    ) as connection:
+        print("connected")
+        await connection.disconnected()
+        print("disconnected")
+
+
+def instance0():
+    try:
+        asyncio.run(instance0_task())
+    finally:
+        aioble.stop()
+
+
+# Acting in central role (scanning).
+async def instance1_task():
+    multitest.next()
+
+    wanted_device = aioble.Device(*BDADDR)
+
+    # Scan for the wanted device/peripheral and print its advertised services.
+    async with aioble.scan(5000, interval_us=30000, window_us=30000, active=True) as scanner:
+        async for result in scanner:
+            if result.device == wanted_device:
+                services = list(result.services())
+                if services:
+                    print(services)
+                    break
+
+    # Connect to peripheral and then disconnect.
+    print("connect")
+    device = aioble.Device(*BDADDR)
+    async with await device.connect(timeout_ms=TIMEOUT_MS):
+        print("disconnect")
+
+
+def instance1():
+    try:
+        asyncio.run(instance1_task())
+    finally:
+        aioble.stop()
diff --git a/micropython/bluetooth/aioble/multitests/ble_advertise_services.py.exp b/micropython/bluetooth/aioble/multitests/ble_advertise_services.py.exp
new file mode 100644
index 000000000..c0b2d974a
--- /dev/null
+++ b/micropython/bluetooth/aioble/multitests/ble_advertise_services.py.exp
@@ -0,0 +1,8 @@
+--- instance0 ---
+advertise
+connected
+disconnected
+--- instance1 ---
+[UUID(0x180f), UUID(0x181a), UUID(0x32314241), UUID(0x34334443)]
+connect
+disconnect

From 1e792c39d3eb0f7bb2ddbf9b47eda479f32c9ae2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 May 2024 18:24:19 +1000
Subject: [PATCH 267/343] aioble/multitests: Adjust expected output for write
 capture test.

Testing shows that the first two writes always go through and the rest are
dropped, so update the .exp file to match that.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../bluetooth/aioble/multitests/ble_write_capture.py.exp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/bluetooth/aioble/multitests/ble_write_capture.py.exp b/micropython/bluetooth/aioble/multitests/ble_write_capture.py.exp
index dd0c6d688..366af008b 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_capture.py.exp
+++ b/micropython/bluetooth/aioble/multitests/ble_write_capture.py.exp
@@ -2,7 +2,7 @@
 advertise
 connected
 written b'central0'
-written b'central2'
+written b'central1'
 written b'central0' True
 written b'central1' True
 written b'central2' True

From 2c30a4e91bc5521a78efcd32ac04bc6ba928f4c7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 May 2024 18:24:38 +1000
Subject: [PATCH 268/343] aioble/multitests: Use multitest.output_metric for
 perf results.

The perf multitests now "pass" when run.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/bluetooth/aioble/multitests/perf_gatt_notify.py | 6 +++++-
 .../bluetooth/aioble/multitests/perf_gatt_notify.py.exp     | 4 ++++
 micropython/bluetooth/aioble/multitests/perf_l2cap.py       | 6 +++++-
 micropython/bluetooth/aioble/multitests/perf_l2cap.py.exp   | 4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
index d601a0ee2..3d3159f59 100644
--- a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
+++ b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
@@ -47,6 +47,8 @@ async def instance0_task():
         20_000, adv_data=b"\x02\x01\x06\x04\xffMPY", timeout_ms=TIMEOUT_MS
     )
 
+    print("connect")
+
     client_characteristic = await discover_server(connection)
 
     # Give the central enough time to discover chars.
@@ -61,7 +63,7 @@ async def instance0_task():
 
     ticks_end = time.ticks_ms()
     ticks_total = time.ticks_diff(ticks_end, ticks_start)
-    print(
+    multitest.output_metric(
         "Acknowledged {} notifications in {} ms. {} ms/notification.".format(
             _NUM_NOTIFICATIONS, ticks_total, ticks_total // _NUM_NOTIFICATIONS
         )
@@ -87,6 +89,8 @@ async def instance1_task():
     device = aioble.Device(*BDADDR)
     connection = await device.connect(timeout_ms=TIMEOUT_MS)
 
+    print("connect")
+
     client_characteristic = await discover_server(connection)
 
     for i in range(_NUM_NOTIFICATIONS):
diff --git a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py.exp b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py.exp
index e69de29bb..4b7d220a0 100644
--- a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py.exp
+++ b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+connect
+--- instance1 ---
+connect
diff --git a/micropython/bluetooth/aioble/multitests/perf_l2cap.py b/micropython/bluetooth/aioble/multitests/perf_l2cap.py
index 9ccf54262..e21efd6fa 100644
--- a/micropython/bluetooth/aioble/multitests/perf_l2cap.py
+++ b/micropython/bluetooth/aioble/multitests/perf_l2cap.py
@@ -32,6 +32,8 @@ async def instance0_task():
         20_000, adv_data=b"\x02\x01\x06\x04\xffMPY", timeout_ms=TIMEOUT_MS
     )
 
+    print("connect")
+
     channel = await connection.l2cap_accept(_L2CAP_PSM, _L2CAP_MTU, timeout_ms=TIMEOUT_MS)
 
     random.seed(_RANDOM_SEED)
@@ -66,6 +68,8 @@ async def instance1_task():
     device = aioble.Device(*BDADDR)
     connection = await device.connect(timeout_ms=TIMEOUT_MS)
 
+    print("connect")
+
     await asyncio.sleep_ms(500)
 
     channel = await connection.l2cap_connect(_L2CAP_PSM, _L2CAP_MTU, timeout_ms=TIMEOUT_MS)
@@ -90,7 +94,7 @@ async def instance1_task():
     ticks_end = time.ticks_ms()
     total_ticks = time.ticks_diff(ticks_end, ticks_first_byte)
 
-    print(
+    multitest.output_metric(
         "Received {}/{} bytes in {} ms. {} B/s".format(
             recv_bytes, recv_correct, total_ticks, recv_bytes * 1000 // total_ticks
         )
diff --git a/micropython/bluetooth/aioble/multitests/perf_l2cap.py.exp b/micropython/bluetooth/aioble/multitests/perf_l2cap.py.exp
index e69de29bb..4b7d220a0 100644
--- a/micropython/bluetooth/aioble/multitests/perf_l2cap.py.exp
+++ b/micropython/bluetooth/aioble/multitests/perf_l2cap.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+connect
+--- instance1 ---
+connect

From 50ed36fbeb919753bcc26ce13a8cffd7691d06ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 May 2024 21:01:58 +1000
Subject: [PATCH 269/343] pyusb: Add MicroPython implementation of PyUSB
 library.

Signed-off-by: Damien George <damien@micropython.org>
---
 unix-ffi/pyusb/examples/lsusb.py |  18 +++
 unix-ffi/pyusb/manifest.py       |   3 +
 unix-ffi/pyusb/usb/__init__.py   |   2 +
 unix-ffi/pyusb/usb/control.py    |  10 ++
 unix-ffi/pyusb/usb/core.py       | 239 +++++++++++++++++++++++++++++++
 unix-ffi/pyusb/usb/util.py       |  16 +++
 6 files changed, 288 insertions(+)
 create mode 100644 unix-ffi/pyusb/examples/lsusb.py
 create mode 100644 unix-ffi/pyusb/manifest.py
 create mode 100644 unix-ffi/pyusb/usb/__init__.py
 create mode 100644 unix-ffi/pyusb/usb/control.py
 create mode 100644 unix-ffi/pyusb/usb/core.py
 create mode 100644 unix-ffi/pyusb/usb/util.py

diff --git a/unix-ffi/pyusb/examples/lsusb.py b/unix-ffi/pyusb/examples/lsusb.py
new file mode 100644
index 000000000..549043567
--- /dev/null
+++ b/unix-ffi/pyusb/examples/lsusb.py
@@ -0,0 +1,18 @@
+# Simple example to list attached USB devices.
+
+import usb.core
+
+for device in usb.core.find(find_all=True):
+    print("ID {:04x}:{:04x}".format(device.idVendor, device.idProduct))
+    for cfg in device:
+        print(
+            "  config numitf={} value={} attr={} power={}".format(
+                cfg.bNumInterfaces, cfg.bConfigurationValue, cfg.bmAttributes, cfg.bMaxPower
+            )
+        )
+        for itf in cfg:
+            print(
+                "    interface class={} subclass={}".format(
+                    itf.bInterfaceClass, itf.bInterfaceSubClass
+                )
+            )
diff --git a/unix-ffi/pyusb/manifest.py b/unix-ffi/pyusb/manifest.py
new file mode 100644
index 000000000..d60076255
--- /dev/null
+++ b/unix-ffi/pyusb/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.0", pypi="pyusb")
+
+package("usb")
diff --git a/unix-ffi/pyusb/usb/__init__.py b/unix-ffi/pyusb/usb/__init__.py
new file mode 100644
index 000000000..19afe623c
--- /dev/null
+++ b/unix-ffi/pyusb/usb/__init__.py
@@ -0,0 +1,2 @@
+# MicroPython USB host library, compatible with PyUSB.
+# MIT license; Copyright (c) 2021-2024 Damien P. George
diff --git a/unix-ffi/pyusb/usb/control.py b/unix-ffi/pyusb/usb/control.py
new file mode 100644
index 000000000..b03a89464
--- /dev/null
+++ b/unix-ffi/pyusb/usb/control.py
@@ -0,0 +1,10 @@
+# MicroPython USB host library, compatible with PyUSB.
+# MIT license; Copyright (c) 2021-2024 Damien P. George
+
+
+def get_descriptor(dev, desc_size, desc_type, desc_index, wIndex=0):
+    wValue = desc_index | desc_type << 8
+    d = dev.ctrl_transfer(0x80, 0x06, wValue, wIndex, desc_size)
+    if len(d) < 2:
+        raise Exception("invalid descriptor")
+    return d
diff --git a/unix-ffi/pyusb/usb/core.py b/unix-ffi/pyusb/usb/core.py
new file mode 100644
index 000000000..bfb0a028d
--- /dev/null
+++ b/unix-ffi/pyusb/usb/core.py
@@ -0,0 +1,239 @@
+# MicroPython USB host library, compatible with PyUSB.
+# MIT license; Copyright (c) 2021-2024 Damien P. George
+
+import sys
+import ffi
+import uctypes
+
+if sys.maxsize >> 32:
+    UINTPTR_SIZE = 8
+    UINTPTR = uctypes.UINT64
+else:
+    UINTPTR_SIZE = 4
+    UINTPTR = uctypes.UINT32
+
+
+def _align_word(x):
+    return (x + UINTPTR_SIZE - 1) & ~(UINTPTR_SIZE - 1)
+
+
+ptr_descriptor = (0 | uctypes.ARRAY, 1 | UINTPTR)
+
+libusb_device_descriptor = {
+    "bLength": 0 | uctypes.UINT8,
+    "bDescriptorType": 1 | uctypes.UINT8,
+    "bcdUSB": 2 | uctypes.UINT16,
+    "bDeviceClass": 4 | uctypes.UINT8,
+    "bDeviceSubClass": 5 | uctypes.UINT8,
+    "bDeviceProtocol": 6 | uctypes.UINT8,
+    "bMaxPacketSize0": 7 | uctypes.UINT8,
+    "idVendor": 8 | uctypes.UINT16,
+    "idProduct": 10 | uctypes.UINT16,
+    "bcdDevice": 12 | uctypes.UINT16,
+    "iManufacturer": 14 | uctypes.UINT8,
+    "iProduct": 15 | uctypes.UINT8,
+    "iSerialNumber": 16 | uctypes.UINT8,
+    "bNumConfigurations": 17 | uctypes.UINT8,
+}
+
+libusb_config_descriptor = {
+    "bLength": 0 | uctypes.UINT8,
+    "bDescriptorType": 1 | uctypes.UINT8,
+    "wTotalLength": 2 | uctypes.UINT16,
+    "bNumInterfaces": 4 | uctypes.UINT8,
+    "bConfigurationValue": 5 | uctypes.UINT8,
+    "iConfiguration": 6 | uctypes.UINT8,
+    "bmAttributes": 7 | uctypes.UINT8,
+    "MaxPower": 8 | uctypes.UINT8,
+    "interface": _align_word(9) | UINTPTR,  # array of libusb_interface
+    "extra": (_align_word(9) + UINTPTR_SIZE) | UINTPTR,
+    "extra_length": (_align_word(9) + 2 * UINTPTR_SIZE) | uctypes.INT,
+}
+
+libusb_interface = {
+    "altsetting": 0 | UINTPTR,  # array of libusb_interface_descriptor
+    "num_altsetting": UINTPTR_SIZE | uctypes.INT,
+}
+
+libusb_interface_descriptor = {
+    "bLength": 0 | uctypes.UINT8,
+    "bDescriptorType": 1 | uctypes.UINT8,
+    "bInterfaceNumber": 2 | uctypes.UINT8,
+    "bAlternateSetting": 3 | uctypes.UINT8,
+    "bNumEndpoints": 4 | uctypes.UINT8,
+    "bInterfaceClass": 5 | uctypes.UINT8,
+    "bInterfaceSubClass": 6 | uctypes.UINT8,
+    "bInterfaceProtocol": 7 | uctypes.UINT8,
+    "iInterface": 8 | uctypes.UINT8,
+    "endpoint": _align_word(9) | UINTPTR,
+    "extra": (_align_word(9) + UINTPTR_SIZE) | UINTPTR,
+    "extra_length": (_align_word(9) + 2 * UINTPTR_SIZE) | uctypes.INT,
+}
+
+libusb = ffi.open("libusb-1.0.so")
+libusb_init = libusb.func("i", "libusb_init", "p")
+libusb_exit = libusb.func("v", "libusb_exit", "p")
+libusb_get_device_list = libusb.func("i", "libusb_get_device_list", "pp")  # return is ssize_t
+libusb_free_device_list = libusb.func("v", "libusb_free_device_list", "pi")
+libusb_get_device_descriptor = libusb.func("i", "libusb_get_device_descriptor", "pp")
+libusb_get_config_descriptor = libusb.func("i", "libusb_get_config_descriptor", "pBp")
+libusb_free_config_descriptor = libusb.func("v", "libusb_free_config_descriptor", "p")
+libusb_open = libusb.func("i", "libusb_open", "pp")
+libusb_set_configuration = libusb.func("i", "libusb_set_configuration", "pi")
+libusb_claim_interface = libusb.func("i", "libusb_claim_interface", "pi")
+libusb_control_transfer = libusb.func("i", "libusb_control_transfer", "pBBHHpHI")
+
+
+def _new(sdesc):
+    buf = bytearray(uctypes.sizeof(sdesc))
+    s = uctypes.struct(uctypes.addressof(buf), sdesc)
+    return s
+
+
+class Interface:
+    def __init__(self, descr):
+        # Public attributes.
+        self.bInterfaceClass = descr.bInterfaceClass
+        self.bInterfaceSubClass = descr.bInterfaceSubClass
+        self.iInterface = descr.iInterface
+        self.extra_descriptors = uctypes.bytes_at(descr.extra, descr.extra_length)
+
+
+class Configuration:
+    def __init__(self, dev, cfg_idx):
+        cfgs = _new(ptr_descriptor)
+        if libusb_get_config_descriptor(dev._dev, cfg_idx, cfgs) != 0:
+            libusb_exit(0)
+            raise Exception
+        descr = uctypes.struct(cfgs[0], libusb_config_descriptor)
+
+        # Extract all needed info because descr is going to be free'd at the end.
+        self._itfs = []
+        itf_array = uctypes.struct(
+            descr.interface, (0 | uctypes.ARRAY, descr.bNumInterfaces, libusb_interface)
+        )
+        for i in range(descr.bNumInterfaces):
+            itf = itf_array[i]
+            alt_array = uctypes.struct(
+                itf.altsetting,
+                (0 | uctypes.ARRAY, itf.num_altsetting, libusb_interface_descriptor),
+            )
+            for j in range(itf.num_altsetting):
+                alt = alt_array[j]
+                self._itfs.append(Interface(alt))
+
+        # Public attributes.
+        self.bNumInterfaces = descr.bNumInterfaces
+        self.bConfigurationValue = descr.bConfigurationValue
+        self.bmAttributes = descr.bmAttributes
+        self.bMaxPower = descr.MaxPower
+        self.extra_descriptors = uctypes.bytes_at(descr.extra, descr.extra_length)
+
+        # Free descr memory in the driver.
+        libusb_free_config_descriptor(cfgs[0])
+
+    def __iter__(self):
+        return iter(self._itfs)
+
+
+class Device:
+    _TIMEOUT_DEFAULT = 1000
+
+    def __init__(self, dev, descr):
+        self._dev = dev
+        self._num_cfg = descr.bNumConfigurations
+        self._handle = None
+        self._claim_itf = set()
+
+        # Public attributes.
+        self.idVendor = descr.idVendor
+        self.idProduct = descr.idProduct
+
+    def __iter__(self):
+        for i in range(self._num_cfg):
+            yield Configuration(self, i)
+
+    def __getitem__(self, i):
+        return Configuration(self, i)
+
+    def _open(self):
+        if self._handle is None:
+            # Open the USB device.
+            handle = _new(ptr_descriptor)
+            if libusb_open(self._dev, handle) != 0:
+                libusb_exit(0)
+                raise Exception
+            self._handle = handle[0]
+
+    def _claim_interface(self, i):
+        if libusb_claim_interface(self._handle, i) != 0:
+            libusb_exit(0)
+            raise Exception
+
+    def set_configuration(self):
+        # Select default configuration.
+        self._open()
+        cfg = Configuration(self, 0).bConfigurationValue
+        ret = libusb_set_configuration(self._handle, cfg)
+        if ret != 0:
+            libusb_exit(0)
+            raise Exception
+
+    def ctrl_transfer(
+        self, bmRequestType, bRequest, wValue=0, wIndex=0, data_or_wLength=None, timeout=None
+    ):
+        if data_or_wLength is None:
+            l = 0
+            data = bytes()
+        elif isinstance(data_or_wLength, int):
+            l = data_or_wLength
+            data = bytearray(l)
+        else:
+            l = len(data_or_wLength)
+            data = data_or_wLength
+        self._open()
+        if wIndex & 0xFF not in self._claim_itf:
+            self._claim_interface(wIndex & 0xFF)
+            self._claim_itf.add(wIndex & 0xFF)
+        if timeout is None:
+            timeout = self._TIMEOUT_DEFAULT
+        ret = libusb_control_transfer(
+            self._handle, bmRequestType, bRequest, wValue, wIndex, data, l, timeout * 1000
+        )
+        if ret < 0:
+            libusb_exit(0)
+            raise Exception
+        if isinstance(data_or_wLength, int):
+            return data
+        else:
+            return ret
+
+
+def find(*, find_all=False, custom_match=None, idVendor=None, idProduct=None):
+    if libusb_init(0) < 0:
+        raise Exception
+
+    devs = _new(ptr_descriptor)
+    count = libusb_get_device_list(0, devs)
+    if count < 0:
+        libusb_exit(0)
+        raise Exception
+
+    dev_array = uctypes.struct(devs[0], (0 | uctypes.ARRAY, count | UINTPTR))
+    descr = _new(libusb_device_descriptor)
+    devices = None
+    for i in range(count):
+        libusb_get_device_descriptor(dev_array[i], descr)
+        if idVendor and descr.idVendor != idVendor:
+            continue
+        if idProduct and descr.idProduct != idProduct:
+            continue
+        device = Device(dev_array[i], descr)
+        if custom_match and not custom_match(device):
+            continue
+        if not find_all:
+            return device
+        if not devices:
+            devices = []
+        devices.append(device)
+    return devices
diff --git a/unix-ffi/pyusb/usb/util.py b/unix-ffi/pyusb/usb/util.py
new file mode 100644
index 000000000..04e4763e4
--- /dev/null
+++ b/unix-ffi/pyusb/usb/util.py
@@ -0,0 +1,16 @@
+# MicroPython USB host library, compatible with PyUSB.
+# MIT license; Copyright (c) 2021-2024 Damien P. George
+
+import usb.control
+
+
+def claim_interface(device, interface):
+    device._claim_interface(interface)
+
+
+def get_string(device, index):
+    bs = usb.control.get_descriptor(device, 254, 3, index, 0)
+    s = ""
+    for i in range(2, bs[0] & 0xFE, 2):
+        s += chr(bs[i] | bs[i + 1] << 8)
+    return s

From 1f019f90eaef146960988319166076e12e689e81 Mon Sep 17 00:00:00 2001
From: Mirza Kapetanovic <mirza.kapetanovic@gmail.com>
Date: Wed, 12 Jun 2024 11:41:04 +0200
Subject: [PATCH 270/343] requests: Make possible to override headers and allow
 raw data upload.

This removes all the hard-coded request headers from the requests module so
they can be overridden by user provided headers dict.  Furthermore allow
streaming request data without chunk encoding in those cases where content
length is known but it's not desirable to load the whole content into
memory.  Also some servers (e.g. nginx) reject HTTP/1.0 requests with the
Transfer-Encoding header set.

The change should be backwards compatible as long as the user hasn't
provided any of the previously hard-coded headers.

Signed-off-by: Mirza Kapetanovic <mirza.kapetanovic@gmail.com>
---
 python-ecosys/requests/manifest.py          |   2 +-
 python-ecosys/requests/requests/__init__.py |  55 ++++---
 python-ecosys/requests/test_requests.py     | 155 ++++++++++++++++++++
 3 files changed, 193 insertions(+), 19 deletions(-)
 create mode 100644 python-ecosys/requests/test_requests.py

diff --git a/python-ecosys/requests/manifest.py b/python-ecosys/requests/manifest.py
index 97df1560e..eb7bb2d42 100644
--- a/python-ecosys/requests/manifest.py
+++ b/python-ecosys/requests/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.9.0", pypi="requests")
+metadata(version="0.10.0", pypi="requests")
 
 package("requests")
diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index 740102916..b6bf515dd 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -38,12 +38,15 @@ def request(
     url,
     data=None,
     json=None,
-    headers={},
+    headers=None,
     stream=None,
     auth=None,
     timeout=None,
     parse_headers=True,
 ):
+    if headers is None:
+        headers = {}
+
     redirect = None  # redirection url, None means no redirection
     chunked_data = data and getattr(data, "__next__", None) and not getattr(data, "__len__", None)
 
@@ -94,33 +97,49 @@ def request(
             context.verify_mode = tls.CERT_NONE
             s = context.wrap_socket(s, server_hostname=host)
         s.write(b"%s /%s HTTP/1.0\r\n" % (method, path))
+
         if "Host" not in headers:
-            s.write(b"Host: %s\r\n" % host)
-        # Iterate over keys to avoid tuple alloc
-        for k in headers:
-            s.write(k)
-            s.write(b": ")
-            s.write(headers[k])
-            s.write(b"\r\n")
+            headers["Host"] = host
+
         if json is not None:
             assert data is None
             import ujson
 
             data = ujson.dumps(json)
-            s.write(b"Content-Type: application/json\r\n")
+
+            if "Content-Type" not in headers:
+                headers["Content-Type"] = "application/json"
+
         if data:
             if chunked_data:
-                s.write(b"Transfer-Encoding: chunked\r\n")
-            else:
-                s.write(b"Content-Length: %d\r\n" % len(data))
-        s.write(b"Connection: close\r\n\r\n")
+                if "Transfer-Encoding" not in headers and "Content-Length" not in headers:
+                    headers["Transfer-Encoding"] = "chunked"
+            elif "Content-Length" not in headers:
+                headers["Content-Length"] = str(len(data))
+
+        if "Connection" not in headers:
+            headers["Connection"] = "close"
+
+        # Iterate over keys to avoid tuple alloc
+        for k in headers:
+            s.write(k)
+            s.write(b": ")
+            s.write(headers[k])
+            s.write(b"\r\n")
+
+        s.write(b"\r\n")
+
         if data:
             if chunked_data:
-                for chunk in data:
-                    s.write(b"%x\r\n" % len(chunk))
-                    s.write(chunk)
-                    s.write(b"\r\n")
-                s.write("0\r\n\r\n")
+                if headers.get("Transfer-Encoding", None) == "chunked":
+                    for chunk in data:
+                        s.write(b"%x\r\n" % len(chunk))
+                        s.write(chunk)
+                        s.write(b"\r\n")
+                    s.write("0\r\n\r\n")
+                else:
+                    for chunk in data:
+                        s.write(chunk)
             else:
                 s.write(data)
 
diff --git a/python-ecosys/requests/test_requests.py b/python-ecosys/requests/test_requests.py
new file mode 100644
index 000000000..540d335cc
--- /dev/null
+++ b/python-ecosys/requests/test_requests.py
@@ -0,0 +1,155 @@
+import io
+import sys
+
+
+class Socket:
+    def __init__(self):
+        self._write_buffer = io.BytesIO()
+        self._read_buffer = io.BytesIO(b"HTTP/1.0 200 OK\r\n\r\n")
+
+    def connect(self, address):
+        pass
+
+    def write(self, buf):
+        self._write_buffer.write(buf)
+
+    def readline(self):
+        return self._read_buffer.readline()
+
+
+class usocket:
+    AF_INET = 2
+    SOCK_STREAM = 1
+    IPPROTO_TCP = 6
+
+    @staticmethod
+    def getaddrinfo(host, port, af=0, type=0, flags=0):
+        return [(usocket.AF_INET, usocket.SOCK_STREAM, usocket.IPPROTO_TCP, "", ("127.0.0.1", 80))]
+
+    def socket(af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP):
+        return Socket()
+
+
+sys.modules["usocket"] = usocket
+# ruff: noqa: E402
+import requests
+
+
+def format_message(response):
+    return response.raw._write_buffer.getvalue().decode("utf8")
+
+
+def test_simple_get():
+    response = requests.request("GET", "http://example.com")
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n" + b"Connection: close\r\n" + b"Host: example.com\r\n\r\n"
+    ), format_message(response)
+
+
+def test_get_auth():
+    response = requests.request(
+        "GET", "http://example.com", auth=("test-username", "test-password")
+    )
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n"
+        + b"Host: example.com\r\n"
+        + b"Authorization: Basic dGVzdC11c2VybmFtZTp0ZXN0LXBhc3N3b3Jk\r\n"
+        + b"Connection: close\r\n\r\n"
+    ), format_message(response)
+
+
+def test_get_custom_header():
+    response = requests.request("GET", "http://example.com", headers={"User-Agent": "test-agent"})
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n"
+        + b"User-Agent: test-agent\r\n"
+        + b"Host: example.com\r\n"
+        + b"Connection: close\r\n\r\n"
+    ), format_message(response)
+
+
+def test_post_json():
+    response = requests.request("GET", "http://example.com", json="test")
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n"
+        + b"Connection: close\r\n"
+        + b"Content-Type: application/json\r\n"
+        + b"Host: example.com\r\n"
+        + b"Content-Length: 6\r\n\r\n"
+        + b'"test"'
+    ), format_message(response)
+
+
+def test_post_chunked_data():
+    def chunks():
+        yield "test"
+
+    response = requests.request("GET", "http://example.com", data=chunks())
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n"
+        + b"Transfer-Encoding: chunked\r\n"
+        + b"Host: example.com\r\n"
+        + b"Connection: close\r\n\r\n"
+        + b"4\r\ntest\r\n"
+        + b"0\r\n\r\n"
+    ), format_message(response)
+
+
+def test_overwrite_get_headers():
+    response = requests.request(
+        "GET", "http://example.com", headers={"Connection": "keep-alive", "Host": "test.com"}
+    )
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n" + b"Host: test.com\r\n" + b"Connection: keep-alive\r\n\r\n"
+    ), format_message(response)
+
+
+def test_overwrite_post_json_headers():
+    response = requests.request(
+        "GET",
+        "http://example.com",
+        json="test",
+        headers={"Content-Type": "text/plain", "Content-Length": "10"},
+    )
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n"
+        + b"Connection: close\r\n"
+        + b"Content-Length: 10\r\n"
+        + b"Content-Type: text/plain\r\n"
+        + b"Host: example.com\r\n\r\n"
+        + b'"test"'
+    ), format_message(response)
+
+
+def test_overwrite_post_chunked_data_headers():
+    def chunks():
+        yield "test"
+
+    response = requests.request(
+        "GET", "http://example.com", data=chunks(), headers={"Content-Length": "4"}
+    )
+
+    assert response.raw._write_buffer.getvalue() == (
+        b"GET / HTTP/1.0\r\n"
+        + b"Host: example.com\r\n"
+        + b"Content-Length: 4\r\n"
+        + b"Connection: close\r\n\r\n"
+        + b"test"
+    ), format_message(response)
+
+
+test_simple_get()
+test_get_auth()
+test_get_custom_header()
+test_post_json()
+test_post_chunked_data()
+test_overwrite_get_headers()
+test_overwrite_post_json_headers()
+test_overwrite_post_chunked_data_headers()

From 7271f1ddc75d4d64341e9701a7a21e9b39968b4b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jun 2024 13:44:20 +1000
Subject: [PATCH 271/343] all: Change use of "uasyncio" to "asyncio".

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/aioespnow/README.md                             | 4 ++--
 micropython/aioespnow/aioespnow.py                          | 6 +++---
 micropython/aiorepl/aiorepl.py                              | 2 +-
 micropython/bluetooth/aioble/aioble/central.py              | 2 +-
 micropython/bluetooth/aioble/aioble/client.py               | 2 +-
 micropython/bluetooth/aioble/aioble/device.py               | 2 +-
 micropython/bluetooth/aioble/aioble/l2cap.py                | 2 +-
 micropython/bluetooth/aioble/aioble/peripheral.py           | 2 +-
 micropython/bluetooth/aioble/aioble/security.py             | 2 +-
 micropython/bluetooth/aioble/aioble/server.py               | 2 +-
 micropython/bluetooth/aioble/examples/l2cap_file_client.py  | 2 +-
 micropython/bluetooth/aioble/examples/l2cap_file_server.py  | 2 +-
 micropython/bluetooth/aioble/examples/temp_client.py        | 2 +-
 micropython/bluetooth/aioble/examples/temp_sensor.py        | 2 +-
 .../aioble/multitests/ble_buffered_characteristic.py        | 2 +-
 .../bluetooth/aioble/multitests/ble_characteristic.py       | 2 +-
 micropython/bluetooth/aioble/multitests/ble_descriptor.py   | 2 +-
 micropython/bluetooth/aioble/multitests/ble_notify.py       | 2 +-
 micropython/bluetooth/aioble/multitests/ble_shutdown.py     | 2 +-
 .../bluetooth/aioble/multitests/ble_write_capture.py        | 2 +-
 micropython/bluetooth/aioble/multitests/ble_write_order.py  | 2 +-
 micropython/bluetooth/aioble/multitests/perf_gatt_notify.py | 2 +-
 micropython/bluetooth/aioble/multitests/perf_l2cap.py       | 2 +-
 micropython/uaiohttpclient/README                           | 2 +-
 micropython/uaiohttpclient/example.py                       | 2 +-
 micropython/uaiohttpclient/manifest.py                      | 2 +-
 micropython/uaiohttpclient/uaiohttpclient.py                | 2 +-
 27 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/micropython/aioespnow/README.md b/micropython/aioespnow/README.md
index a68e765af..132bce103 100644
--- a/micropython/aioespnow/README.md
+++ b/micropython/aioespnow/README.md
@@ -4,7 +4,7 @@ A supplementary module which extends the micropython `espnow` module to provide
 `asyncio` support.
 
 - Asyncio support is available on all ESP32 targets as well as those ESP8266
-boards which include the `uasyncio` module (ie. ESP8266 devices with at least
+boards which include the `asyncio` module (ie. ESP8266 devices with at least
 2MB flash storage).
 
 ## API reference
@@ -52,7 +52,7 @@ A small async server example::
 ```python
     import network
     import aioespnow
-    import uasyncio as asyncio
+    import asyncio
 
     # A WLAN interface must be active to send()/recv()
     network.WLAN(network.STA_IF).active(True)
diff --git a/micropython/aioespnow/aioespnow.py b/micropython/aioespnow/aioespnow.py
index c00c6fb2b..dec925de2 100644
--- a/micropython/aioespnow/aioespnow.py
+++ b/micropython/aioespnow/aioespnow.py
@@ -1,12 +1,12 @@
 # aioespnow module for MicroPython on ESP32 and ESP8266
 # MIT license; Copyright (c) 2022 Glenn Moloney @glenn20
 
-import uasyncio as asyncio
+import asyncio
 import espnow
 
 
-# Modelled on the uasyncio.Stream class (extmod/stream/stream.py)
-# NOTE: Relies on internal implementation of uasyncio.core (_io_queue)
+# Modelled on the asyncio.Stream class (extmod/asyncio/stream.py)
+# NOTE: Relies on internal implementation of asyncio.core (_io_queue)
 class AIOESPNow(espnow.ESPNow):
     # Read one ESPNow message
     async def arecv(self):
diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 14d5d55bc..8f45dfac0 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -41,7 +41,7 @@ async def execute(code, g, s):
                 code = "return {}".format(code)
 
             code = """
-import uasyncio as asyncio
+import asyncio
 async def __code():
     {}
 
diff --git a/micropython/bluetooth/aioble/aioble/central.py b/micropython/bluetooth/aioble/aioble/central.py
index 2f1492d08..6d90cd0f8 100644
--- a/micropython/bluetooth/aioble/aioble/central.py
+++ b/micropython/bluetooth/aioble/aioble/central.py
@@ -6,7 +6,7 @@
 import bluetooth
 import struct
 
-import uasyncio as asyncio
+import asyncio
 
 from .core import (
     ensure_active,
diff --git a/micropython/bluetooth/aioble/aioble/client.py b/micropython/bluetooth/aioble/aioble/client.py
index ccde03527..859c6e937 100644
--- a/micropython/bluetooth/aioble/aioble/client.py
+++ b/micropython/bluetooth/aioble/aioble/client.py
@@ -3,7 +3,7 @@
 
 from micropython import const
 from collections import deque
-import uasyncio as asyncio
+import asyncio
 import struct
 
 import bluetooth
diff --git a/micropython/bluetooth/aioble/aioble/device.py b/micropython/bluetooth/aioble/aioble/device.py
index 8844eb42a..d02d6385f 100644
--- a/micropython/bluetooth/aioble/aioble/device.py
+++ b/micropython/bluetooth/aioble/aioble/device.py
@@ -3,7 +3,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import binascii
 
 from .core import ble, register_irq_handler, log_error
diff --git a/micropython/bluetooth/aioble/aioble/l2cap.py b/micropython/bluetooth/aioble/aioble/l2cap.py
index 713c441fd..e2d3bd9d4 100644
--- a/micropython/bluetooth/aioble/aioble/l2cap.py
+++ b/micropython/bluetooth/aioble/aioble/l2cap.py
@@ -3,7 +3,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 
 from .core import ble, log_error, register_irq_handler
 from .device import DeviceConnection
diff --git a/micropython/bluetooth/aioble/aioble/peripheral.py b/micropython/bluetooth/aioble/aioble/peripheral.py
index a156ccd21..d3dda8bcb 100644
--- a/micropython/bluetooth/aioble/aioble/peripheral.py
+++ b/micropython/bluetooth/aioble/aioble/peripheral.py
@@ -6,7 +6,7 @@
 import bluetooth
 import struct
 
-import uasyncio as asyncio
+import asyncio
 
 from .core import (
     ensure_active,
diff --git a/micropython/bluetooth/aioble/aioble/security.py b/micropython/bluetooth/aioble/aioble/security.py
index a0b46e6d6..8e04d5b7b 100644
--- a/micropython/bluetooth/aioble/aioble/security.py
+++ b/micropython/bluetooth/aioble/aioble/security.py
@@ -2,7 +2,7 @@
 # MIT license; Copyright (c) 2021 Jim Mussared
 
 from micropython import const, schedule
-import uasyncio as asyncio
+import asyncio
 import binascii
 import json
 
diff --git a/micropython/bluetooth/aioble/aioble/server.py b/micropython/bluetooth/aioble/aioble/server.py
index 403700c5a..5d5d7399b 100644
--- a/micropython/bluetooth/aioble/aioble/server.py
+++ b/micropython/bluetooth/aioble/aioble/server.py
@@ -4,7 +4,7 @@
 from micropython import const
 from collections import deque
 import bluetooth
-import uasyncio as asyncio
+import asyncio
 
 from .core import (
     ensure_active,
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_client.py b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
index 2a75bc308..9dce349a7 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_client.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
@@ -10,7 +10,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_server.py b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
index 0c45bd1ff..fb806effc 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_server.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
@@ -21,7 +21,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/examples/temp_client.py b/micropython/bluetooth/aioble/examples/temp_client.py
index 42752d8c9..0840359f8 100644
--- a/micropython/bluetooth/aioble/examples/temp_client.py
+++ b/micropython/bluetooth/aioble/examples/temp_client.py
@@ -5,7 +5,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/examples/temp_sensor.py b/micropython/bluetooth/aioble/examples/temp_sensor.py
index 29f774bee..54580f595 100644
--- a/micropython/bluetooth/aioble/examples/temp_sensor.py
+++ b/micropython/bluetooth/aioble/examples/temp_sensor.py
@@ -5,7 +5,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
index 91307908f..e41c3fd1e 100644
--- a/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
+++ b/micropython/bluetooth/aioble/multitests/ble_buffered_characteristic.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_characteristic.py b/micropython/bluetooth/aioble/multitests/ble_characteristic.py
index b5d1df2fe..0c42bc19b 100644
--- a/micropython/bluetooth/aioble/multitests/ble_characteristic.py
+++ b/micropython/bluetooth/aioble/multitests/ble_characteristic.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_descriptor.py b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
index 888222ff5..8e32a469a 100644
--- a/micropython/bluetooth/aioble/multitests/ble_descriptor.py
+++ b/micropython/bluetooth/aioble/multitests/ble_descriptor.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_notify.py b/micropython/bluetooth/aioble/multitests/ble_notify.py
index 200e784c2..6eb85f68c 100644
--- a/micropython/bluetooth/aioble/multitests/ble_notify.py
+++ b/micropython/bluetooth/aioble/multitests/ble_notify.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_shutdown.py b/micropython/bluetooth/aioble/multitests/ble_shutdown.py
index dea915bfb..28fc53536 100644
--- a/micropython/bluetooth/aioble/multitests/ble_shutdown.py
+++ b/micropython/bluetooth/aioble/multitests/ble_shutdown.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_capture.py b/micropython/bluetooth/aioble/multitests/ble_write_capture.py
index 23c6d4422..0577229e2 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_capture.py
+++ b/micropython/bluetooth/aioble/multitests/ble_write_capture.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/ble_write_order.py b/micropython/bluetooth/aioble/multitests/ble_write_order.py
index 10b44bca1..ca47f3837 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_order.py
+++ b/micropython/bluetooth/aioble/multitests/ble_write_order.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
index 3d3159f59..d8a0ea173 100644
--- a/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
+++ b/micropython/bluetooth/aioble/multitests/perf_gatt_notify.py
@@ -9,7 +9,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
diff --git a/micropython/bluetooth/aioble/multitests/perf_l2cap.py b/micropython/bluetooth/aioble/multitests/perf_l2cap.py
index e21efd6fa..05fd4863e 100644
--- a/micropython/bluetooth/aioble/multitests/perf_l2cap.py
+++ b/micropython/bluetooth/aioble/multitests/perf_l2cap.py
@@ -7,7 +7,7 @@
 import machine
 import time
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 import random
diff --git a/micropython/uaiohttpclient/README b/micropython/uaiohttpclient/README
index a3d88b0a4..1222f9d61 100644
--- a/micropython/uaiohttpclient/README
+++ b/micropython/uaiohttpclient/README
@@ -1,4 +1,4 @@
-uaiohttpclient is an HTTP client module for MicroPython uasyncio module,
+uaiohttpclient is an HTTP client module for MicroPython asyncio module,
 with API roughly compatible with aiohttp (https://github.com/KeepSafe/aiohttp)
 module. Note that only client is implemented, for server see picoweb
 microframework.
diff --git a/micropython/uaiohttpclient/example.py b/micropython/uaiohttpclient/example.py
index d265c9db7..540d1b3de 100644
--- a/micropython/uaiohttpclient/example.py
+++ b/micropython/uaiohttpclient/example.py
@@ -2,7 +2,7 @@
 # uaiohttpclient - fetch URL passed as command line argument.
 #
 import sys
-import uasyncio as asyncio
+import asyncio
 import uaiohttpclient as aiohttp
 
 
diff --git a/micropython/uaiohttpclient/manifest.py b/micropython/uaiohttpclient/manifest.py
index a204d57b2..8b35e0a70 100644
--- a/micropython/uaiohttpclient/manifest.py
+++ b/micropython/uaiohttpclient/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="HTTP client module for MicroPython uasyncio module", version="0.5.2")
+metadata(description="HTTP client module for MicroPython asyncio module", version="0.5.2")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/uaiohttpclient/uaiohttpclient.py b/micropython/uaiohttpclient/uaiohttpclient.py
index 6347c3371..2e782638c 100644
--- a/micropython/uaiohttpclient/uaiohttpclient.py
+++ b/micropython/uaiohttpclient/uaiohttpclient.py
@@ -1,4 +1,4 @@
-import uasyncio as asyncio
+import asyncio
 
 
 class ClientResponse:

From 84ba4521139157d284015de6b530c13a062caf74 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jun 2024 13:58:32 +1000
Subject: [PATCH 272/343] all: Use non-u versions of built-in modules.

This changes almost all uses of "u-module" to just "module" for the
following built-in modules:
- binascii
- collections
- errno
- io
- json
- socket
- struct
- sys
- time

There are some remaining uses of "u-module" naming, for the cases where the
built-in module is extended in Python, eg `python-stdlib/os` uses `uos`.

Also, there are remaining uses of `utime` when non-standard (compared to
CPython) functions are used, like `utime.ticks_ms()`.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../drivers/display/lcd160cr/lcd160cr.py       | 12 ++++++------
 .../drivers/radio/nrf24l01/nrf24l01test.py     | 14 +++++++-------
 micropython/net/ntptime/ntptime.py             | 17 +++++------------
 micropython/udnspkt/example_resolve.py         | 14 +++++++-------
 micropython/udnspkt/udnspkt.py                 |  3 ---
 micropython/umqtt.robust/umqtt/robust.py       |  4 ++--
 micropython/umqtt.simple/example_pub_button.py |  4 ++--
 micropython/umqtt.simple/example_sub_led.py    |  4 ++--
 micropython/umqtt.simple/umqtt/simple.py       |  6 +++---
 micropython/urllib.urequest/urllib/urequest.py |  6 +++---
 python-ecosys/requests/requests/__init__.py    | 18 +++++++++---------
 python-ecosys/requests/test_requests.py        |  6 +++---
 python-stdlib/argparse/argparse.py             |  2 +-
 python-stdlib/binascii/test_binascii.py        |  6 +++---
 python-stdlib/copy/copy.py                     |  2 +-
 python-stdlib/pkg_resources/pkg_resources.py   |  8 ++++----
 unix-ffi/machine/example_timer.py              |  4 ++--
 unix-ffi/machine/machine/timer.py              |  2 --
 unix-ffi/os/os/__init__.py                     |  2 +-
 unix-ffi/pwd/pwd.py                            |  8 ++++----
 unix-ffi/select/select.py                      |  2 +-
 unix-ffi/time/time.py                          | 12 ++++++------
 22 files changed, 72 insertions(+), 84 deletions(-)

diff --git a/micropython/drivers/display/lcd160cr/lcd160cr.py b/micropython/drivers/display/lcd160cr/lcd160cr.py
index b86cbff0d..42b5e215b 100644
--- a/micropython/drivers/display/lcd160cr/lcd160cr.py
+++ b/micropython/drivers/display/lcd160cr/lcd160cr.py
@@ -5,7 +5,7 @@
 import machine
 from utime import sleep_ms
 from ustruct import calcsize, pack_into
-import uerrno
+import errno
 
 # for set_orient
 PORTRAIT = const(0)
@@ -110,7 +110,7 @@ def _waitfor(self, n, buf):
                 return
             t -= 1
             sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
+        raise OSError(errno.ETIMEDOUT)
 
     def oflush(self, n=255):
         t = 5000
@@ -121,7 +121,7 @@ def oflush(self, n=255):
                 return
             t -= 1
             machine.idle()
-        raise OSError(uerrno.ETIMEDOUT)
+        raise OSError(errno.ETIMEDOUT)
 
     def iflush(self):
         t = 5000
@@ -131,7 +131,7 @@ def iflush(self):
                 return
             t -= 1
             sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
+        raise OSError(errno.ETIMEDOUT)
 
     #### MISC METHODS ####
 
@@ -254,7 +254,7 @@ def get_pixel(self, x, y):
                 return self.buf[3][1] | self.buf[3][2] << 8
             t -= 1
             sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
+        raise OSError(errno.ETIMEDOUT)
 
     def get_line(self, x, y, buf):
         l = len(buf) // 2
@@ -268,7 +268,7 @@ def get_line(self, x, y, buf):
                 return
             t -= 1
             sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
+        raise OSError(errno.ETIMEDOUT)
 
     def screen_dump(self, buf, x=0, y=0, w=None, h=None):
         if w is None:
diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01test.py b/micropython/drivers/radio/nrf24l01/nrf24l01test.py
index ad3e1f67a..a0c4b76f4 100644
--- a/micropython/drivers/radio/nrf24l01/nrf24l01test.py
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01test.py
@@ -1,7 +1,7 @@
 """Test for nrf24l01 module.  Portable between MicroPython targets."""
 
-import usys
-import ustruct as struct
+import sys
+import struct
 import utime
 from machine import Pin, SPI, SoftSPI
 from nrf24l01 import NRF24L01
@@ -14,20 +14,20 @@
 # initiator may be a slow device. Value tested with Pyboard, ESP32 and ESP8266.
 _RESPONDER_SEND_DELAY = const(10)
 
-if usys.platform == "pyboard":
+if sys.platform == "pyboard":
     spi = SPI(2)  # miso : Y7, mosi : Y8, sck : Y6
     cfg = {"spi": spi, "csn": "Y5", "ce": "Y4"}
-elif usys.platform == "esp8266":  # Hardware SPI
+elif sys.platform == "esp8266":  # Hardware SPI
     spi = SPI(1)  # miso : 12, mosi : 13, sck : 14
     cfg = {"spi": spi, "csn": 4, "ce": 5}
-elif usys.platform == "esp32":  # Software SPI
+elif sys.platform == "esp32":  # Software SPI
     spi = SoftSPI(sck=Pin(25), mosi=Pin(33), miso=Pin(32))
     cfg = {"spi": spi, "csn": 26, "ce": 27}
-elif usys.platform == "rp2":  # Hardware SPI with explicit pin definitions
+elif sys.platform == "rp2":  # Hardware SPI with explicit pin definitions
     spi = SPI(0, sck=Pin(2), mosi=Pin(3), miso=Pin(4))
     cfg = {"spi": spi, "csn": 5, "ce": 6}
 else:
-    raise ValueError("Unsupported platform {}".format(usys.platform))
+    raise ValueError("Unsupported platform {}".format(sys.platform))
 
 # Addresses are in little-endian format. They correspond to big-endian
 # 0xf0f0f0f0e1, 0xf0f0f0f0d2
diff --git a/micropython/net/ntptime/ntptime.py b/micropython/net/ntptime/ntptime.py
index 25cc62ad1..d77214d1d 100644
--- a/micropython/net/ntptime/ntptime.py
+++ b/micropython/net/ntptime/ntptime.py
@@ -1,13 +1,6 @@
-import utime
-
-try:
-    import usocket as socket
-except:
-    import socket
-try:
-    import ustruct as struct
-except:
-    import struct
+from time import gmtime
+import socket
+import struct
 
 # The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
 host = "pool.ntp.org"
@@ -53,7 +46,7 @@ def time():
 
     # Convert timestamp from NTP format to our internal format
 
-    EPOCH_YEAR = utime.gmtime(0)[0]
+    EPOCH_YEAR = gmtime(0)[0]
     if EPOCH_YEAR == 2000:
         # (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
         NTP_DELTA = 3155673600
@@ -71,5 +64,5 @@ def settime():
     t = time()
     import machine
 
-    tm = utime.gmtime(t)
+    tm = gmtime(t)
     machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))
diff --git a/micropython/udnspkt/example_resolve.py b/micropython/udnspkt/example_resolve.py
index c1215045a..d72c17a48 100644
--- a/micropython/udnspkt/example_resolve.py
+++ b/micropython/udnspkt/example_resolve.py
@@ -1,15 +1,15 @@
-import uio
-import usocket
+import io
+import socket
 
 import udnspkt
 
 
-s = usocket.socket(usocket.AF_INET, usocket.SOCK_DGRAM)
-dns_addr = usocket.getaddrinfo("127.0.0.1", 53)[0][-1]
+s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+dns_addr = socket.getaddrinfo("127.0.0.1", 53)[0][-1]
 
 
 def resolve(domain, is_ipv6):
-    buf = uio.BytesIO(48)
+    buf = io.BytesIO(48)
     udnspkt.make_req(buf, "google.com", is_ipv6)
     v = buf.getvalue()
     print("query: ", v)
@@ -17,11 +17,11 @@ def resolve(domain, is_ipv6):
 
     resp = s.recv(1024)
     print("resp:", resp)
-    buf = uio.BytesIO(resp)
+    buf = io.BytesIO(resp)
 
     addr = udnspkt.parse_resp(buf, is_ipv6)
     print("bin addr:", addr)
-    print("addr:", usocket.inet_ntop(usocket.AF_INET6 if is_ipv6 else usocket.AF_INET, addr))
+    print("addr:", socket.inet_ntop(socket.AF_INET6 if is_ipv6 else socket.AF_INET, addr))
 
 
 resolve("google.com", False)
diff --git a/micropython/udnspkt/udnspkt.py b/micropython/udnspkt/udnspkt.py
index 2cb11ab92..f3b998a8a 100644
--- a/micropython/udnspkt/udnspkt.py
+++ b/micropython/udnspkt/udnspkt.py
@@ -1,6 +1,3 @@
-import uio
-
-
 def write_fqdn(buf, name):
     parts = name.split(".")
     for p in parts:
diff --git a/micropython/umqtt.robust/umqtt/robust.py b/micropython/umqtt.robust/umqtt/robust.py
index 4cc10e336..51596de9e 100644
--- a/micropython/umqtt.robust/umqtt/robust.py
+++ b/micropython/umqtt.robust/umqtt/robust.py
@@ -1,4 +1,4 @@
-import utime
+import time
 from . import simple
 
 
@@ -7,7 +7,7 @@ class MQTTClient(simple.MQTTClient):
     DEBUG = False
 
     def delay(self, i):
-        utime.sleep(self.DELAY)
+        time.sleep(self.DELAY)
 
     def log(self, in_reconnect, e):
         if self.DEBUG:
diff --git a/micropython/umqtt.simple/example_pub_button.py b/micropython/umqtt.simple/example_pub_button.py
index 1bc47bc5e..2a3ec851e 100644
--- a/micropython/umqtt.simple/example_pub_button.py
+++ b/micropython/umqtt.simple/example_pub_button.py
@@ -1,5 +1,5 @@
 import time
-import ubinascii
+import binascii
 import machine
 from umqtt.simple import MQTTClient
 from machine import Pin
@@ -10,7 +10,7 @@
 
 # Default MQTT server to connect to
 SERVER = "192.168.1.35"
-CLIENT_ID = ubinascii.hexlify(machine.unique_id())
+CLIENT_ID = binascii.hexlify(machine.unique_id())
 TOPIC = b"led"
 
 
diff --git a/micropython/umqtt.simple/example_sub_led.py b/micropython/umqtt.simple/example_sub_led.py
index 73c6b58d8..c3dcf08d2 100644
--- a/micropython/umqtt.simple/example_sub_led.py
+++ b/micropython/umqtt.simple/example_sub_led.py
@@ -1,6 +1,6 @@
 from umqtt.simple import MQTTClient
 from machine import Pin
-import ubinascii
+import binascii
 import machine
 import micropython
 
@@ -11,7 +11,7 @@
 
 # Default MQTT server to connect to
 SERVER = "192.168.1.35"
-CLIENT_ID = ubinascii.hexlify(machine.unique_id())
+CLIENT_ID = binascii.hexlify(machine.unique_id())
 TOPIC = b"led"
 
 
diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index e84e585c4..6da38e445 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -1,6 +1,6 @@
-import usocket as socket
-import ustruct as struct
-from ubinascii import hexlify
+import socket
+import struct
+from binascii import hexlify
 
 
 class MQTTException(Exception):
diff --git a/micropython/urllib.urequest/urllib/urequest.py b/micropython/urllib.urequest/urllib/urequest.py
index 5154c0f05..f83cbaa94 100644
--- a/micropython/urllib.urequest/urllib/urequest.py
+++ b/micropython/urllib.urequest/urllib/urequest.py
@@ -1,4 +1,4 @@
-import usocket
+import socket
 
 
 def urlopen(url, data=None, method="GET"):
@@ -22,10 +22,10 @@ def urlopen(url, data=None, method="GET"):
         host, port = host.split(":", 1)
         port = int(port)
 
-    ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
+    ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
     ai = ai[0]
 
-    s = usocket.socket(ai[0], ai[1], ai[2])
+    s = socket.socket(ai[0], ai[1], ai[2])
     try:
         s.connect(ai[-1])
         if proto == "https:":
diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index b6bf515dd..a9a183619 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -1,4 +1,4 @@
-import usocket
+import socket
 
 
 class Response:
@@ -28,9 +28,9 @@ def text(self):
         return str(self.content, self.encoding)
 
     def json(self):
-        import ujson
+        import json
 
-        return ujson.loads(self.content)
+        return json.loads(self.content)
 
 
 def request(
@@ -51,11 +51,11 @@ def request(
     chunked_data = data and getattr(data, "__next__", None) and not getattr(data, "__len__", None)
 
     if auth is not None:
-        import ubinascii
+        import binascii
 
         username, password = auth
         formated = b"{}:{}".format(username, password)
-        formated = str(ubinascii.b2a_base64(formated)[:-1], "ascii")
+        formated = str(binascii.b2a_base64(formated)[:-1], "ascii")
         headers["Authorization"] = "Basic {}".format(formated)
 
     try:
@@ -76,14 +76,14 @@ def request(
         host, port = host.split(":", 1)
         port = int(port)
 
-    ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
+    ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
     ai = ai[0]
 
     resp_d = None
     if parse_headers is not False:
         resp_d = {}
 
-    s = usocket.socket(ai[0], usocket.SOCK_STREAM, ai[2])
+    s = socket.socket(ai[0], socket.SOCK_STREAM, ai[2])
 
     if timeout is not None:
         # Note: settimeout is not supported on all platforms, will raise
@@ -103,9 +103,9 @@ def request(
 
         if json is not None:
             assert data is None
-            import ujson
+            from json import dumps
 
-            data = ujson.dumps(json)
+            data = dumps(json)
 
             if "Content-Type" not in headers:
                 headers["Content-Type"] = "application/json"
diff --git a/python-ecosys/requests/test_requests.py b/python-ecosys/requests/test_requests.py
index 540d335cc..513e533a3 100644
--- a/python-ecosys/requests/test_requests.py
+++ b/python-ecosys/requests/test_requests.py
@@ -17,20 +17,20 @@ def readline(self):
         return self._read_buffer.readline()
 
 
-class usocket:
+class socket:
     AF_INET = 2
     SOCK_STREAM = 1
     IPPROTO_TCP = 6
 
     @staticmethod
     def getaddrinfo(host, port, af=0, type=0, flags=0):
-        return [(usocket.AF_INET, usocket.SOCK_STREAM, usocket.IPPROTO_TCP, "", ("127.0.0.1", 80))]
+        return [(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, "", ("127.0.0.1", 80))]
 
     def socket(af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP):
         return Socket()
 
 
-sys.modules["usocket"] = usocket
+sys.modules["socket"] = socket
 # ruff: noqa: E402
 import requests
 
diff --git a/python-stdlib/argparse/argparse.py b/python-stdlib/argparse/argparse.py
index cb575dd24..5c92887f9 100644
--- a/python-stdlib/argparse/argparse.py
+++ b/python-stdlib/argparse/argparse.py
@@ -3,7 +3,7 @@
 """
 
 import sys
-from ucollections import namedtuple
+from collections import namedtuple
 
 
 class _ArgError(BaseException):
diff --git a/python-stdlib/binascii/test_binascii.py b/python-stdlib/binascii/test_binascii.py
index 942ddc51b..075b2ff3c 100644
--- a/python-stdlib/binascii/test_binascii.py
+++ b/python-stdlib/binascii/test_binascii.py
@@ -1,5 +1,5 @@
 from binascii import *
-import utime
+import time
 
 data = b"zlutoucky kun upel dabelske ody"
 h = hexlify(data)
@@ -14,10 +14,10 @@
 
 a2b_base64(b"as==") == b"j"
 
-start = utime.time()
+start = time.time()
 for x in range(100000):
     d = unhexlify(h)
 
-print("100000 iterations in: " + str(utime.time() - start))
+print("100000 iterations in: " + str(time.time() - start))
 
 print("OK")
diff --git a/python-stdlib/copy/copy.py b/python-stdlib/copy/copy.py
index f7bfdd6a1..0a9283777 100644
--- a/python-stdlib/copy/copy.py
+++ b/python-stdlib/copy/copy.py
@@ -62,7 +62,7 @@ class Error(Exception):
 error = Error  # backward compatibility
 
 try:
-    from ucollections import OrderedDict
+    from collections import OrderedDict
 except ImportError:
     OrderedDict = None
 
diff --git a/python-stdlib/pkg_resources/pkg_resources.py b/python-stdlib/pkg_resources/pkg_resources.py
index cd3e0fe96..d69cb0577 100644
--- a/python-stdlib/pkg_resources/pkg_resources.py
+++ b/python-stdlib/pkg_resources/pkg_resources.py
@@ -1,4 +1,4 @@
-import uio
+import io
 
 c = {}
 
@@ -18,11 +18,11 @@ def resource_stream(package, resource):
             else:
                 d = "."
             #            if d[0] != "/":
-            #                import uos
-            #                d = uos.getcwd() + "/" + d
+            #                import os
+            #                d = os.getcwd() + "/" + d
             c[package] = d + "/"
 
     p = c[package]
     if isinstance(p, dict):
-        return uio.BytesIO(p[resource])
+        return io.BytesIO(p[resource])
     return open(p + resource, "rb")
diff --git a/unix-ffi/machine/example_timer.py b/unix-ffi/machine/example_timer.py
index a0d44110f..550d68cd3 100644
--- a/unix-ffi/machine/example_timer.py
+++ b/unix-ffi/machine/example_timer.py
@@ -1,4 +1,4 @@
-import utime
+import time
 from machine import Timer
 
 
@@ -7,5 +7,5 @@
 t1.callback(lambda t: print(t, "tick1"))
 t2.callback(lambda t: print(t, "tick2"))
 
-utime.sleep(3)
+time.sleep(3)
 print("done")
diff --git a/unix-ffi/machine/machine/timer.py b/unix-ffi/machine/machine/timer.py
index 1aa53f936..3f371142c 100644
--- a/unix-ffi/machine/machine/timer.py
+++ b/unix-ffi/machine/machine/timer.py
@@ -1,9 +1,7 @@
 import ffilib
 import uctypes
 import array
-import uos
 import os
-import utime
 from signal import *
 
 libc = ffilib.libc()
diff --git a/unix-ffi/os/os/__init__.py b/unix-ffi/os/os/__init__.py
index 3cca078f9..6c87da892 100644
--- a/unix-ffi/os/os/__init__.py
+++ b/unix-ffi/os/os/__init__.py
@@ -1,5 +1,5 @@
 import array
-import ustruct as struct
+import struct
 import errno as errno_
 import stat as stat_
 import ffilib
diff --git a/unix-ffi/pwd/pwd.py b/unix-ffi/pwd/pwd.py
index 29ebe3416..561269ed2 100644
--- a/unix-ffi/pwd/pwd.py
+++ b/unix-ffi/pwd/pwd.py
@@ -1,8 +1,8 @@
 import ffilib
 import uctypes
-import ustruct
+import struct
 
-from ucollections import namedtuple
+from collections import namedtuple
 
 
 libc = ffilib.libc()
@@ -20,6 +20,6 @@ def getpwnam(user):
     if not passwd:
         raise KeyError("getpwnam(): name not found: {}".format(user))
     passwd_fmt = "SSIISSS"
-    passwd = uctypes.bytes_at(passwd, ustruct.calcsize(passwd_fmt))
-    passwd = ustruct.unpack(passwd_fmt, passwd)
+    passwd = uctypes.bytes_at(passwd, struct.calcsize(passwd_fmt))
+    passwd = struct.unpack(passwd_fmt, passwd)
     return struct_passwd(*passwd)
diff --git a/unix-ffi/select/select.py b/unix-ffi/select/select.py
index eec9bfb81..9d514a31d 100644
--- a/unix-ffi/select/select.py
+++ b/unix-ffi/select/select.py
@@ -1,5 +1,5 @@
 import ffi
-import ustruct as struct
+import struct
 import os
 import errno
 import ffilib
diff --git a/unix-ffi/time/time.py b/unix-ffi/time/time.py
index 075d904f5..319228dc8 100644
--- a/unix-ffi/time/time.py
+++ b/unix-ffi/time/time.py
@@ -1,6 +1,6 @@
 from utime import *
-from ucollections import namedtuple
-import ustruct
+from collections import namedtuple
+import struct
 import uctypes
 import ffi
 import ffilib
@@ -34,13 +34,13 @@
 
 
 def _tuple_to_c_tm(t):
-    return ustruct.pack(
+    return struct.pack(
         "@iiiiiiiii", t[5], t[4], t[3], t[2], t[1] - 1, t[0] - 1900, (t[6] + 1) % 7, t[7] - 1, t[8]
     )
 
 
 def _c_tm_to_tuple(tm):
-    t = ustruct.unpack("@iiiiiiiii", tm)
+    t = struct.unpack("@iiiiiiiii", tm)
     return _struct_time(
         t[5] + 1900, t[4] + 1, t[3], t[2], t[1], t[0], (t[6] - 1) % 7, t[7] + 1, t[8]
     )
@@ -64,7 +64,7 @@ def localtime(t=None):
         t = time()
 
     t = int(t)
-    a = ustruct.pack("l", t)
+    a = struct.pack("l", t)
     tm_p = localtime_(a)
     return _c_tm_to_tuple(uctypes.bytearray_at(tm_p, 36))
 
@@ -74,7 +74,7 @@ def gmtime(t=None):
         t = time()
 
     t = int(t)
-    a = ustruct.pack("l", t)
+    a = struct.pack("l", t)
     tm_p = gmtime_(a)
     return _c_tm_to_tuple(uctypes.bytearray_at(tm_p, 36))
 

From 2b3bd5b7e0da893ed9ef3c10951800960cb972ae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jun 2024 14:44:48 +1000
Subject: [PATCH 273/343] aioble/multitests: Store a reference to tasks and
 cancel when done.

Storing references to tasks is required by CPython, and enforced by Ruff
RUF006.  In this case it's also reasonable to cancel these tasks once the
test is finished.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../bluetooth/aioble/multitests/ble_write_order.py     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/micropython/bluetooth/aioble/multitests/ble_write_order.py b/micropython/bluetooth/aioble/multitests/ble_write_order.py
index ca47f3837..24da54c2d 100644
--- a/micropython/bluetooth/aioble/multitests/ble_write_order.py
+++ b/micropython/bluetooth/aioble/multitests/ble_write_order.py
@@ -44,12 +44,12 @@ async def instance0_task():
 
     # Register characteristic.written() handlers as asyncio background tasks.
     # The order of these is important!
-    asyncio.create_task(task_written(characteristic_second, "second"))
-    asyncio.create_task(task_written(characteristic_first, "first"))
+    task_second = asyncio.create_task(task_written(characteristic_second, "second"))
+    task_first = asyncio.create_task(task_written(characteristic_first, "first"))
 
     # This dummy task simulates background processing on a real system that
     # can block the asyncio loop for brief periods of time
-    asyncio.create_task(task_dummy())
+    task_dummy_ = asyncio.create_task(task_dummy())
 
     multitest.globals(BDADDR=aioble.config("mac"))
     multitest.next()
@@ -63,6 +63,10 @@ async def instance0_task():
 
         await connection.disconnected()
 
+    task_second.cancel()
+    task_first.cancel()
+    task_dummy_.cancel()
+
 
 async def task_written(chr, label):
     while True:

From 0b0e0cc2df253e42abffaf04ef5dc5d347f53101 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 16 Jun 2024 10:30:48 +1000
Subject: [PATCH 274/343] quopri: Remove dependency on test.support and
 subprocess in unit test.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/quopri/test_quopri.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/python-stdlib/quopri/test_quopri.py b/python-stdlib/quopri/test_quopri.py
index 5655dd8b0..b87e54842 100644
--- a/python-stdlib/quopri/test_quopri.py
+++ b/python-stdlib/quopri/test_quopri.py
@@ -1,7 +1,6 @@
-from test import support
 import unittest
 
-import sys, os, io, subprocess
+import sys, os, io
 import quopri
 
 
@@ -193,7 +192,8 @@ def test_decode_header(self):
         for p, e in self.HSTRINGS:
             self.assertEqual(quopri.decodestring(e, header=True), p)
 
-    def _test_scriptencode(self):
+    @unittest.skip("requires subprocess")
+    def test_scriptencode(self):
         (p, e) = self.STRINGS[-1]
         process = subprocess.Popen(
             [sys.executable, "-mquopri"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
@@ -210,7 +210,8 @@ def _test_scriptencode(self):
             self.assertEqual(cout[i], e[i])
         self.assertEqual(cout, e)
 
-    def _test_scriptdecode(self):
+    @unittest.skip("requires subprocess")
+    def test_scriptdecode(self):
         (p, e) = self.STRINGS[-1]
         process = subprocess.Popen(
             [sys.executable, "-mquopri", "-d"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
@@ -220,11 +221,3 @@ def _test_scriptdecode(self):
         cout = cout.decode("latin-1")
         p = p.decode("latin-1")
         self.assertEqual(cout.splitlines(), p.splitlines())
-
-
-def test_main():
-    support.run_unittest(QuopriTestCase)
-
-
-if __name__ == "__main__":
-    test_main()

From 469b81b567b9bb81ff6236c40f2959411e9ef1e5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 16 Jun 2024 10:41:05 +1000
Subject: [PATCH 275/343] contextlib: Use a list instead of deque for exit
 callbacks.

Since deque was removed from this repository the built-in one needs to be
used, and that doesn't have unbounded growth.  So use a list instead, which
is adequate becasue contextlib only needs append and pop, not double ended
behaviour (the previous pure-Python implementation of deque that was used
here anyway used a list as its storage container).

Also tweak the excessive-nesting test so it uses less memory and can run on
the unix port.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/contextlib/contextlib.py | 4 ++--
 python-stdlib/contextlib/manifest.py   | 2 +-
 python-stdlib/contextlib/tests.py      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python-stdlib/contextlib/contextlib.py b/python-stdlib/contextlib/contextlib.py
index 2b2020357..3e598b4b6 100644
--- a/python-stdlib/contextlib/contextlib.py
+++ b/python-stdlib/contextlib/contextlib.py
@@ -85,13 +85,13 @@ class ExitStack(object):
     """
 
     def __init__(self):
-        self._exit_callbacks = deque()
+        self._exit_callbacks = []
 
     def pop_all(self):
         """Preserve the context stack by transferring it to a new instance"""
         new_stack = type(self)()
         new_stack._exit_callbacks = self._exit_callbacks
-        self._exit_callbacks = deque()
+        self._exit_callbacks = []
         return new_stack
 
     def _push_cm_exit(self, cm, cm_exit):
diff --git a/python-stdlib/contextlib/manifest.py b/python-stdlib/contextlib/manifest.py
index 2894ec5c4..3e05bca18 100644
--- a/python-stdlib/contextlib/manifest.py
+++ b/python-stdlib/contextlib/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Port of contextlib for micropython", version="3.4.3")
+metadata(description="Port of contextlib for micropython", version="3.4.4")
 
 require("ucontextlib")
 require("collections")
diff --git a/python-stdlib/contextlib/tests.py b/python-stdlib/contextlib/tests.py
index 19f07add8..c122c452e 100644
--- a/python-stdlib/contextlib/tests.py
+++ b/python-stdlib/contextlib/tests.py
@@ -399,7 +399,7 @@ def test_exit_exception_chaining_suppress(self):
     def test_excessive_nesting(self):
         # The original implementation would die with RecursionError here
         with ExitStack() as stack:
-            for i in range(10000):
+            for i in range(5000):
                 stack.callback(int)
 
     def test_instance_bypass(self):

From 0d4b3635b4e87bb3a8f36e2e4c0c9198de9963ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 16 Jun 2024 10:42:18 +1000
Subject: [PATCH 276/343] datetime: Skip tests that require the host to be in
 UTC timezone.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/datetime/test_datetime.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python-stdlib/datetime/test_datetime.py b/python-stdlib/datetime/test_datetime.py
index 372bdf3de..98da458f9 100644
--- a/python-stdlib/datetime/test_datetime.py
+++ b/python-stdlib/datetime/test_datetime.py
@@ -2082,9 +2082,11 @@ def test_timetuple00(self):
         with LocalTz("Europe/Rome"):
             self.assertEqual(dt1.timetuple()[:8], (2002, 1, 31, 0, 0, 0, 3, 31))
 
+    @unittest.skip("broken when running with non-UTC timezone")
     def test_timetuple01(self):
         self.assertEqual(dt27tz2.timetuple()[:8], (2010, 3, 27, 12, 0, 0, 5, 86))
 
+    @unittest.skip("broken when running with non-UTC timezone")
     def test_timetuple02(self):
         self.assertEqual(dt28tz2.timetuple()[:8], (2010, 3, 28, 12, 0, 0, 6, 87))
 

From f1c7f2885d1da1e0ed07407ff184fd9a9293465a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 16 Jun 2024 10:42:30 +1000
Subject: [PATCH 277/343] fnmatch: Don't require test.support, which no longer
 exists.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/fnmatch/test_fnmatch.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/python-stdlib/fnmatch/test_fnmatch.py b/python-stdlib/fnmatch/test_fnmatch.py
index 4eaeec63b..97ef8fff7 100644
--- a/python-stdlib/fnmatch/test_fnmatch.py
+++ b/python-stdlib/fnmatch/test_fnmatch.py
@@ -1,6 +1,5 @@
 """Test cases for the fnmatch module."""
 
-from test import support
 import unittest
 
 from fnmatch import fnmatch, fnmatchcase, translate, filter
@@ -79,11 +78,3 @@ def test_translate(self):
 class FilterTestCase(unittest.TestCase):
     def test_filter(self):
         self.assertEqual(filter(["a", "b"], "a"), ["a"])
-
-
-def main():
-    support.run_unittest(FnmatchTestCase, TranslateTestCase, FilterTestCase)
-
-
-if __name__ == "__main__":
-    main()

From 8834023d05c3fb9467875bda372af3afae2d98e9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jun 2024 11:16:53 +1000
Subject: [PATCH 278/343] hashlib: Only import pure Python hashlib when running
 test.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/hashlib/tests/test_sha256.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python-stdlib/hashlib/tests/test_sha256.py b/python-stdlib/hashlib/tests/test_sha256.py
index 024821b06..a311a8cc9 100644
--- a/python-stdlib/hashlib/tests/test_sha256.py
+++ b/python-stdlib/hashlib/tests/test_sha256.py
@@ -1,3 +1,7 @@
+# Prevent importing any built-in hashes, so this test tests only the pure Python hashes.
+import sys
+sys.modules['uhashlib'] = sys
+
 import unittest
 from hashlib import sha256
 

From 98f8a7e77181d9558c0080e6a6c9cf920503e4a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 Jun 2024 11:40:29 +1000
Subject: [PATCH 279/343] github/workflows: Add workflow to run package tests.

All of the runable package tests are run together in the new `tools/ci.sh`
function called `ci_package_tests_run`.  This is added to a new GitHub
workflow to test the packages as part of CI.

Some packages use `unittest` while others use an ad-hoc test script.
Eventually it would be good to unify all the package tests to use
`unittest`.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/package_tests.yml | 16 ++++++
 tools/ci.sh                         | 88 +++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 .github/workflows/package_tests.yml

diff --git a/.github/workflows/package_tests.yml b/.github/workflows/package_tests.yml
new file mode 100644
index 000000000..5e503509e
--- /dev/null
+++ b/.github/workflows/package_tests.yml
@@ -0,0 +1,16 @@
+name: Package tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+    - name: Setup environment
+      run: source tools/ci.sh && ci_package_tests_setup_micropython
+    - name: Setup libraries
+      run: source tools/ci.sh && ci_package_tests_setup_lib
+    - name: Run tests
+      run: source tools/ci.sh && ci_package_tests_run
diff --git a/tools/ci.sh b/tools/ci.sh
index 761491c6e..c2cf9dbad 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+CP=/bin/cp
+
 ########################################################################################
 # commit formatting
 
@@ -12,6 +14,92 @@ function ci_commit_formatting_run {
     tools/verifygitlog.py -v upstream/master..HEAD --no-merges
 }
 
+########################################################################################
+# package tests
+
+MICROPYTHON=/tmp/micropython/ports/unix/build-standard/micropython
+
+function ci_package_tests_setup_micropython {
+    git clone https://github.com/micropython/micropython.git /tmp/micropython
+
+    # build mpy-cross and micropython (use -O0 to speed up the build)
+    make -C /tmp/micropython/mpy-cross -j CFLAGS_EXTRA=-O0
+    make -C /tmp/micropython/ports/unix submodules
+    make -C /tmp/micropython/ports/unix -j CFLAGS_EXTRA=-O0
+}
+
+function ci_package_tests_setup_lib {
+    mkdir -p ~/.micropython/lib
+    $CP micropython/ucontextlib/ucontextlib.py ~/.micropython/lib/
+    $CP python-stdlib/fnmatch/fnmatch.py ~/.micropython/lib/
+    $CP -r python-stdlib/hashlib-core/hashlib ~/.micropython/lib/
+    $CP -r python-stdlib/hashlib-sha224/hashlib ~/.micropython/lib/
+    $CP -r python-stdlib/hashlib-sha256/hashlib ~/.micropython/lib/
+    $CP -r python-stdlib/hashlib-sha384/hashlib ~/.micropython/lib/
+    $CP -r python-stdlib/hashlib-sha512/hashlib ~/.micropython/lib/
+    $CP python-stdlib/shutil/shutil.py ~/.micropython/lib/
+    $CP python-stdlib/tempfile/tempfile.py ~/.micropython/lib/
+    $CP -r python-stdlib/unittest/unittest ~/.micropython/lib/
+    $CP -r python-stdlib/unittest-discover/unittest ~/.micropython/lib/
+    $CP unix-ffi/ffilib/ffilib.py ~/.micropython/lib/
+    tree ~/.micropython
+}
+
+function ci_package_tests_run {
+    for test in \
+        micropython/drivers/storage/sdcard/sdtest.py \
+        micropython/xmltok/test_xmltok.py \
+        python-ecosys/requests/test_requests.py \
+        python-stdlib/argparse/test_argparse.py \
+        python-stdlib/base64/test_base64.py \
+        python-stdlib/binascii/test_binascii.py \
+        python-stdlib/collections-defaultdict/test_defaultdict.py \
+        python-stdlib/functools/test_partial.py \
+        python-stdlib/functools/test_reduce.py \
+        python-stdlib/heapq/test_heapq.py \
+        python-stdlib/hmac/test_hmac.py \
+        python-stdlib/itertools/test_itertools.py \
+        python-stdlib/operator/test_operator.py \
+        python-stdlib/os-path/test_path.py \
+        python-stdlib/pickle/test_pickle.py \
+        python-stdlib/string/test_translate.py \
+        unix-ffi/gettext/test_gettext.py \
+        unix-ffi/pwd/test_getpwnam.py \
+        unix-ffi/re/test_re.py \
+        unix-ffi/time/test_strftime.py \
+        ; do
+        echo "Running test $test"
+        (cd `dirname $test` && $MICROPYTHON `basename $test`)
+        if [ $? -ne 0 ]; then
+            false # make this function return an error code
+            return
+        fi
+    done
+
+    for path in \
+        micropython/ucontextlib \
+        python-stdlib/contextlib \
+        python-stdlib/datetime \
+        python-stdlib/fnmatch \
+        python-stdlib/hashlib \
+        python-stdlib/pathlib \
+        python-stdlib/quopri \
+        python-stdlib/shutil \
+        python-stdlib/tempfile \
+        python-stdlib/time \
+        python-stdlib/unittest-discover/tests \
+        ; do
+        (cd $path && $MICROPYTHON -m unittest)
+        if [ $? -ne 0 ]; then false; return; fi
+    done
+
+    (cd micropython/usb/usb-device && $MICROPYTHON -m tests.test_core_buffer)
+    if [ $? -ne 0 ]; then false; return; fi
+
+    (cd python-ecosys/cbor2 && $MICROPYTHON -m examples.cbor_test)
+    if [ $? -ne 0 ]; then false; return; fi
+}
+
 ########################################################################################
 # build packages
 

From 50ac49c42b9853ac1f344f092684ea69109f9aff Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 6 Jun 2024 15:12:45 +1000
Subject: [PATCH 280/343] unittest-discover: Avoid adding test parent dir to
 sys.path.

When running tests from subfolders, import by "full dotted path" rather
than just module name, removing the need to add the test parent folder to
`sys.path`.

This matches CPython more closely, which places `abspath(top)` at the start
of `sys.path` but doesn't include the test file parent dir at all.

It fixes issues where projects may include a `test_xxx.py` file in their
distribution which would (prior to this change) be unintentionally found by
unittest-discover.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 python-stdlib/unittest-discover/manifest.py   |  2 +-
 .../unittest-discover/tests/sub/sub.py        |  1 +
 .../tests/sub/test_module_import.py           | 13 +++++++++++++
 .../unittest-discover/unittest/__main__.py    | 19 +++++++++++++------
 4 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 python-stdlib/unittest-discover/tests/sub/sub.py
 create mode 100644 python-stdlib/unittest-discover/tests/sub/test_module_import.py

diff --git a/python-stdlib/unittest-discover/manifest.py b/python-stdlib/unittest-discover/manifest.py
index 14bec5201..5610f41e2 100644
--- a/python-stdlib/unittest-discover/manifest.py
+++ b/python-stdlib/unittest-discover/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.1.2")
+metadata(version="0.1.3")
 
 require("argparse")
 require("fnmatch")
diff --git a/python-stdlib/unittest-discover/tests/sub/sub.py b/python-stdlib/unittest-discover/tests/sub/sub.py
new file mode 100644
index 000000000..b6614dd63
--- /dev/null
+++ b/python-stdlib/unittest-discover/tests/sub/sub.py
@@ -0,0 +1 @@
+imported = True
diff --git a/python-stdlib/unittest-discover/tests/sub/test_module_import.py b/python-stdlib/unittest-discover/tests/sub/test_module_import.py
new file mode 100644
index 000000000..5c6404d6f
--- /dev/null
+++ b/python-stdlib/unittest-discover/tests/sub/test_module_import.py
@@ -0,0 +1,13 @@
+import sys
+import unittest
+
+
+class TestModuleImport(unittest.TestCase):
+    def test_ModuleImportPath(self):
+        try:
+            from sub.sub import imported
+            assert imported
+        except ImportError:
+            print("This test is intended to be run with unittest discover"
+                  "from the unittest-discover/tests dir. sys.path:", sys.path)
+            raise
diff --git a/python-stdlib/unittest-discover/unittest/__main__.py b/python-stdlib/unittest-discover/unittest/__main__.py
index 8eb173a22..09dfd03b9 100644
--- a/python-stdlib/unittest-discover/unittest/__main__.py
+++ b/python-stdlib/unittest-discover/unittest/__main__.py
@@ -6,7 +6,12 @@
 from fnmatch import fnmatch
 from micropython import const
 
-from unittest import TestRunner, TestResult, TestSuite
+try:
+    from unittest import TestRunner, TestResult, TestSuite
+except ImportError:
+    print("Error: This must be used from an installed copy of unittest-discover which will"
+          " also install base unittest module.")
+    raise
 
 
 # Run a single test in a clean environment.
@@ -14,11 +19,11 @@ def _run_test_module(runner: TestRunner, module_name: str, *extra_paths: list[st
     module_snapshot = {k: v for k, v in sys.modules.items()}
     path_snapshot = sys.path[:]
     try:
-        for path in reversed(extra_paths):
+        for path in extra_paths:
             if path:
                 sys.path.insert(0, path)
 
-        module = __import__(module_name)
+        module = __import__(module_name, None, None, module_name)
         suite = TestSuite(module_name)
         suite._load_module(module)
         return runner.run(suite)
@@ -36,16 +41,18 @@ def _run_all_in_dir(runner: TestRunner, path: str, pattern: str, top: str):
     for fname, ftype, *_ in os.ilistdir(path):
         if fname in ("..", "."):
             continue
+        fpath = "/".join((path, fname))
         if ftype == _DIR_TYPE:
             result += _run_all_in_dir(
                 runner=runner,
-                path="/".join((path, fname)),
+                path=fpath,
                 pattern=pattern,
                 top=top,
             )
         if fnmatch(fname, pattern):
-            module_name = fname.rsplit(".", 1)[0]
-            result += _run_test_module(runner, module_name, path, top)
+            module_path = fpath.rsplit(".", 1)[0]  # remove ext
+            module_path = module_path.replace("/", ".").strip(".")
+            result += _run_test_module(runner, module_path, top)
     return result
 
 

From b5aa5f0d1bcfcd2f8ab14def0d86204ef02ae705 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 24 Jun 2024 16:51:26 -0500
Subject: [PATCH 281/343] logging: Fix StreamHandler to call parent
 constructor.

Otherwise there's a crash on line 70 where level is not a property of the
class unless explicitly set with `setLevel()`.
---
 python-stdlib/logging/logging.py  | 1 +
 python-stdlib/logging/manifest.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/logging/logging.py b/python-stdlib/logging/logging.py
index d17e42c4f..f4874df7d 100644
--- a/python-stdlib/logging/logging.py
+++ b/python-stdlib/logging/logging.py
@@ -58,6 +58,7 @@ def format(self, record):
 
 class StreamHandler(Handler):
     def __init__(self, stream=None):
+        super().__init__()
         self.stream = _stream if stream is None else stream
         self.terminator = "\n"
 
diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
index daf5d9c94..d9f0ee886 100644
--- a/python-stdlib/logging/manifest.py
+++ b/python-stdlib/logging/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.6.0")
+metadata(version="0.6.1")
 
 module("logging.py")

From 0a91a37563f6783d3913577705218fcea479edc7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 18 Jun 2024 17:17:46 +1000
Subject: [PATCH 282/343] usb-device-cdc: Fix lost data in read() path if short
 reads happened.

If the CDC receive buffer was full and some code read less than 64 bytes
(wMaxTransferSize), the CDC code would submit an OUT transfer with N<64
bytes length to fill the buffer back up.

However if the host had more than N bytes to send then it would still send
the full 64 bytes (correctly) in the transfer. The remaining (64-N) bytes
would be lost.

Adds the restriction that CDCInterface rxbuf has to be at least 64 bytes.

Fixes issue #885.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/usb/usb-device-cdc/manifest.py       |  2 +-
 micropython/usb/usb-device-cdc/usb/device/cdc.py | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/micropython/usb/usb-device-cdc/manifest.py b/micropython/usb/usb-device-cdc/manifest.py
index af9b8cb84..4520325e3 100644
--- a/micropython/usb/usb-device-cdc/manifest.py
+++ b/micropython/usb/usb-device-cdc/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("usb-device")
 package("usb")
diff --git a/micropython/usb/usb-device-cdc/usb/device/cdc.py b/micropython/usb/usb-device-cdc/usb/device/cdc.py
index 741eaafb2..28bfb0657 100644
--- a/micropython/usb/usb-device-cdc/usb/device/cdc.py
+++ b/micropython/usb/usb-device-cdc/usb/device/cdc.py
@@ -144,8 +144,8 @@ def init(
         if flow != 0:
             raise NotImplementedError  # UART flow control currently not supported
 
-        if not (txbuf and rxbuf):
-            raise ValueError  # Buffer sizes are required
+        if not (txbuf and rxbuf >= _BULK_EP_LEN):
+            raise ValueError  # Buffer sizes are required, rxbuf must be at least one EP
 
         self._timeout = timeout
         self._wb = Buffer(txbuf)
@@ -330,7 +330,11 @@ def _wr_cb(self, ep, res, num_bytes):
     def _rd_xfer(self):
         # Keep an active data OUT transfer to read data from the host,
         # whenever the receive buffer has room for new data
-        if self.is_open() and not self.xfer_pending(self.ep_d_out) and self._rb.writable():
+        if (
+            self.is_open()
+            and not self.xfer_pending(self.ep_d_out)
+            and self._rb.writable() >= _BULK_EP_LEN
+        ):
             # Can only submit up to the endpoint length per transaction, otherwise we won't
             # get any transfer callback until the full transaction completes.
             self.submit_xfer(self.ep_d_out, self._rb.pend_write(_BULK_EP_LEN), self._rd_cb)

From fbf7e120c6830d8d04097309e715bcab63dcca67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Jul 2024 17:18:49 +1000
Subject: [PATCH 283/343] usb-device-keyboard: Fix ; and ` keycode names.

They should be named as the un-shifted version.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/usb/usb-device-keyboard/manifest.py            | 2 +-
 micropython/usb/usb-device-keyboard/usb/device/keyboard.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/micropython/usb/usb-device-keyboard/manifest.py b/micropython/usb/usb-device-keyboard/manifest.py
index 923535c4c..5a2ff307d 100644
--- a/micropython/usb/usb-device-keyboard/manifest.py
+++ b/micropython/usb/usb-device-keyboard/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("usb-device-hid")
 package("usb")
diff --git a/micropython/usb/usb-device-keyboard/usb/device/keyboard.py b/micropython/usb/usb-device-keyboard/usb/device/keyboard.py
index c42405fc4..22091c50b 100644
--- a/micropython/usb/usb-device-keyboard/usb/device/keyboard.py
+++ b/micropython/usb/usb-device-keyboard/usb/device/keyboard.py
@@ -163,9 +163,9 @@ class KeyCode:
     CLOSE_BRACKET = 48  # ] }
     BACKSLASH = 49  # \ |
     HASH = 50  # # ~
-    COLON = 51  # ; :
+    SEMICOLON = 51  # ; :
     QUOTE = 52  # ' "
-    TILDE = 53  # ` ~
+    GRAVE = 53  # ` ~
     COMMA = 54  # , <
     DOT = 55  # . >
     SLASH = 56  # / ?

From 60d137029f169efde062464970cdee6f7367abb8 Mon Sep 17 00:00:00 2001
From: Max Holliday <maholli@pm.me>
Date: Mon, 8 Jul 2024 20:01:02 -0700
Subject: [PATCH 284/343] lora-sx126x: Change to class-level memoryview for
 _cmd buf.

Currently, the LoRa SX126x driver dynamically creates at least one,
sometimes two, memoryview objects with each call to `_cmd`.  This commit
simply provides the class with a long-lived memoryview object for `_cmd` to
easily slice as necessary.

Unlike the SX127x chips, Semtech unfortunately designed the SX126x modems
to be more command-centric (as opposed to directly setting registers).
Given the amount `_cmd` is called during normal device operation, even a
minor improvement here should have a decent impact.

Basic TX and RX tests pass on hardware.

Signed-off-by: Max Holliday <maholli@stanford.edu>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 12 ++++++------
 micropython/lora/lora-sx126x/manifest.py    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index eeb3bffb7..77052c97c 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -152,7 +152,7 @@ def __init__(
             dio3_tcxo_start_time_us if dio3_tcxo_millivolts else 0
         )
 
-        self._buf = bytearray(9)  # shared buffer for commands
+        self._buf_view = memoryview(bytearray(9))  # shared buffer for commands
 
         # These settings are kept in the object (as can't read them back from the modem)
         self._output_power = 14
@@ -704,11 +704,11 @@ def _cmd(self, fmt, *write_args, n_read=0, write_buf=None, read_buf=None):
         # have happened well before _cmd() is called again.
         self._wait_not_busy(self._busy_timeout)
 
-        # Pack write_args into _buf and wrap a memoryview of the correct length around it
+        # Pack write_args into slice of _buf_view memoryview of correct length
         wrlen = struct.calcsize(fmt)
-        assert n_read + wrlen <= len(self._buf)  # if this fails, make _buf bigger!
-        struct.pack_into(fmt, self._buf, 0, *write_args)
-        buf = memoryview(self._buf)[: (wrlen + n_read)]
+        assert n_read + wrlen <= len(self._buf_view)  # if this fails, make _buf bigger!
+        struct.pack_into(fmt, self._buf_view, 0, *write_args)
+        buf = self._buf_view[: (wrlen + n_read)]
 
         if _DEBUG:
             print(">>> {}".format(buf[:wrlen].hex()))
@@ -723,7 +723,7 @@ def _cmd(self, fmt, *write_args, n_read=0, write_buf=None, read_buf=None):
         self._cs(1)
 
         if n_read > 0:
-            res = memoryview(buf)[wrlen : (wrlen + n_read)]  # noqa: E203
+            res = self._buf_view[wrlen : (wrlen + n_read)]  # noqa: E203
             if _DEBUG:
                 print("<<< {}".format(res.hex()))
             return res
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
index 177877091..785a975aa 100644
--- a/micropython/lora/lora-sx126x/manifest.py
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.2")
+metadata(version="0.1.3")
 require("lora")
 package("lora")

From 910af1889cbb992b63e6de769d1b241375582334 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Aug 2024 16:32:43 +1000
Subject: [PATCH 285/343] tools/build.py: Add "path" entry to index.json.

This points to the package's base directory of the within the
micropython-lib directory structure.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/build.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index ca664175f..442cf2121 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -64,7 +64,7 @@
 
 # index.json is:
 # {
-#   "v": 1,                      <-- file format version
+#   "v": 2,                      <-- file format version
 #   "updated": <utc-seconds-since-1970>,
 #   "packages": {
 #     {
@@ -78,7 +78,9 @@
 #         "7": ["0.2", "0.3", "0.4"],
 #         ...                    <-- Other bytecode versions
 #         "py": ["0.1", "0.2", "0.3", "0.4"]
-#       }
+#       },
+#       // The following entries were added in file format version 2.
+#       path: "micropython/bluetooth/aioble",
 #     },
 #     ...
 #   }
@@ -122,7 +124,7 @@
 import time
 
 
-_JSON_VERSION_INDEX = 1
+_JSON_VERSION_INDEX = 2
 _JSON_VERSION_PACKAGE = 1
 
 
@@ -268,7 +270,7 @@ def _copy_as_py(
 
 # Update to the latest metadata, and add any new versions to the package in
 # the index json.
-def _update_index_package_metadata(index_package_json, metadata, mpy_version):
+def _update_index_package_metadata(index_package_json, metadata, mpy_version, package_path):
     index_package_json["version"] = metadata.version or ""
     index_package_json["author"] = ""  # TODO: Make manifestfile.py capture this.
     index_package_json["description"] = metadata.description or ""
@@ -283,6 +285,9 @@ def _update_index_package_metadata(index_package_json, metadata, mpy_version):
                 print("  New version {}={}".format(v, metadata.version))
                 index_package_json["versions"][v].append(metadata.version)
 
+    # The following entries were added in file format version 2.
+    index_package_json["path"] = package_path
+
 
 def build(output_path, hash_prefix_len, mpy_cross_path):
     import manifestfile
@@ -318,7 +323,8 @@ def build(output_path, hash_prefix_len, mpy_cross_path):
 
     for lib_dir in lib_dirs:
         for manifest_path in glob.glob(os.path.join(lib_dir, "**", "manifest.py"), recursive=True):
-            print("{}".format(os.path.dirname(manifest_path)))
+            package_path = os.path.dirname(manifest_path)
+            print("{}".format(package_path))
             # .../foo/manifest.py -> foo
             package_name = os.path.basename(os.path.dirname(manifest_path))
 
@@ -342,7 +348,9 @@ def build(output_path, hash_prefix_len, mpy_cross_path):
                 }
                 index_json["packages"].append(index_package_json)
 
-            _update_index_package_metadata(index_package_json, manifest.metadata(), mpy_version)
+            _update_index_package_metadata(
+                index_package_json, manifest.metadata(), mpy_version, package_path
+            )
 
             # This is the package json that mip/mpremote downloads.
             mpy_package_json = {

From 8d6ebf57a2e9e610cb11edcd9d3704505e091ba5 Mon Sep 17 00:00:00 2001
From: Robert Klink <rhermanklink@ripe.net>
Date: Wed, 31 Jul 2024 13:58:54 +0200
Subject: [PATCH 286/343] unix-ffi/sqlite3: Fix bytes to accommodate for
 different pointer sizes.

Currently, the bytes object used to store the sqlite3 database pointer
is always 4 bytes, which causes segfaults on 64 bit platforms with 8
byte pointers. To address this, the size is now dynamically determined
using the uctypes modules pointer size.

Signed-off-by: Robert Klink <rhermanklink@ripe.net>
---
 unix-ffi/sqlite3/sqlite3.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/unix-ffi/sqlite3/sqlite3.py b/unix-ffi/sqlite3/sqlite3.py
index 0f00ff508..1f8bdd6c9 100644
--- a/unix-ffi/sqlite3/sqlite3.py
+++ b/unix-ffi/sqlite3/sqlite3.py
@@ -1,5 +1,6 @@
 import sys
 import ffilib
+import uctypes
 
 
 sq3 = ffilib.open("libsqlite3")
@@ -61,6 +62,10 @@ def check_error(db, s):
         raise Error(s, sqlite3_errmsg(db))
 
 
+def get_ptr_size():
+    return uctypes.sizeof({"ptr": (0 | uctypes.PTR, uctypes.PTR)})
+
+
 class Connections:
     def __init__(self, h):
         self.h = h
@@ -83,13 +88,13 @@ def execute(self, sql, params=None):
             params = [quote(v) for v in params]
             sql = sql % tuple(params)
         print(sql)
-        b = bytearray(4)
-        s = sqlite3_prepare(self.h, sql, -1, b, None)
-        check_error(self.h, s)
-        self.stmnt = int.from_bytes(b, sys.byteorder)
-        # print("stmnt", self.stmnt)
+
+        stmnt_ptr = bytes(get_ptr_size())
+        res = sqlite3_prepare(self.h, sql, -1, stmnt_ptr, None)
+        check_error(self.h, res)
+        self.stmnt = int.from_bytes(stmnt_ptr, sys.byteorder)
         self.num_cols = sqlite3_column_count(self.stmnt)
-        # print("num_cols", self.num_cols)
+
         # If it's not select, actually execute it here
         # num_cols == 0 for statements which don't return data (=> modify it)
         if not self.num_cols:
@@ -127,10 +132,9 @@ def fetchone(self):
 
 
 def connect(fname):
-    b = bytearray(4)
-    sqlite3_open(fname, b)
-    h = int.from_bytes(b, sys.byteorder)
-    return Connections(h)
+    sqlite_ptr = bytes(get_ptr_size())
+    sqlite3_open(fname, sqlite_ptr)
+    return Connections(int.from_bytes(sqlite_ptr, sys.byteorder))
 
 
 def quote(val):

From 0a65c3d34a4f7c6bf5ed88fe78d4b7f24dc71cdd Mon Sep 17 00:00:00 2001
From: Robert Klink <rhermanklink@ripe.net>
Date: Wed, 31 Jul 2024 14:34:41 +0200
Subject: [PATCH 287/343] unix-ffi/sqlite3: Fix statements not being finalized.

Currently, statements are only finalized upon a call to Cursor.close().
However, in Cursor.execute() new statements get created without the
previous statements being finalized, causing those to get leaked,
preventing the database from being closed. The fix addresses this by
finalizing the previous statement if it exists.

Signed-off-by: Robert Klink <rhermanklink@ripe.net>
---
 unix-ffi/sqlite3/sqlite3.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/unix-ffi/sqlite3/sqlite3.py b/unix-ffi/sqlite3/sqlite3.py
index 1f8bdd6c9..24175ec17 100644
--- a/unix-ffi/sqlite3/sqlite3.py
+++ b/unix-ffi/sqlite3/sqlite3.py
@@ -84,6 +84,11 @@ def __init__(self, h):
         self.stmnt = None
 
     def execute(self, sql, params=None):
+        if self.stmnt:
+            # If there is an existing statement, finalize that to free it
+            res = sqlite3_finalize(self.stmnt)
+            check_error(self.h, res)
+
         if params:
             params = [quote(v) for v in params]
             sql = sql % tuple(params)

From ab9c5a01b0a62ad97b47ca02caf6bad8eb8f5a42 Mon Sep 17 00:00:00 2001
From: Robert Klink <rhermanklink@ripe.net>
Date: Wed, 31 Jul 2024 14:38:25 +0200
Subject: [PATCH 288/343] unix-ffi/sqlite3: Add optional parameter for URI
 support.

This commit adds the ability to enable URI on the connect, as can be done
in the cpython sqlite3 module. URI allows, among other things, to create
a shared named in-memory database, which non URI filenames cannot create.

Signed-off-by: Robert Klink <rhermanklink@ripe.net>
---
 unix-ffi/sqlite3/sqlite3.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/unix-ffi/sqlite3/sqlite3.py b/unix-ffi/sqlite3/sqlite3.py
index 24175ec17..9c645200c 100644
--- a/unix-ffi/sqlite3/sqlite3.py
+++ b/unix-ffi/sqlite3/sqlite3.py
@@ -6,6 +6,8 @@
 sq3 = ffilib.open("libsqlite3")
 
 sqlite3_open = sq3.func("i", "sqlite3_open", "sp")
+# int sqlite3_config(int, ...);
+sqlite3_config = sq3.func("i", "sqlite3_config", "ii")
 # int sqlite3_close(sqlite3*);
 sqlite3_close = sq3.func("i", "sqlite3_close", "p")
 # int sqlite3_prepare(
@@ -52,6 +54,8 @@
 SQLITE_BLOB = 4
 SQLITE_NULL = 5
 
+SQLITE_CONFIG_URI = 17
+
 
 class Error(Exception):
     pass
@@ -136,7 +140,9 @@ def fetchone(self):
         check_error(self.h, res)
 
 
-def connect(fname):
+def connect(fname, uri=False):
+    sqlite3_config(SQLITE_CONFIG_URI, int(uri))
+
     sqlite_ptr = bytes(get_ptr_size())
     sqlite3_open(fname, sqlite_ptr)
     return Connections(int.from_bytes(sqlite_ptr, sys.byteorder))

From 83598cdb3c7fd92928d2ac953141fc0f70793e05 Mon Sep 17 00:00:00 2001
From: Robert Klink <rhermanklink@ripe.net>
Date: Thu, 1 Aug 2024 11:28:22 +0200
Subject: [PATCH 289/343] unix-ffi/sqlite3: Change to use close and prepare v2
 versions, clean-up.

The sqlite3_prepare and sqlite3_close have been changed to use the v2
version. For the prepare this was done as the v1 version is "legacy",
and for close the documentation describes the v2 version to be used for
"host languages that are garbage collected, and where the order in
which destructors are called is arbitrary", which fits here.

Some clean-up to comments has also be done, and the tests now also
close the Cursor and Connections.

Signed-off-by: Robert Klink <rhermanklink@ripe.net>
---
 unix-ffi/sqlite3/sqlite3.py        | 40 ++++++++++++++++--------------
 unix-ffi/sqlite3/test_sqlite3.py   |  3 +++
 unix-ffi/sqlite3/test_sqlite3_2.py |  3 +++
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/unix-ffi/sqlite3/sqlite3.py b/unix-ffi/sqlite3/sqlite3.py
index 9c645200c..35c0c011e 100644
--- a/unix-ffi/sqlite3/sqlite3.py
+++ b/unix-ffi/sqlite3/sqlite3.py
@@ -5,11 +5,15 @@
 
 sq3 = ffilib.open("libsqlite3")
 
+# int sqlite3_open(
+#  const char *filename,   /* Database filename (UTF-8) */
+#  sqlite3 **ppDb          /* OUT: SQLite db handle */
+# );
 sqlite3_open = sq3.func("i", "sqlite3_open", "sp")
 # int sqlite3_config(int, ...);
 sqlite3_config = sq3.func("i", "sqlite3_config", "ii")
-# int sqlite3_close(sqlite3*);
-sqlite3_close = sq3.func("i", "sqlite3_close", "p")
+# int sqlite3_close_v2(sqlite3*);
+sqlite3_close = sq3.func("i", "sqlite3_close_v2", "p")
 # int sqlite3_prepare(
 #  sqlite3 *db,            /* Database handle */
 #  const char *zSql,       /* SQL statement, UTF-8 encoded */
@@ -17,7 +21,7 @@
 #  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
 #  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
 # );
-sqlite3_prepare = sq3.func("i", "sqlite3_prepare", "psipp")
+sqlite3_prepare = sq3.func("i", "sqlite3_prepare_v2", "psipp")
 # int sqlite3_finalize(sqlite3_stmt *pStmt);
 sqlite3_finalize = sq3.func("i", "sqlite3_finalize", "p")
 # int sqlite3_step(sqlite3_stmt*);
@@ -26,20 +30,17 @@
 sqlite3_column_count = sq3.func("i", "sqlite3_column_count", "p")
 # int sqlite3_column_type(sqlite3_stmt*, int iCol);
 sqlite3_column_type = sq3.func("i", "sqlite3_column_type", "pi")
+# int sqlite3_column_int(sqlite3_stmt*, int iCol);
 sqlite3_column_int = sq3.func("i", "sqlite3_column_int", "pi")
-# using "d" return type gives wrong results
+# double sqlite3_column_double(sqlite3_stmt*, int iCol);
 sqlite3_column_double = sq3.func("d", "sqlite3_column_double", "pi")
+# const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
 sqlite3_column_text = sq3.func("s", "sqlite3_column_text", "pi")
 # sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
-# TODO: should return long int
-sqlite3_last_insert_rowid = sq3.func("i", "sqlite3_last_insert_rowid", "p")
+sqlite3_last_insert_rowid = sq3.func("l", "sqlite3_last_insert_rowid", "p")
 # const char *sqlite3_errmsg(sqlite3*);
 sqlite3_errmsg = sq3.func("s", "sqlite3_errmsg", "p")
 
-# Too recent
-##const char *sqlite3_errstr(int);
-# sqlite3_errstr = sq3.func("s", "sqlite3_errstr", "i")
-
 
 SQLITE_OK = 0
 SQLITE_ERROR = 1
@@ -78,8 +79,10 @@ def cursor(self):
         return Cursor(self.h)
 
     def close(self):
-        s = sqlite3_close(self.h)
-        check_error(self.h, s)
+        if self.h:
+            s = sqlite3_close(self.h)
+            check_error(self.h, s)
+            self.h = None
 
 
 class Cursor:
@@ -96,7 +99,6 @@ def execute(self, sql, params=None):
         if params:
             params = [quote(v) for v in params]
             sql = sql % tuple(params)
-        print(sql)
 
         stmnt_ptr = bytes(get_ptr_size())
         res = sqlite3_prepare(self.h, sql, -1, stmnt_ptr, None)
@@ -104,22 +106,23 @@ def execute(self, sql, params=None):
         self.stmnt = int.from_bytes(stmnt_ptr, sys.byteorder)
         self.num_cols = sqlite3_column_count(self.stmnt)
 
-        # If it's not select, actually execute it here
-        # num_cols == 0 for statements which don't return data (=> modify it)
         if not self.num_cols:
             v = self.fetchone()
+            # If it's not select, actually execute it here
+            # num_cols == 0 for statements which don't return data (=> modify it)
             assert v is None
             self.lastrowid = sqlite3_last_insert_rowid(self.h)
 
     def close(self):
-        s = sqlite3_finalize(self.stmnt)
-        check_error(self.h, s)
+        if self.stmnt:
+            s = sqlite3_finalize(self.stmnt)
+            check_error(self.h, s)
+            self.stmnt = None
 
     def make_row(self):
         res = []
         for i in range(self.num_cols):
             t = sqlite3_column_type(self.stmnt, i)
-            # print("type", t)
             if t == SQLITE_INTEGER:
                 res.append(sqlite3_column_int(self.stmnt, i))
             elif t == SQLITE_FLOAT:
@@ -132,7 +135,6 @@ def make_row(self):
 
     def fetchone(self):
         res = sqlite3_step(self.stmnt)
-        # print("step:", res)
         if res == SQLITE_DONE:
             return None
         if res == SQLITE_ROW:
diff --git a/unix-ffi/sqlite3/test_sqlite3.py b/unix-ffi/sqlite3/test_sqlite3.py
index 39dc07549..b168f18ff 100644
--- a/unix-ffi/sqlite3/test_sqlite3.py
+++ b/unix-ffi/sqlite3/test_sqlite3.py
@@ -17,3 +17,6 @@
     assert row == e
 
 assert expected == []
+
+cur.close()
+conn.close()
diff --git a/unix-ffi/sqlite3/test_sqlite3_2.py b/unix-ffi/sqlite3/test_sqlite3_2.py
index 68a2abb86..515f865c3 100644
--- a/unix-ffi/sqlite3/test_sqlite3_2.py
+++ b/unix-ffi/sqlite3/test_sqlite3_2.py
@@ -10,3 +10,6 @@
 cur.execute("SELECT * FROM foo")
 assert cur.fetchone() == (42,)
 assert cur.fetchone() is None
+
+cur.close()
+conn.close()

From b77f67bd7ccd6701e2bf3333a50c56fa709b68fc Mon Sep 17 00:00:00 2001
From: Robert Klink <rhermanklink@ripe.net>
Date: Tue, 6 Aug 2024 15:24:39 +0200
Subject: [PATCH 290/343] unix-ffi/sqlite3: Add commit and rollback
 functionality like CPython.

To increase the similarity between this module and CPythons sqlite3 module
the commit() and rollback() as defined in CPythons version have been
added, along with the different (auto)commit behaviors present there.
The defaults are also set to the same as in CPython, and can be changed
with the same parameters in connect(), as is showcased in the new test.

Signed-off-by: Robert Klink <rhermanklink@ripe.net>
---
 unix-ffi/sqlite3/sqlite3.py        | 133 ++++++++++++++++++++---------
 unix-ffi/sqlite3/test_sqlite3_3.py |  42 +++++++++
 2 files changed, 137 insertions(+), 38 deletions(-)
 create mode 100644 unix-ffi/sqlite3/test_sqlite3_3.py

diff --git a/unix-ffi/sqlite3/sqlite3.py b/unix-ffi/sqlite3/sqlite3.py
index 35c0c011e..299f8247d 100644
--- a/unix-ffi/sqlite3/sqlite3.py
+++ b/unix-ffi/sqlite3/sqlite3.py
@@ -12,6 +12,8 @@
 sqlite3_open = sq3.func("i", "sqlite3_open", "sp")
 # int sqlite3_config(int, ...);
 sqlite3_config = sq3.func("i", "sqlite3_config", "ii")
+# int sqlite3_get_autocommit(sqlite3*);
+sqlite3_get_autocommit = sq3.func("i", "sqlite3_get_autocommit", "p")
 # int sqlite3_close_v2(sqlite3*);
 sqlite3_close = sq3.func("i", "sqlite3_close_v2", "p")
 # int sqlite3_prepare(
@@ -57,6 +59,9 @@
 
 SQLITE_CONFIG_URI = 17
 
+# For compatibility with CPython sqlite3 driver
+LEGACY_TRANSACTION_CONTROL = -1
+
 
 class Error(Exception):
     pass
@@ -71,86 +76,138 @@ def get_ptr_size():
     return uctypes.sizeof({"ptr": (0 | uctypes.PTR, uctypes.PTR)})
 
 
+def __prepare_stmt(db, sql):
+    # Prepares a statement
+    stmt_ptr = bytes(get_ptr_size())
+    res = sqlite3_prepare(db, sql, -1, stmt_ptr, None)
+    check_error(db, res)
+    return int.from_bytes(stmt_ptr, sys.byteorder)
+
+def __exec_stmt(db, sql):
+    # Prepares, executes, and finalizes a statement
+    stmt = __prepare_stmt(db, sql)
+    sqlite3_step(stmt)
+    res = sqlite3_finalize(stmt)
+    check_error(db, res)
+
+def __is_dml(sql):
+    # Checks if a sql query is a DML, as these get a BEGIN in LEGACY_TRANSACTION_CONTROL
+    for dml in ["INSERT", "DELETE", "UPDATE", "MERGE"]:
+        if dml in sql.upper():
+            return True
+    return False
+
+
 class Connections:
-    def __init__(self, h):
-        self.h = h
+    def __init__(self, db, isolation_level, autocommit):
+        self.db = db
+        self.isolation_level = isolation_level
+        self.autocommit = autocommit
+
+    def commit(self):
+        if self.autocommit == LEGACY_TRANSACTION_CONTROL and not sqlite3_get_autocommit(self.db):
+            __exec_stmt(self.db, "COMMIT")
+        elif self.autocommit == False:
+            __exec_stmt(self.db, "COMMIT")
+            __exec_stmt(self.db, "BEGIN")
+
+    def rollback(self):
+        if self.autocommit == LEGACY_TRANSACTION_CONTROL and not sqlite3_get_autocommit(self.db):
+            __exec_stmt(self.db, "ROLLBACK")
+        elif self.autocommit == False:
+            __exec_stmt(self.db, "ROLLBACK")
+            __exec_stmt(self.db, "BEGIN")
 
     def cursor(self):
-        return Cursor(self.h)
+        return Cursor(self.db, self.isolation_level, self.autocommit)
 
     def close(self):
-        if self.h:
-            s = sqlite3_close(self.h)
-            check_error(self.h, s)
-            self.h = None
+        if self.db:
+            if self.autocommit == False and not sqlite3_get_autocommit(self.db):
+                __exec_stmt(self.db, "ROLLBACK")
+
+            res = sqlite3_close(self.db)
+            check_error(self.db, res)
+            self.db = None
 
 
 class Cursor:
-    def __init__(self, h):
-        self.h = h
-        self.stmnt = None
+    def __init__(self, db, isolation_level, autocommit):
+        self.db = db
+        self.isolation_level = isolation_level
+        self.autocommit = autocommit
+        self.stmt = None
+
+    def __quote(val):
+        if isinstance(val, str):
+            return "'%s'" % val
+        return str(val)
 
     def execute(self, sql, params=None):
-        if self.stmnt:
+        if self.stmt:
             # If there is an existing statement, finalize that to free it
-            res = sqlite3_finalize(self.stmnt)
-            check_error(self.h, res)
+            res = sqlite3_finalize(self.stmt)
+            check_error(self.db, res)
 
         if params:
-            params = [quote(v) for v in params]
+            params = [self.__quote(v) for v in params]
             sql = sql % tuple(params)
 
-        stmnt_ptr = bytes(get_ptr_size())
-        res = sqlite3_prepare(self.h, sql, -1, stmnt_ptr, None)
-        check_error(self.h, res)
-        self.stmnt = int.from_bytes(stmnt_ptr, sys.byteorder)
-        self.num_cols = sqlite3_column_count(self.stmnt)
+        if __is_dml(sql) and self.autocommit == LEGACY_TRANSACTION_CONTROL and sqlite3_get_autocommit(self.db):
+            # For compatibility with CPython, add functionality for their default transaction
+            # behavior. Changing autocommit from LEGACY_TRANSACTION_CONTROL will remove this
+            __exec_stmt(self.db, "BEGIN " + self.isolation_level)
+
+        self.stmt = __prepare_stmt(self.db, sql)
+        self.num_cols = sqlite3_column_count(self.stmt)
 
         if not self.num_cols:
             v = self.fetchone()
             # If it's not select, actually execute it here
             # num_cols == 0 for statements which don't return data (=> modify it)
             assert v is None
-            self.lastrowid = sqlite3_last_insert_rowid(self.h)
+            self.lastrowid = sqlite3_last_insert_rowid(self.db)
 
     def close(self):
-        if self.stmnt:
-            s = sqlite3_finalize(self.stmnt)
-            check_error(self.h, s)
-            self.stmnt = None
+        if self.stmt:
+            res = sqlite3_finalize(self.stmt)
+            check_error(self.db, res)
+            self.stmt = None
 
-    def make_row(self):
+    def __make_row(self):
         res = []
         for i in range(self.num_cols):
-            t = sqlite3_column_type(self.stmnt, i)
+            t = sqlite3_column_type(self.stmt, i)
             if t == SQLITE_INTEGER:
-                res.append(sqlite3_column_int(self.stmnt, i))
+                res.append(sqlite3_column_int(self.stmt, i))
             elif t == SQLITE_FLOAT:
-                res.append(sqlite3_column_double(self.stmnt, i))
+                res.append(sqlite3_column_double(self.stmt, i))
             elif t == SQLITE_TEXT:
-                res.append(sqlite3_column_text(self.stmnt, i))
+                res.append(sqlite3_column_text(self.stmt, i))
             else:
                 raise NotImplementedError
         return tuple(res)
 
     def fetchone(self):
-        res = sqlite3_step(self.stmnt)
+        res = sqlite3_step(self.stmt)
         if res == SQLITE_DONE:
             return None
         if res == SQLITE_ROW:
-            return self.make_row()
-        check_error(self.h, res)
+            return self.__make_row()
+        check_error(self.db, res)
+
 
+def connect(fname, uri=False, isolation_level="", autocommit=LEGACY_TRANSACTION_CONTROL):
+    if isolation_level not in [None, "", "DEFERRED", "IMMEDIATE", "EXCLUSIVE"]:
+        raise Error("Invalid option for isolation level")
 
-def connect(fname, uri=False):
     sqlite3_config(SQLITE_CONFIG_URI, int(uri))
 
     sqlite_ptr = bytes(get_ptr_size())
     sqlite3_open(fname, sqlite_ptr)
-    return Connections(int.from_bytes(sqlite_ptr, sys.byteorder))
+    db = int.from_bytes(sqlite_ptr, sys.byteorder)
 
+    if autocommit == False:
+        __exec_stmt(db, "BEGIN")
 
-def quote(val):
-    if isinstance(val, str):
-        return "'%s'" % val
-    return str(val)
+    return Connections(db, isolation_level, autocommit)
diff --git a/unix-ffi/sqlite3/test_sqlite3_3.py b/unix-ffi/sqlite3/test_sqlite3_3.py
new file mode 100644
index 000000000..0a6fefc97
--- /dev/null
+++ b/unix-ffi/sqlite3/test_sqlite3_3.py
@@ -0,0 +1,42 @@
+import sqlite3
+
+
+def test_autocommit():
+    conn = sqlite3.connect(":memory:", autocommit=True)
+
+    # First cursor creates table and inserts value (DML)
+    cur = conn.cursor()
+    cur.execute("CREATE TABLE foo(a int)")
+    cur.execute("INSERT INTO foo VALUES (42)")
+    cur.close()
+
+    # Second cursor fetches 42 due to the autocommit
+    cur = conn.cursor()
+    cur.execute("SELECT * FROM foo")
+    assert cur.fetchone() == (42,)
+    assert cur.fetchone() is None
+
+    cur.close()
+    conn.close()
+
+def test_manual():
+    conn = sqlite3.connect(":memory:", autocommit=False)
+
+    # First cursor creates table, insert rolls back
+    cur = conn.cursor()
+    cur.execute("CREATE TABLE foo(a int)")
+    conn.commit()
+    cur.execute("INSERT INTO foo VALUES (42)")
+    cur.close()
+    conn.rollback()
+
+    # Second connection fetches nothing due to the rollback
+    cur = conn.cursor()
+    cur.execute("SELECT * FROM foo")
+    assert cur.fetchone() is None
+
+    cur.close()
+    conn.close()
+
+test_autocommit()
+test_manual()

From bea5367ce23d9683d15ff19c16e246449827cb4b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Aug 2024 13:05:33 +1000
Subject: [PATCH 291/343] unix-ffi/sqlite3: Bump version to 0.3.0.

The previous commits fixed bugs and added new features.

Signed-off-by: Damien George <damien@micropython.org>
---
 unix-ffi/sqlite3/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix-ffi/sqlite3/manifest.py b/unix-ffi/sqlite3/manifest.py
index 63cdf4b9f..5b04d71d3 100644
--- a/unix-ffi/sqlite3/manifest.py
+++ b/unix-ffi/sqlite3/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.4")
+metadata(version="0.3.0")
 
 # Originally written by Paul Sokolovsky.
 

From 66fa62bda10d199be5b24457e044cb863d5d216a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Aug 2024 13:08:29 +1000
Subject: [PATCH 292/343] tools/ci.sh: Add sqlite3 tests to CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index c2cf9dbad..07b27d13c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -66,6 +66,9 @@ function ci_package_tests_run {
         unix-ffi/gettext/test_gettext.py \
         unix-ffi/pwd/test_getpwnam.py \
         unix-ffi/re/test_re.py \
+        unix-ffi/sqlite3/test_sqlite3.py \
+        unix-ffi/sqlite3/test_sqlite3_2.py \
+        unix-ffi/sqlite3/test_sqlite3_3.py \
         unix-ffi/time/test_strftime.py \
         ; do
         echo "Running test $test"

From 1effa11c77c409cbe938cac95a7331e4e1385f9a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 20 Feb 2024 10:49:42 +1100
Subject: [PATCH 293/343] CONTRIBUTING: Add extra explanation of "Publish
 packages for branch".

I hadn't used this feature for a while, and realised there's one confusing
element of it not previously mentioned in the docs.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 CONTRIBUTING.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d590754e9..61a49101e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -102,15 +102,20 @@ Pages](https://docs.github.com/en/pages):
    "truthy" value).
 5. The settings for GitHub Actions and GitHub Pages features should not need to
    be changed from the repository defaults, unless you've explicitly disabled
-   them.
+   Actions or Pages in your fork.
 
 The next time you push commits to a branch in your fork, GitHub Actions will run
 an additional step in the "Build All Packages" workflow named "Publish Packages
-for branch".
+for branch". This step runs in *your fork*, but if you open a pull request then
+this workflow is not shown in the Pull Request's "Checks". These run in the
+upstream repository. Navigate to your fork's Actions tab in order to see
+the additional "Publish Packages for branch" step.
 
 Anyone can then install these packages as described under [Installing packages
-from forks](README.md#installing-packages-from-forks). The exact commands are also
-quoted in the GitHub Actions log for the "Publish Packages for branch" step.
+from forks](README.md#installing-packages-from-forks).
+
+The exact command is also quoted in the GitHub Actions log in your fork's
+Actions for the "Publish Packages for branch" step of "Build All Packages".
 
 #### Opting Back Out
 

From 27e4d73bc2618d378a0610960cf5e81985e5d914 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 27 Aug 2024 12:04:27 +1000
Subject: [PATCH 294/343] umqtt.robust: Remove reference to missing example.

It looks like this example file was not added to the original commit back
in 6190cec14a6514c4adc8dfdc33b355be10db0400.

Fixes issue #320.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/umqtt.robust/example_sub_robust.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/micropython/umqtt.robust/example_sub_robust.py b/micropython/umqtt.robust/example_sub_robust.py
index c991c70a1..f09befe02 100644
--- a/micropython/umqtt.robust/example_sub_robust.py
+++ b/micropython/umqtt.robust/example_sub_robust.py
@@ -19,8 +19,7 @@ def sub_cb(topic, msg):
 #
 # There can be a problem when a session for a given client exists,
 # but doesn't have subscriptions a particular application expects.
-# In this case, a session needs to be cleaned first. See
-# example_reset_session.py for an obvious way how to do that.
+# In this case, a session needs to be cleaned first.
 #
 # In an actual application, it's up to its developer how to
 # manage these issues. One extreme is to have external "provisioning"

From 1d3c722b7d3b4ada25f248166cf056bc9155278f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 12 Jun 2024 15:42:18 +1000
Subject: [PATCH 295/343] usb: Fix race if transfers are submitted by a thread.

The USB pending transfer flag was cleared before calling the completion
callback, to allow the callback code to call submit_xfer() again.

Unfortunately this isn't safe in a multi-threaded environment, as another
thread may see the endpoint is available before the callback is done
executing and submit a new transfer.

Rather than adding extra locking, specifically treat the transfer as still
pending if checked from another thread while the callback is executing.

Closes #874

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/usb/usb-device/manifest.py        |  2 +-
 micropython/usb/usb-device/usb/device/core.py | 36 ++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/micropython/usb/usb-device/manifest.py b/micropython/usb/usb-device/manifest.py
index 0dfab932f..27c9aa88a 100644
--- a/micropython/usb/usb-device/manifest.py
+++ b/micropython/usb/usb-device/manifest.py
@@ -1,2 +1,2 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 package("usb")
diff --git a/micropython/usb/usb-device/usb/device/core.py b/micropython/usb/usb-device/usb/device/core.py
index 08277b1f4..06f0f33ce 100644
--- a/micropython/usb/usb-device/usb/device/core.py
+++ b/micropython/usb/usb-device/usb/device/core.py
@@ -8,6 +8,14 @@
 import machine
 import struct
 
+try:
+    from _thread import get_ident
+except ImportError:
+
+    def get_ident():
+        return 0  # Placeholder, for no threading support
+
+
 _EP_IN_FLAG = const(1 << 7)
 
 # USB descriptor types
@@ -76,6 +84,8 @@ def __init__(self):
         self._itfs = {}  # Mapping from interface number to interface object, set by init()
         self._eps = {}  # Mapping from endpoint address to interface object, set by _open_cb()
         self._ep_cbs = {}  # Mapping from endpoint address to Optional[xfer callback]
+        self._cb_thread = None  # Thread currently running endpoint callback
+        self._cb_ep = None  # Endpoint number currently running callback
         self._usbd = machine.USBDevice()  # low-level API
 
     def init(self, *itfs, **kwargs):
@@ -298,7 +308,7 @@ def _submit_xfer(self, ep_addr, data, done_cb=None):
         # that function for documentation about the possible parameter values.
         if ep_addr not in self._eps:
             raise ValueError("ep_addr")
-        if self._ep_cbs[ep_addr]:
+        if self._xfer_pending(ep_addr):
             raise RuntimeError("xfer_pending")
 
         # USBDevice callback may be called immediately, before Python execution
@@ -308,12 +318,25 @@ def _submit_xfer(self, ep_addr, data, done_cb=None):
         self._ep_cbs[ep_addr] = done_cb or True
         return self._usbd.submit_xfer(ep_addr, data)
 
+    def _xfer_pending(self, ep_addr):
+        # Singleton function to return True if transfer is pending on this endpoint.
+        #
+        # Generally, drivers should call Interface.xfer_pending() instead. See that
+        # function for more documentation.
+        return self._ep_cbs[ep_addr] or (self._cb_ep == ep_addr and self._cb_thread != get_ident())
+
     def _xfer_cb(self, ep_addr, result, xferred_bytes):
         # Singleton callback from TinyUSB custom class driver when a transfer completes.
         cb = self._ep_cbs.get(ep_addr, None)
+        self._cb_thread = get_ident()
+        self._cb_ep = ep_addr  # Track while callback is running
         self._ep_cbs[ep_addr] = None
-        if callable(cb):
-            cb(ep_addr, result, xferred_bytes)
+        try:
+            # For a pending xfer, 'cb' should either a callback function or True (if no callback)
+            if callable(cb):
+                cb(ep_addr, result, xferred_bytes)
+        finally:
+            self._cb_ep = None
 
     def _control_xfer_cb(self, stage, request):
         # Singleton callback from TinyUSB custom class driver when a control
@@ -528,7 +551,12 @@ def xfer_pending(self, ep_addr):
         # Return True if a transfer is already pending on ep_addr.
         #
         # Only one transfer can be submitted at a time.
-        return _dev and bool(_dev._ep_cbs[ep_addr])
+        #
+        # The transfer is marked pending while a completion callback is running
+        # for that endpoint, unless this function is called from the callback
+        # itself. This makes it simple to submit a new transfer from the
+        # completion callback.
+        return _dev and _dev._xfer_pending(ep_addr)
 
     def submit_xfer(self, ep_addr, data, done_cb=None):
         # Submit a USB transfer (of any type except control)

From 01f45c118f39610d8fcb2064d237b89ec5b81269 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 11 Jul 2024 11:23:23 +1000
Subject: [PATCH 296/343] usb: Add a note about buffer thread safety.

This is to replace a commit which added locking here but caused some other
problems. The idea behind the Buffer class is that a single producer can
call pend_write() more than once and it's idempotent, however this is very
complex to extend across multiple threads.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/usb/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/micropython/usb/README.md b/micropython/usb/README.md
index 342a0a7e0..d4b975d12 100644
--- a/micropython/usb/README.md
+++ b/micropython/usb/README.md
@@ -134,3 +134,15 @@ USB MIDI devices in MicroPython.
 
 The example [midi_example.py](examples/device/midi_example.py) demonstrates how
 to create a simple MIDI device to send MIDI data to and from the USB host.
+
+### Limitations
+
+#### Buffer thread safety
+
+The internal Buffer class that's used by most of the USB device classes expects data
+to be written to it (i.e. sent to the host) by only one thread. Bytes may be
+lost from the USB transfers if more than one thread (or a thread and a callback)
+try to write to the buffer simultaneously.
+
+If writing USB data from multiple sources, your code may need to add
+synchronisation (i.e. locks).

From c61ca51c6743a95fe8dd5b3345dca41355238271 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 11 Sep 2024 17:18:57 +1000
Subject: [PATCH 297/343] usb: Tidy up the description of TinyUSB callbacks.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/usb/usb-device/usb/device/core.py | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/micropython/usb/usb-device/usb/device/core.py b/micropython/usb/usb-device/usb/device/core.py
index 06f0f33ce..2d6790798 100644
--- a/micropython/usb/usb-device/usb/device/core.py
+++ b/micropython/usb/usb-device/usb/device/core.py
@@ -252,8 +252,8 @@ def active(self, *optional_value):
         return self._usbd.active(*optional_value)
 
     def _open_itf_cb(self, desc):
-        # Singleton callback from TinyUSB custom class driver, when USB host does
-        # Set Configuration. Called once per interface or IAD.
+        # Callback from TinyUSB lower layer, when USB host does Set
+        # Configuration. Called once per interface or IAD.
 
         # Note that even if the configuration descriptor contains an IAD, 'desc'
         # starts from the first interface descriptor in the IAD and not the IAD
@@ -291,7 +291,7 @@ def _open_itf_cb(self, desc):
             itf.on_open()
 
     def _reset_cb(self):
-        # Callback when the USB device is reset by the host
+        # TinyUSB lower layer callback when the USB device is reset by the host
 
         # Allow interfaces to respond to the reset
         for itf in self._itfs.values():
@@ -302,7 +302,7 @@ def _reset_cb(self):
         self._ep_cbs = {}
 
     def _submit_xfer(self, ep_addr, data, done_cb=None):
-        # Singleton function to submit a USB transfer (of any type except control).
+        # Submit a USB transfer (of any type except control) to TinyUSB lower layer.
         #
         # Generally, drivers should call Interface.submit_xfer() instead. See
         # that function for documentation about the possible parameter values.
@@ -319,27 +319,31 @@ def _submit_xfer(self, ep_addr, data, done_cb=None):
         return self._usbd.submit_xfer(ep_addr, data)
 
     def _xfer_pending(self, ep_addr):
-        # Singleton function to return True if transfer is pending on this endpoint.
+        # Returns True if a transfer is pending on this endpoint.
         #
         # Generally, drivers should call Interface.xfer_pending() instead. See that
         # function for more documentation.
         return self._ep_cbs[ep_addr] or (self._cb_ep == ep_addr and self._cb_thread != get_ident())
 
     def _xfer_cb(self, ep_addr, result, xferred_bytes):
-        # Singleton callback from TinyUSB custom class driver when a transfer completes.
+        # Callback from TinyUSB lower layer when a transfer completes.
         cb = self._ep_cbs.get(ep_addr, None)
         self._cb_thread = get_ident()
         self._cb_ep = ep_addr  # Track while callback is running
         self._ep_cbs[ep_addr] = None
+
+        # In most cases, 'cb' is a callback function for the transfer. Can also be:
+        # - True (for a transfer with no callback)
+        # - None (TinyUSB callback arrived for invalid endpoint, or no transfer.
+        #   Generally unlikely, but may happen in transient states.)
         try:
-            # For a pending xfer, 'cb' should either a callback function or True (if no callback)
             if callable(cb):
                 cb(ep_addr, result, xferred_bytes)
         finally:
             self._cb_ep = None
 
     def _control_xfer_cb(self, stage, request):
-        # Singleton callback from TinyUSB custom class driver when a control
+        # Callback from TinyUSB lower layer when a control
         # transfer is in progress.
         #
         # stage determines appropriate responses (possible values

From 394cbfc98a333dd1d4db35fb69379c72c30337f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Sep 2024 14:03:52 +1000
Subject: [PATCH 298/343] base64: Remove struct dependency from manifest.

This base64 library only uses `struct.unpack` which is available in the
built-in `struct` module, so no need for the micropython-lib extras.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/base64/manifest.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
index 613d3bc62..9e1b31751 100644
--- a/python-stdlib/base64/manifest.py
+++ b/python-stdlib/base64/manifest.py
@@ -1,6 +1,5 @@
-metadata(version="3.3.5")
+metadata(version="3.3.6")
 
 require("binascii")
-require("struct")
 
 module("base64.py")

From 7f5ac838655862cb19d8a5762a0a1e0b320b480a Mon Sep 17 00:00:00 2001
From: Jatty Andriean <jandriea@outlook.com>
Date: Thu, 4 Jul 2024 07:28:50 +0000
Subject: [PATCH 299/343] lora-sx127x: Fix configuring the implicit header
 option in the _SX127x.

The `_reg_update` method must be called after updating the implicit header
option's bit.

Signed-off-by: Jatty Andriean <jandriea@outlook.com>
---
 micropython/lora/lora-sx127x/lora/sx127x.py | 4 ++--
 micropython/lora/lora-sx127x/manifest.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/micropython/lora/lora-sx127x/lora/sx127x.py b/micropython/lora/lora-sx127x/lora/sx127x.py
index 0226c9696..9faa79a4d 100644
--- a/micropython/lora/lora-sx127x/lora/sx127x.py
+++ b/micropython/lora/lora-sx127x/lora/sx127x.py
@@ -416,13 +416,13 @@ def configure(self, lora_cfg):
             modem_config1 |= (self._coding_rate - 4) << _MODEM_CONFIG1_CODING_RATE_SHIFT
             update_mask |= _MODEM_CONFIG1_CODING_RATE_MASK << _MODEM_CONFIG1_CODING_RATE_SHIFT
 
-        self._reg_update(_REG_MODEM_CONFIG1, update_mask, modem_config1)
-
         if "implicit_header" in lora_cfg:
             self._implicit_header = lora_cfg["implicit_header"]
             modem_config1 |= _flag(_MODEM_CONFIG1_IMPLICIT_HEADER_MODE_ON, self._implicit_header)
             update_mask |= _MODEM_CONFIG1_IMPLICIT_HEADER_MODE_ON
 
+        self._reg_update(_REG_MODEM_CONFIG1, update_mask, modem_config1)
+
         # Update MODEM_CONFIG2, for any fields that changed
         modem_config2 = 0
         update_mask = 0
diff --git a/micropython/lora/lora-sx127x/manifest.py b/micropython/lora/lora-sx127x/manifest.py
index 1936a50e4..177877091 100644
--- a/micropython/lora/lora-sx127x/manifest.py
+++ b/micropython/lora/lora-sx127x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.1")
+metadata(version="0.1.2")
 require("lora")
 package("lora")

From a7cd740b64bfea2e841e646cc495738fccb92950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sat, 6 Jul 2024 20:46:51 +0000
Subject: [PATCH 300/343] usb-device: Allow signaling capability of
 remote_wakeup.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To use this feature you need to create a usb device signaling remote wakeup
and then enable remote wakeup on the host (on linux write enabled to
/sys/bus/usb/devices/<device>/power/wakeup). Then you can wake up the host
when is on standby using USBDevice.remote_wakeup.

Signed-off-by: Felix Dörre <felix@dogcraft.de>
---
 micropython/usb/usb-device/manifest.py        | 2 +-
 micropython/usb/usb-device/usb/device/core.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/micropython/usb/usb-device/manifest.py b/micropython/usb/usb-device/manifest.py
index 27c9aa88a..025e67547 100644
--- a/micropython/usb/usb-device/manifest.py
+++ b/micropython/usb/usb-device/manifest.py
@@ -1,2 +1,2 @@
-metadata(version="0.1.1")
+metadata(version="0.2.0")
 package("usb")
diff --git a/micropython/usb/usb-device/usb/device/core.py b/micropython/usb/usb-device/usb/device/core.py
index 2d6790798..7be09ee46 100644
--- a/micropython/usb/usb-device/usb/device/core.py
+++ b/micropython/usb/usb-device/usb/device/core.py
@@ -110,6 +110,7 @@ def config(  # noqa: PLR0913
         device_protocol=0,
         config_str=None,
         max_power_ma=None,
+        remote_wakeup=False,
     ):
         # Configure the USB device with a set of interfaces, and optionally reconfiguring the
         # device and configuration descriptor fields
@@ -199,7 +200,7 @@ def maybe_set(value, idx):
         bmAttributes = (
             (1 << 7)  # Reserved
             | (0 if max_power_ma else (1 << 6))  # Self-Powered
-            # Remote Wakeup not currently supported
+            | ((1 << 5) if remote_wakeup else 0)
         )
 
         # Configuration string is optional but supported

From 68e3e07bc7ab63931cead3854b2a114e9a084248 Mon Sep 17 00:00:00 2001
From: Joris van der Wel <joris@jorisvanderwel.com>
Date: Fri, 2 Aug 2024 20:12:55 +0200
Subject: [PATCH 301/343] aioble: Pass additional connection arguments to
 gap_connect.

This allows the following arguments to be passed to `device.connect()`:

* scan_duration_ms
* min_conn_interval_us
* max_conn_interval_us

These are passed as-is to `gap_connect()`.  The default value for all of
these is `None`, which causes gap_connect to use its own defaults.

Signed-off-by: Joris van der Wel <joris@jorisvanderwel.com>
---
 micropython/bluetooth/aioble-central/manifest.py |  2 +-
 micropython/bluetooth/aioble-core/manifest.py    |  2 +-
 micropython/bluetooth/aioble/aioble/central.py   | 12 ++++++++++--
 micropython/bluetooth/aioble/aioble/device.py    | 16 ++++++++++++++--
 micropython/bluetooth/aioble/manifest.py         |  2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/micropython/bluetooth/aioble-central/manifest.py b/micropython/bluetooth/aioble-central/manifest.py
index 9564ecf77..ed61ec9d7 100644
--- a/micropython/bluetooth/aioble-central/manifest.py
+++ b/micropython/bluetooth/aioble-central/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.2")
+metadata(version="0.3.0")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble-core/manifest.py b/micropython/bluetooth/aioble-core/manifest.py
index c2d335b5c..e040f1076 100644
--- a/micropython/bluetooth/aioble-core/manifest.py
+++ b/micropython/bluetooth/aioble-core/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.3.0")
+metadata(version="0.4.0")
 
 package(
     "aioble",
diff --git a/micropython/bluetooth/aioble/aioble/central.py b/micropython/bluetooth/aioble/aioble/central.py
index 6d90cd0f8..131b1e0db 100644
--- a/micropython/bluetooth/aioble/aioble/central.py
+++ b/micropython/bluetooth/aioble/aioble/central.py
@@ -104,7 +104,9 @@ async def _cancel_pending():
 
 # Start connecting to a peripheral.
 # Call device.connect() rather than using method directly.
-async def _connect(connection, timeout_ms):
+async def _connect(
+    connection, timeout_ms, scan_duration_ms, min_conn_interval_us, max_conn_interval_us
+):
     device = connection.device
     if device in _connecting:
         return
@@ -122,7 +124,13 @@ async def _connect(connection, timeout_ms):
 
     try:
         with DeviceTimeout(None, timeout_ms):
-            ble.gap_connect(device.addr_type, device.addr)
+            ble.gap_connect(
+                device.addr_type,
+                device.addr,
+                scan_duration_ms,
+                min_conn_interval_us,
+                max_conn_interval_us,
+            )
 
             # Wait for the connected IRQ.
             await connection._event.wait()
diff --git a/micropython/bluetooth/aioble/aioble/device.py b/micropython/bluetooth/aioble/aioble/device.py
index d02d6385f..93819bc1e 100644
--- a/micropython/bluetooth/aioble/aioble/device.py
+++ b/micropython/bluetooth/aioble/aioble/device.py
@@ -132,14 +132,26 @@ def __str__(self):
     def addr_hex(self):
         return binascii.hexlify(self.addr, ":").decode()
 
-    async def connect(self, timeout_ms=10000):
+    async def connect(
+        self,
+        timeout_ms=10000,
+        scan_duration_ms=None,
+        min_conn_interval_us=None,
+        max_conn_interval_us=None,
+    ):
         if self._connection:
             return self._connection
 
         # Forward to implementation in central.py.
         from .central import _connect
 
-        await _connect(DeviceConnection(self), timeout_ms)
+        await _connect(
+            DeviceConnection(self),
+            timeout_ms,
+            scan_duration_ms,
+            min_conn_interval_us,
+            max_conn_interval_us,
+        )
 
         # Start the device task that will clean up after disconnection.
         self._connection._run_task()
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 824647429..832200570 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.5.2")
+metadata(version="0.6.0")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From d6faaf847243766c1bca92d8bca603025d3f19ba Mon Sep 17 00:00:00 2001
From: Prabhu Ullagaddi <PRABHU.YU@gmail.com>
Date: Wed, 6 Nov 2024 17:58:20 +0530
Subject: [PATCH 302/343] umqtt.simple: Add optional socket timeout to connect
 method.

If there are any network issues, mqtt will block on the socket
non-deterministically.  This commit introduces a `timeout` option which
can be used to set a finite timeout on the socket.  Upon any issue, mqtth
lib will throw exception.
---
 micropython/umqtt.simple/manifest.py     | 2 +-
 micropython/umqtt.simple/umqtt/simple.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/micropython/umqtt.simple/manifest.py b/micropython/umqtt.simple/manifest.py
index b418995c5..45f9edfbd 100644
--- a/micropython/umqtt.simple/manifest.py
+++ b/micropython/umqtt.simple/manifest.py
@@ -1,4 +1,4 @@
-metadata(description="Lightweight MQTT client for MicroPython.", version="1.4.0")
+metadata(description="Lightweight MQTT client for MicroPython.", version="1.5.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index 6da38e445..2a5b91655 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -60,8 +60,9 @@ def set_last_will(self, topic, msg, retain=False, qos=0):
         self.lw_qos = qos
         self.lw_retain = retain
 
-    def connect(self, clean_session=True):
+    def connect(self, clean_session=True, timeout=None):
         self.sock = socket.socket()
+        self.sock.settimeout(timeout)
         addr = socket.getaddrinfo(self.server, self.port)[0][-1]
         self.sock.connect(addr)
         if self.ssl:

From a0ceed82695b038f166165118d7621ff6f8ac2c3 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 5 Nov 2024 11:20:03 +1100
Subject: [PATCH 303/343] aioespnow,webrepl: Use recommended
 network.WLAN.IF_[AP|STA] constants.

Removes the deprecated network.[AP|STA]_IF form.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/aioespnow/README.md    | 2 +-
 micropython/net/webrepl/webrepl.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/aioespnow/README.md b/micropython/aioespnow/README.md
index 132bce103..9774d19c3 100644
--- a/micropython/aioespnow/README.md
+++ b/micropython/aioespnow/README.md
@@ -55,7 +55,7 @@ A small async server example::
     import asyncio
 
     # A WLAN interface must be active to send()/recv()
-    network.WLAN(network.STA_IF).active(True)
+    network.WLAN(network.WLAN.IF_STA).active(True)
 
     e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
     e.active(True)
diff --git a/micropython/net/webrepl/webrepl.py b/micropython/net/webrepl/webrepl.py
index 48c181968..00da8155c 100644
--- a/micropython/net/webrepl/webrepl.py
+++ b/micropython/net/webrepl/webrepl.py
@@ -102,7 +102,7 @@ def setup_conn(port, accept_handler):
     listen_s.listen(1)
     if accept_handler:
         listen_s.setsockopt(socket.SOL_SOCKET, 20, accept_handler)
-    for i in (network.AP_IF, network.STA_IF):
+    for i in (network.WLAN.IF_AP, network.WLAN.IF_STA):
         iface = network.WLAN(i)
         if iface.active():
             print("WebREPL server started on http://%s:%d/" % (iface.ifconfig()[0], port))

From 0827a31c07804a861db4ee1f2e7e4876618bc8cb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Nov 2024 11:12:19 +1100
Subject: [PATCH 304/343] tools/ci.sh: Enable unittest tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../unittest/tests/{test_exception.py => exception.py}          | 2 ++
 tools/ci.sh                                                     | 2 ++
 2 files changed, 4 insertions(+)
 rename python-stdlib/unittest/tests/{test_exception.py => exception.py} (66%)

diff --git a/python-stdlib/unittest/tests/test_exception.py b/python-stdlib/unittest/tests/exception.py
similarity index 66%
rename from python-stdlib/unittest/tests/test_exception.py
rename to python-stdlib/unittest/tests/exception.py
index 470ffdcc2..0e828e226 100644
--- a/python-stdlib/unittest/tests/test_exception.py
+++ b/python-stdlib/unittest/tests/exception.py
@@ -1,3 +1,5 @@
+# This makes unittest return an error code, so is not named "test_xxx.py".
+
 import unittest
 
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 07b27d13c..a5fcdf22e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -63,6 +63,7 @@ function ci_package_tests_run {
         python-stdlib/os-path/test_path.py \
         python-stdlib/pickle/test_pickle.py \
         python-stdlib/string/test_translate.py \
+        python-stdlib/unittest/tests/exception.py \
         unix-ffi/gettext/test_gettext.py \
         unix-ffi/pwd/test_getpwnam.py \
         unix-ffi/re/test_re.py \
@@ -90,6 +91,7 @@ function ci_package_tests_run {
         python-stdlib/shutil \
         python-stdlib/tempfile \
         python-stdlib/time \
+        python-stdlib/unittest/tests \
         python-stdlib/unittest-discover/tests \
         ; do
         (cd $path && $MICROPYTHON -m unittest)

From 01047889eb1acf115424fee293e03769f6916393 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Nov 2024 11:12:57 +1100
Subject: [PATCH 305/343] unittest: Allow SkipTest to work within a subTest.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/unittest/tests/test_subtest.py | 14 ++++++++++++++
 python-stdlib/unittest/unittest/__init__.py  | 13 +++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 python-stdlib/unittest/tests/test_subtest.py

diff --git a/python-stdlib/unittest/tests/test_subtest.py b/python-stdlib/unittest/tests/test_subtest.py
new file mode 100644
index 000000000..324150e27
--- /dev/null
+++ b/python-stdlib/unittest/tests/test_subtest.py
@@ -0,0 +1,14 @@
+import unittest
+
+
+class Test(unittest.TestCase):
+    def test_subtest_skip(self):
+        for i in range(4):
+            with self.subTest(i=i):
+                print("sub test", i)
+                if i == 2:
+                    self.skipTest("skip 2")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/python-stdlib/unittest/unittest/__init__.py b/python-stdlib/unittest/unittest/__init__.py
index f15f30448..6d7fa40b8 100644
--- a/python-stdlib/unittest/unittest/__init__.py
+++ b/python-stdlib/unittest/unittest/__init__.py
@@ -348,7 +348,13 @@ def _handle_test_exception(
     exc = exc_info[1]
     traceback = exc_info[2]
     ex_str = _capture_exc(exc, traceback)
-    if isinstance(exc, AssertionError):
+    if isinstance(exc, SkipTest):
+        reason = exc.args[0]
+        test_result.skippedNum += 1
+        test_result.skipped.append((current_test, reason))
+        print(" skipped:", reason)
+        return
+    elif isinstance(exc, AssertionError):
         test_result.failuresNum += 1
         test_result.failures.append((current_test, ex_str))
         if verbose:
@@ -396,11 +402,6 @@ def run_one(test_function):
                 print(" FAIL")
             else:
                 print(" ok")
-        except SkipTest as e:
-            reason = e.args[0]
-            print(" skipped:", reason)
-            test_result.skippedNum += 1
-            test_result.skipped.append((name, c, reason))
         except Exception as ex:
             _handle_test_exception(
                 current_test=(name, c), test_result=test_result, exc_info=(type(ex), ex, None)

From e4cf09527bce7569f5db742cf6ae9db68d50c6a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Nov 2024 12:00:38 +1100
Subject: [PATCH 306/343] unittest: Always use "raise" with an argument.

So this code can be compiled with the MicroPython native emitter, which
does not support "raise" without any arguments.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/unittest/manifest.py          | 2 +-
 python-stdlib/unittest/unittest/__init__.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
index 101e3e833..a01bbb8e6 100644
--- a/python-stdlib/unittest/manifest.py
+++ b/python-stdlib/unittest/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.10.3")
+metadata(version="0.10.4")
 
 package("unittest")
diff --git a/python-stdlib/unittest/unittest/__init__.py b/python-stdlib/unittest/unittest/__init__.py
index 6d7fa40b8..61b315788 100644
--- a/python-stdlib/unittest/unittest/__init__.py
+++ b/python-stdlib/unittest/unittest/__init__.py
@@ -198,7 +198,7 @@ def assertRaises(self, exc, func=None, *args, **kwargs):
         except Exception as e:
             if isinstance(e, exc):
                 return
-            raise
+            raise e
 
         assert False, "%r not raised" % exc
 
@@ -407,7 +407,7 @@ def run_one(test_function):
                 current_test=(name, c), test_result=test_result, exc_info=(type(ex), ex, None)
             )
             # Uncomment to investigate failure in detail
-            # raise
+            # raise ex
         finally:
             __test_result__ = None
             __current_test__ = None

From 65a14116d503dd544cbba92284517c99e5e9a448 Mon Sep 17 00:00:00 2001
From: Richard Weickelt <richard@weickelt.de>
Date: Wed, 11 Dec 2024 22:04:43 +0100
Subject: [PATCH 307/343] requests: Do not leak header modifications when
 calling request.

The requests() function takes a headers dict argument
(call-by-reference). This object is then modified in the function. For
instance the host is added and authentication information. Such behavior
is not expected. It is also problematic:

- Modifications of the header dictionary will be visible on the caller
  site.
- When reusing the same (supposedly read-only) headers object for
  differenct calls, the second call will apparently re-use wrong headers
  from the previous call and may fail.

This patch should also fix #839. Unfortunately the copy operation does
not preserve the key order and we have to touch the existing test cases.

Signed-off-by: Richard Weickelt <richard@weickelt.de>
---
 python-ecosys/requests/requests/__init__.py |  2 ++
 python-ecosys/requests/test_requests.py     | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index a9a183619..2951035f7 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -46,6 +46,8 @@ def request(
 ):
     if headers is None:
         headers = {}
+    else:
+        headers = headers.copy()
 
     redirect = None  # redirection url, None means no redirection
     chunked_data = data and getattr(data, "__next__", None) and not getattr(data, "__len__", None)
diff --git a/python-ecosys/requests/test_requests.py b/python-ecosys/requests/test_requests.py
index 513e533a3..ac77291b0 100644
--- a/python-ecosys/requests/test_requests.py
+++ b/python-ecosys/requests/test_requests.py
@@ -102,11 +102,11 @@ def chunks():
 
 def test_overwrite_get_headers():
     response = requests.request(
-        "GET", "http://example.com", headers={"Connection": "keep-alive", "Host": "test.com"}
+        "GET", "http://example.com", headers={"Host": "test.com", "Connection": "keep-alive"}
     )
 
     assert response.raw._write_buffer.getvalue() == (
-        b"GET / HTTP/1.0\r\n" + b"Host: test.com\r\n" + b"Connection: keep-alive\r\n\r\n"
+        b"GET / HTTP/1.0\r\n" + b"Connection: keep-alive\r\n" + b"Host: test.com\r\n\r\n"
     ), format_message(response)
 
 
@@ -145,6 +145,14 @@ def chunks():
     ), format_message(response)
 
 
+def test_do_not_modify_headers_argument():
+    global do_not_modify_this_dict
+    do_not_modify_this_dict = {}
+    requests.request("GET", "http://example.com", headers=do_not_modify_this_dict)
+
+    assert do_not_modify_this_dict == {}, do_not_modify_this_dict
+
+
 test_simple_get()
 test_get_auth()
 test_get_custom_header()
@@ -153,3 +161,4 @@ def chunks():
 test_overwrite_get_headers()
 test_overwrite_post_json_headers()
 test_overwrite_post_chunked_data_headers()
+test_do_not_modify_headers_argument()

From 7a32df3d133b89bf989b28b5fad3c9c118a9b7ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Feb 2025 14:20:16 +1100
Subject: [PATCH 308/343] requests: Bump version to 0.10.1.

The previous commit fixed a bug.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-ecosys/requests/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ecosys/requests/manifest.py b/python-ecosys/requests/manifest.py
index eb7bb2d42..f8343e2a1 100644
--- a/python-ecosys/requests/manifest.py
+++ b/python-ecosys/requests/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.10.0", pypi="requests")
+metadata(version="0.10.1", pypi="requests")
 
 package("requests")

From b379e4fb4cb2b014be21fba698247ab81fc1c17a Mon Sep 17 00:00:00 2001
From: Glenn Moloney <glenn.moloney@gmail.com>
Date: Tue, 18 Feb 2025 11:05:50 +1100
Subject: [PATCH 309/343] mip: Allow relative URLs in package.json.

This allows to specify relative URLs in package.json, which are resolved
relative to the package.json URL. This mirrors the functionality added to
mpremote in https://github.com/micropython/micropython/pull/12477.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
---
 micropython/mip/manifest.py     |  2 +-
 micropython/mip/mip/__init__.py | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
index 88fb08da1..2a35f8c5b 100644
--- a/micropython/mip/manifest.py
+++ b/micropython/mip/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.3.0", description="On-device package installer for network-capable boards")
+metadata(version="0.4.0", description="On-device package installer for network-capable boards")
 
 require("requests")
 
diff --git a/micropython/mip/mip/__init__.py b/micropython/mip/mip/__init__.py
index 0c3c6f204..8920ad8f4 100644
--- a/micropython/mip/mip/__init__.py
+++ b/micropython/mip/mip/__init__.py
@@ -9,6 +9,8 @@
 _PACKAGE_INDEX = const("https://micropython.org/pi/v2")
 _CHUNK_SIZE = 128
 
+allowed_mip_url_prefixes = ("http://", "https://", "github:", "gitlab:")
+
 
 # This implements os.makedirs(os.dirname(path))
 def _ensure_path_exists(path):
@@ -124,8 +126,12 @@ def _install_json(package_json_url, index, target, version, mpy):
             if not _download_file(file_url, fs_target_path):
                 print("File not found: {} {}".format(target_path, short_hash))
                 return False
+    base_url = package_json_url.rpartition("/")[0]
     for target_path, url in package_json.get("urls", ()):
         fs_target_path = target + "/" + target_path
+        is_full_url = any(url.startswith(p) for p in allowed_mip_url_prefixes)
+        if base_url and not is_full_url:
+            url = f"{base_url}/{url}"  # Relative URLs
         if not _download_file(_rewrite_url(url, version), fs_target_path):
             print("File not found: {} {}".format(target_path, url))
             return False
@@ -136,12 +142,7 @@ def _install_json(package_json_url, index, target, version, mpy):
 
 
 def _install_package(package, index, target, version, mpy):
-    if (
-        package.startswith("http://")
-        or package.startswith("https://")
-        or package.startswith("github:")
-        or package.startswith("gitlab:")
-    ):
+    if any(package.startswith(p) for p in allowed_mip_url_prefixes):
         if package.endswith(".py") or package.endswith(".mpy"):
             print("Downloading {} to {}".format(package, target))
             return _download_file(

From 7337e0802a20bc8394faaf32bb97c60210b6e942 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 24 Feb 2025 14:27:31 +1100
Subject: [PATCH 310/343] github/workflows: Update actions/upload-artifact to
 v4.

Because v3 is now deprecated.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/build_packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index 8854a7307..a89658e2f 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -23,7 +23,7 @@ jobs:
       if: vars.MICROPY_PUBLISH_MIP_INDEX && github.event_name == 'push' && ! github.event.deleted
       run: source tools/ci.sh && ci_push_package_index
     - name: Upload packages as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: packages-${{ github.sha }}
         path: ${{ env.PACKAGE_INDEX_PATH }}

From 96e17b65d128cac2328e10f317241d3a64aca2c7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Mar 2025 16:27:09 +1100
Subject: [PATCH 311/343] mip: Make mip.install() skip /rom*/lib directories.

If a ROMFS is mounted then "/rom/lib" is usually in `sys.path` before the
writable filesystem's "lib" entry.  The ROMFS directory cannot be installed
to, so skip it if found.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/mip/manifest.py     | 2 +-
 micropython/mip/mip/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/micropython/mip/manifest.py b/micropython/mip/manifest.py
index 2a35f8c5b..9fb94ebcb 100644
--- a/micropython/mip/manifest.py
+++ b/micropython/mip/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.4.0", description="On-device package installer for network-capable boards")
+metadata(version="0.4.1", description="On-device package installer for network-capable boards")
 
 require("requests")
 
diff --git a/micropython/mip/mip/__init__.py b/micropython/mip/mip/__init__.py
index 8920ad8f4..7c0fb4d3a 100644
--- a/micropython/mip/mip/__init__.py
+++ b/micropython/mip/mip/__init__.py
@@ -171,7 +171,7 @@ def _install_package(package, index, target, version, mpy):
 def install(package, index=None, target=None, version=None, mpy=True):
     if not target:
         for p in sys.path:
-            if p.endswith("/lib"):
+            if not p.startswith("/rom") and p.endswith("/lib"):
                 target = p
                 break
         else:

From 98d0a2b69a24b9b53309be34d7c5aa6aede45c5e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Nov 2024 12:25:13 +1100
Subject: [PATCH 312/343] umqtt.simple: Restore legacy ssl/ssl_params
 arguments.

Commit 35d41dbb0e4acf1518f520220d405ebe2db257d6 changed the API for using
SSL with umqtt, but only did a minor version increase.  This broke various
uses of this library, eg
https://github.com/aws-samples/aws-iot-core-getting-started-micropython

Reinstate the original API for specifying an SSL connection.  This library
now supports the following:
- default, ssl=None or ssl=False: no SSL
- ssl=True and optional ssl_params specified: use ssl.wrap_socket
- ssl=<SSLContext instance>: use provided SSL context to wrap socket

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/umqtt.simple/manifest.py     | 4 +++-
 micropython/umqtt.simple/umqtt/simple.py | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/micropython/umqtt.simple/manifest.py b/micropython/umqtt.simple/manifest.py
index 45f9edfbd..709a27505 100644
--- a/micropython/umqtt.simple/manifest.py
+++ b/micropython/umqtt.simple/manifest.py
@@ -1,5 +1,7 @@
-metadata(description="Lightweight MQTT client for MicroPython.", version="1.5.0")
+metadata(description="Lightweight MQTT client for MicroPython.", version="1.6.0")
 
 # Originally written by Paul Sokolovsky.
 
+require("ssl")
+
 package("umqtt")
diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index 2a5b91655..d9cdffc47 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -17,6 +17,7 @@ def __init__(
         password=None,
         keepalive=0,
         ssl=None,
+        ssl_params={},
     ):
         if port == 0:
             port = 8883 if ssl else 1883
@@ -25,6 +26,7 @@ def __init__(
         self.server = server
         self.port = port
         self.ssl = ssl
+        self.ssl_params = ssl_params
         self.pid = 0
         self.cb = None
         self.user = user
@@ -65,7 +67,12 @@ def connect(self, clean_session=True, timeout=None):
         self.sock.settimeout(timeout)
         addr = socket.getaddrinfo(self.server, self.port)[0][-1]
         self.sock.connect(addr)
-        if self.ssl:
+        if self.ssl is True:
+            # Legacy support for ssl=True and ssl_params arguments.
+            import ssl
+
+            self.sock = ssl.wrap_socket(self.sock, **self.ssl_params)
+        elif self.ssl:
             self.sock = self.ssl.wrap_socket(self.sock, server_hostname=self.server)
         premsg = bytearray(b"\x10\0\0\0\0\0")
         msg = bytearray(b"\x04MQTT\x04\x02\0\0")

From 3e859d2118c4ef9af5f43c930b3138185e5a9fb4 Mon Sep 17 00:00:00 2001
From: marcsello <punkosdmarcell@rocketmail.com>
Date: Mon, 30 Dec 2024 15:20:18 +0100
Subject: [PATCH 313/343] nrf24l01: Increase startup delay.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the datasheet of the NRF240L1 chip, 150 μs startup time is
only acceptable when the chip is clocked externally.  Most modules use a
crystal, which require 1.5 ms to settle.  It should be okay to wait more in
both cases, for a reliable startup.

Signed-off-by: Marcell Pünkösd <punkosdmarcell@rocketmail.com>
---
 micropython/drivers/radio/nrf24l01/nrf24l01.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01.py b/micropython/drivers/radio/nrf24l01/nrf24l01.py
index 76d55312f..9b034f8ba 100644
--- a/micropython/drivers/radio/nrf24l01/nrf24l01.py
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01.py
@@ -227,7 +227,7 @@ def send(self, buf, timeout=500):
     def send_start(self, buf):
         # power up
         self.reg_write(CONFIG, (self.reg_read(CONFIG) | PWR_UP) & ~PRIM_RX)
-        utime.sleep_us(150)
+        utime.sleep_us(1500)  # needs to be 1.5ms
         # send the data
         self.cs(0)
         self.spi.readinto(self.buf, W_TX_PAYLOAD)

From bd1ab77324641238e684cd26e1686a890868b096 Mon Sep 17 00:00:00 2001
From: marcsello <punkosdmarcell@rocketmail.com>
Date: Mon, 30 Dec 2024 15:47:09 +0100
Subject: [PATCH 314/343] nrf24l01: Properly handle timeout.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The timeout condition was not handled before.  Upon timeout, this caused
the chip to stay active until another send command changed it's state.

Sometimes when it was unable to transmit the data, it got stuck in the tx
fifo causing it to fill up over time, which set the TX_FULL flag in the
STATUS register.

Since there was no exceptions raised, the user code could not differentiate
a successful send or a timeout condition.

Signed-off-by: Marcell Pünkösd <punkosdmarcell@rocketmail.com>
---
 micropython/drivers/radio/nrf24l01/nrf24l01.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01.py b/micropython/drivers/radio/nrf24l01/nrf24l01.py
index 9b034f8ba..04f07b9d9 100644
--- a/micropython/drivers/radio/nrf24l01/nrf24l01.py
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01.py
@@ -220,6 +220,13 @@ def send(self, buf, timeout=500):
         result = None
         while result is None and utime.ticks_diff(utime.ticks_ms(), start) < timeout:
             result = self.send_done()  # 1 == success, 2 == fail
+
+        if result is None:
+            # timed out, cancel sending and power down the module
+            self.flush_tx()
+            self.reg_write(CONFIG, self.reg_read(CONFIG) & ~PWR_UP)
+            raise OSError("timed out")
+
         if result == 2:
             raise OSError("send failed")
 

From c7103bb464507137a32edafc77698e40893b773e Mon Sep 17 00:00:00 2001
From: marcsello <punkosdmarcell@rocketmail.com>
Date: Mon, 30 Dec 2024 16:10:49 +0100
Subject: [PATCH 315/343] nrf24l01: Optimize status reading.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The value of the STATUS register is always transmitted by the chip when
reading any command.  So a R_REGISTER command and the turnaround time can
be spared by issuing a NOP command instead.

This implementation suggested by the datasheet.

This operation is compatible with both nRF24L01 and nRF24L01+.

Signed-off-by: Marcell Pünkösd <punkosdmarcell@rocketmail.com>
---
 micropython/drivers/radio/nrf24l01/nrf24l01.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01.py b/micropython/drivers/radio/nrf24l01/nrf24l01.py
index 04f07b9d9..d015250cf 100644
--- a/micropython/drivers/radio/nrf24l01/nrf24l01.py
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01.py
@@ -130,6 +130,13 @@ def reg_write(self, reg, value):
         self.cs(1)
         return ret
 
+    def read_status(self):
+        self.cs(0)
+        # STATUS register is always shifted during command transmit
+        self.spi.readinto(self.buf, NOP)
+        self.cs(1)
+        return self.buf[0]
+
     def flush_rx(self):
         self.cs(0)
         self.spi.readinto(self.buf, FLUSH_RX)
@@ -250,7 +257,8 @@ def send_start(self, buf):
 
     # returns None if send still in progress, 1 for success, 2 for fail
     def send_done(self):
-        if not (self.reg_read(STATUS) & (TX_DS | MAX_RT)):
+        status = self.read_status()
+        if not (status & (TX_DS | MAX_RT)):
             return None  # tx not finished
 
         # either finished or failed: get and clear status flags, power down

From 221a877f8a572a489e9859d0851969d57d71b8d4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Apr 2025 22:33:53 +1000
Subject: [PATCH 316/343] nrf24l10: Bump minor version.

Due to the previous three commits.

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/drivers/radio/nrf24l01/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micropython/drivers/radio/nrf24l01/manifest.py b/micropython/drivers/radio/nrf24l01/manifest.py
index 474d422f9..24276ee4b 100644
--- a/micropython/drivers/radio/nrf24l01/manifest.py
+++ b/micropython/drivers/radio/nrf24l01/manifest.py
@@ -1,3 +1,3 @@
-metadata(description="nrf24l01 2.4GHz radio driver.", version="0.1.0")
+metadata(description="nrf24l01 2.4GHz radio driver.", version="0.2.0")
 
 module("nrf24l01.py", opt=3)

From f72f3f1a391f15d6fbed01d76f8c97a27427db2f Mon Sep 17 00:00:00 2001
From: Leonard Techel <git@barnslig.eu>
Date: Wed, 29 Jan 2025 10:22:17 +0100
Subject: [PATCH 317/343] lora-sx126x: Fix invert_iq_rx / invert_iq_tx
 behaviour.

This commit fixes a typo and changes a tuple that needs to be mutable to a
list (because other parts of the code change elements of this list).

Signed-off-by: Damien George <damien@micropython.org>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 6 +++---
 micropython/lora/lora-sx126x/manifest.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index 77052c97c..641367a9f 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -363,11 +363,11 @@ def configure(self, lora_cfg):
         if "preamble_len" in lora_cfg:
             self._preamble_len = lora_cfg["preamble_len"]
 
-        self._invert_iq = (
+        self._invert_iq = [
             lora_cfg.get("invert_iq_rx", self._invert_iq[0]),
             lora_cfg.get("invert_iq_tx", self._invert_iq[1]),
             self._invert_iq[2],
-        )
+        ]
 
         if "freq_khz" in lora_cfg:
             self._rf_freq_hz = int(lora_cfg["freq_khz"] * 1000)
@@ -449,7 +449,7 @@ def configure(self, lora_cfg):
     def _invert_workaround(self, enable):
         # Apply workaround for DS 15.4 Optimizing the Inverted IQ Operation
         if self._invert_iq[2] != enable:
-            val = self._read_read(_REG_IQ_POLARITY_SETUP)
+            val = self._reg_read(_REG_IQ_POLARITY_SETUP)
             val = (val & ~4) | _flag(4, enable)
             self._reg_write(_REG_IQ_POLARITY_SETUP, val)
             self._invert_iq[2] = enable
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
index 785a975aa..038710820 100644
--- a/micropython/lora/lora-sx126x/manifest.py
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.3")
+metadata(version="0.1.4")
 require("lora")
 package("lora")

From d1a74360a20dadfaae717d4d8c8bd3531672362f Mon Sep 17 00:00:00 2001
From: Dominik Heidler <dheidler@suse.de>
Date: Fri, 14 Mar 2025 13:36:30 +0100
Subject: [PATCH 318/343] unix-ffi/json: Accept both str and bytes as arg for
 json.loads().

Same as micropython's internal json lib does.

Fixes #985.

Signed-off-by: Dominik Heidler <dheidler@suse.de>
---
 unix-ffi/json/json/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/unix-ffi/json/json/__init__.py b/unix-ffi/json/json/__init__.py
index 69a045563..954618f33 100644
--- a/unix-ffi/json/json/__init__.py
+++ b/unix-ffi/json/json/__init__.py
@@ -354,8 +354,8 @@ def loads(
     object_pairs_hook=None,
     **kw
 ):
-    """Deserialize ``s`` (a ``str`` instance containing a JSON
-    document) to a Python object.
+    """Deserialize ``s`` (a ``str``, ``bytes`` or ``bytearray`` instance
+    containing a JSON document) to a Python object.
 
     ``object_hook`` is an optional function that will be called with the
     result of any object literal decode (a ``dict``). The return value of
@@ -413,4 +413,6 @@ def loads(
         kw["parse_int"] = parse_int
     if parse_constant is not None:
         kw["parse_constant"] = parse_constant
+    if isinstance(s, (bytes, bytearray)):
+        s = s.decode('utf-8')
     return cls(**kw).decode(s)

From 42caaf14de35e39ff2e843e9957c7a3f41702fa9 Mon Sep 17 00:00:00 2001
From: Bas van Doren <basvdoren@gmail.com>
Date: Sun, 6 Apr 2025 14:42:09 +0200
Subject: [PATCH 319/343] unix-ffi/machine: Use libc if librt is not present.

Newer implementations of libc integrate the functions from librt, for
example glibc since 2.17 and uClibc-ng.  So if the librt.so cannot be
loaded, it can be assumed that libc contains the expected functions.

Signed-off-by: Bas van Doren <basvdoren@gmail.com>
---
 unix-ffi/machine/machine/timer.py | 5 ++++-
 unix-ffi/machine/manifest.py      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/unix-ffi/machine/machine/timer.py b/unix-ffi/machine/machine/timer.py
index 3f371142c..be00cee33 100644
--- a/unix-ffi/machine/machine/timer.py
+++ b/unix-ffi/machine/machine/timer.py
@@ -5,7 +5,10 @@
 from signal import *
 
 libc = ffilib.libc()
-librt = ffilib.open("librt")
+try:
+    librt = ffilib.open("librt")
+except OSError as e:
+    librt = libc
 
 CLOCK_REALTIME = 0
 CLOCK_MONOTONIC = 1
diff --git a/unix-ffi/machine/manifest.py b/unix-ffi/machine/manifest.py
index c0e40764d..f7c11b81a 100644
--- a/unix-ffi/machine/manifest.py
+++ b/unix-ffi/machine/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.1")
+metadata(version="0.2.2")
 
 # Originally written by Paul Sokolovsky.
 

From 43ad7c58fd5fc247c255dacb37ab815ec212ee71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=83=E6=98=95=E6=9A=90?= <meebox@gmail.com>
Date: Fri, 6 Dec 2024 13:43:24 +0800
Subject: [PATCH 320/343] requests: Use the host in the redirect url, not the
 one in headers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The host in headers extracted from the original url may not be the same as
the host in the redirect url.  Poping out the host in headers force the
code to use the host in the redirect url, otherwise the redirect may fail
due to inconsistence of hosts in the original url and the redirect url.

Signed-off-by: 黃昕暐 <meebox@gmail.com>
---
 python-ecosys/requests/manifest.py          | 2 +-
 python-ecosys/requests/requests/__init__.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/python-ecosys/requests/manifest.py b/python-ecosys/requests/manifest.py
index f8343e2a1..85f159753 100644
--- a/python-ecosys/requests/manifest.py
+++ b/python-ecosys/requests/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.10.1", pypi="requests")
+metadata(version="0.10.2", pypi="requests")
 
 package("requests")
diff --git a/python-ecosys/requests/requests/__init__.py b/python-ecosys/requests/requests/__init__.py
index 2951035f7..4ca7489a4 100644
--- a/python-ecosys/requests/requests/__init__.py
+++ b/python-ecosys/requests/requests/__init__.py
@@ -182,6 +182,8 @@ def request(
 
     if redirect:
         s.close()
+        # Use the host specified in the redirect URL, as it may not be the same as the original URL.
+        headers.pop("Host", None)
         if status in [301, 302, 303]:
             return request("GET", redirect, None, None, headers, stream)
         else:

From 86df7233019678616f864e4325460a2f893c5e7f Mon Sep 17 00:00:00 2001
From: FuNK3Y <fun__key@hotmail.com>
Date: Fri, 7 Feb 2025 19:53:53 +0100
Subject: [PATCH 321/343] aiohttp: Fix header case sensitivity.

According to RFC https://datatracker.ietf.org/doc/html/rfc7230#section-3.2
header names are case-insensitive.

This commit makes sure that the module behaves consistently regardless of
the casing of "Content-type" and "Content-Length" (other headers are not
considered by the module).

Without this fix, the client seems to wait for the connection termination
(~10 seconds) prior to returning any content if the casing of
"Content-Length" is different.

Signed-off-by: FuNK3Y <fun__key@hotmail.com>
---
 python-ecosys/aiohttp/aiohttp/__init__.py | 12 +++++++++---
 python-ecosys/aiohttp/manifest.py         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
index 1565163c4..3f57bac83 100644
--- a/python-ecosys/aiohttp/aiohttp/__init__.py
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -18,8 +18,14 @@ class ClientResponse:
     def __init__(self, reader):
         self.content = reader
 
+    def _get_header(self, keyname, default):
+        for k in self.headers:
+            if k.lower() == keyname:
+                return self.headers[k]
+        return default
+
     def _decode(self, data):
-        c_encoding = self.headers.get("Content-Encoding")
+        c_encoding = self._get_header("content-encoding", None)
         if c_encoding in ("gzip", "deflate", "gzip,deflate"):
             try:
                 import deflate
@@ -39,10 +45,10 @@ async def read(self, sz=-1):
         return self._decode(await self.content.read(sz))
 
     async def text(self, encoding="utf-8"):
-        return (await self.read(int(self.headers.get("Content-Length", -1)))).decode(encoding)
+        return (await self.read(int(self._get_header("content-length", -1)))).decode(encoding)
 
     async def json(self):
-        return _json.loads(await self.read(int(self.headers.get("Content-Length", -1))))
+        return _json.loads(await self.read(int(self._get_header("content-length", -1))))
 
     def __repr__(self):
         return "<ClientResponse %d %s>" % (self.status, self.headers)
diff --git a/python-ecosys/aiohttp/manifest.py b/python-ecosys/aiohttp/manifest.py
index 748970e5b..5020ec527 100644
--- a/python-ecosys/aiohttp/manifest.py
+++ b/python-ecosys/aiohttp/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="HTTP client module for MicroPython asyncio module",
-    version="0.0.3",
+    version="0.0.4",
     pypi="aiohttp",
 )
 

From 05a56c3cad059245c62df5d76baa5ebc3340f812 Mon Sep 17 00:00:00 2001
From: jomas <jomasnash@gmail.com>
Date: Mon, 2 Dec 2024 11:23:07 +0100
Subject: [PATCH 322/343] aiohttp: Allow headers to be passed to a
 WebSocketClient.

This commit will make it possible to add headers to a Websocket.

Among other things, this allows making a connection to online MQTT brokers
over websocket, using the header entry "Sec-WebSocket-Protocol":"mqtt" in
the handshake of the upgrade protocol.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-ecosys/aiohttp/aiohttp/__init__.py   | 2 +-
 python-ecosys/aiohttp/aiohttp/aiohttp_ws.py | 2 +-
 python-ecosys/aiohttp/manifest.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
index 3f57bac83..8c5493f30 100644
--- a/python-ecosys/aiohttp/aiohttp/__init__.py
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -269,7 +269,7 @@ def ws_connect(self, url, ssl=None):
         return _WSRequestContextManager(self, self._ws_connect(url, ssl=ssl))
 
     async def _ws_connect(self, url, ssl=None):
-        ws_client = WebSocketClient(None)
+        ws_client = WebSocketClient(self._base_headers.copy())
         await ws_client.connect(url, ssl=ssl, handshake_request=self.request_raw)
         self._reader = ws_client.reader
         return ClientWebSocketResponse(ws_client)
diff --git a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
index 07d833730..6e0818c92 100644
--- a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
+++ b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
@@ -136,7 +136,7 @@ def _encode_websocket_frame(cls, opcode, payload):
         return frame + payload
 
     async def handshake(self, uri, ssl, req):
-        headers = {}
+        headers = self.params
         _http_proto = "http" if uri.protocol != "wss" else "https"
         url = f"{_http_proto}://{uri.hostname}:{uri.port}{uri.path or '/'}"
         key = binascii.b2a_base64(bytes(random.getrandbits(8) for _ in range(16)))[:-1]
diff --git a/python-ecosys/aiohttp/manifest.py b/python-ecosys/aiohttp/manifest.py
index 5020ec527..d22a6ce11 100644
--- a/python-ecosys/aiohttp/manifest.py
+++ b/python-ecosys/aiohttp/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="HTTP client module for MicroPython asyncio module",
-    version="0.0.4",
+    version="0.0.5",
     pypi="aiohttp",
 )
 

From 9307e21dfb34152ac605cd810447716b459d7f7d Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Wed, 26 Mar 2025 12:00:40 +0100
Subject: [PATCH 323/343] usb-device-cdc: Optimise writing small data so it
 doesn't require alloc.

Only allocate a memoryview when the (first) write was partial.

Signed-off-by: Matthias Urlichs <matthias@urlichs.de>
---
 micropython/usb/usb-device-cdc/manifest.py       | 2 +-
 micropython/usb/usb-device-cdc/usb/device/cdc.py | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/micropython/usb/usb-device-cdc/manifest.py b/micropython/usb/usb-device-cdc/manifest.py
index 4520325e3..e844b6f01 100644
--- a/micropython/usb/usb-device-cdc/manifest.py
+++ b/micropython/usb/usb-device-cdc/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.1")
+metadata(version="0.1.2")
 require("usb-device")
 package("usb")
diff --git a/micropython/usb/usb-device-cdc/usb/device/cdc.py b/micropython/usb/usb-device-cdc/usb/device/cdc.py
index 28bfb0657..0acea184f 100644
--- a/micropython/usb/usb-device-cdc/usb/device/cdc.py
+++ b/micropython/usb/usb-device-cdc/usb/device/cdc.py
@@ -350,10 +350,9 @@ def _rd_cb(self, ep, res, num_bytes):
     ###
 
     def write(self, buf):
-        # use a memoryview to track how much of 'buf' we've written so far
-        # (unfortunately, this means a 1 block allocation for each write, but it's otherwise allocation free.)
         start = time.ticks_ms()
-        mv = memoryview(buf)
+        mv = buf
+
         while True:
             # Keep pushing buf into _wb into it's all gone
             nbytes = self._wb.write(mv)
@@ -362,6 +361,10 @@ def write(self, buf):
             if nbytes == len(mv):
                 return len(buf)  # Success
 
+            # if buf couldn't be fully written on the first attempt
+            # convert it to a memoryview to track partial writes
+            if mv is buf:
+                mv = memoryview(buf)
             mv = mv[nbytes:]
 
             # check for timeout

From 48bf3a74a8599aca7ddf8dfbb9d08d8cd5172d25 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Apr 2025 12:23:33 +1000
Subject: [PATCH 324/343] inspect: Fix isgenerator logic.

Also optimise both `isgenerator()` and `isgeneratorfunction()` so they use
the same lambda, and don't have to create it each time they are called.

Fixes issue #997.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/inspect/inspect.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python-stdlib/inspect/inspect.py b/python-stdlib/inspect/inspect.py
index 06aba8762..fb2ad885d 100644
--- a/python-stdlib/inspect/inspect.py
+++ b/python-stdlib/inspect/inspect.py
@@ -1,5 +1,7 @@
 import sys
 
+_g = lambda: (yield)
+
 
 def getmembers(obj, pred=None):
     res = []
@@ -16,11 +18,11 @@ def isfunction(obj):
 
 
 def isgeneratorfunction(obj):
-    return isinstance(obj, type(lambda: (yield)))
+    return isinstance(obj, type(_g))
 
 
 def isgenerator(obj):
-    return isinstance(obj, type(lambda: (yield)()))
+    return isinstance(obj, type((_g)()))
 
 
 class _Class:

From 2665047fa7c88729e8d581bcf4ed047298c0dc30 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Apr 2025 12:24:53 +1000
Subject: [PATCH 325/343] inspect: Add basic unit tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/inspect/test_inspect.py | 54 +++++++++++++++++++++++++++
 tools/ci.sh                           |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 python-stdlib/inspect/test_inspect.py

diff --git a/python-stdlib/inspect/test_inspect.py b/python-stdlib/inspect/test_inspect.py
new file mode 100644
index 000000000..6f262ca64
--- /dev/null
+++ b/python-stdlib/inspect/test_inspect.py
@@ -0,0 +1,54 @@
+import inspect
+import unittest
+
+
+def fun():
+    return 1
+
+
+def gen():
+    yield 1
+
+
+class Class:
+    def meth(self):
+        pass
+
+
+entities = (
+    fun,
+    gen,
+    gen(),
+    Class,
+    Class.meth,
+    Class().meth,
+    inspect,
+)
+
+
+class TestInspect(unittest.TestCase):
+    def _test_is_helper(self, f, *entities_true):
+        for entity in entities:
+            result = f(entity)
+            if entity in entities_true:
+                self.assertTrue(result)
+            else:
+                self.assertFalse(result)
+
+    def test_isfunction(self):
+        self._test_is_helper(inspect.isfunction, entities[0], entities[4])
+
+    def test_isgeneratorfunction(self):
+        self._test_is_helper(inspect.isgeneratorfunction, entities[1])
+
+    def test_isgenerator(self):
+        self._test_is_helper(inspect.isgenerator, entities[2])
+
+    def test_ismethod(self):
+        self._test_is_helper(inspect.ismethod, entities[5])
+
+    def test_isclass(self):
+        self._test_is_helper(inspect.isclass, entities[3])
+
+    def test_ismodule(self):
+        self._test_is_helper(inspect.ismodule, entities[6])
diff --git a/tools/ci.sh b/tools/ci.sh
index a5fcdf22e..6689e8aa4 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -86,6 +86,7 @@ function ci_package_tests_run {
         python-stdlib/datetime \
         python-stdlib/fnmatch \
         python-stdlib/hashlib \
+        python-stdlib/inspect \
         python-stdlib/pathlib \
         python-stdlib/quopri \
         python-stdlib/shutil \

From 5b496e944ec045177afa1620920a168410b7f60b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Apr 2025 10:24:54 +1000
Subject: [PATCH 326/343] inspect: Implement iscoroutinefunction and
 iscoroutine.

Signed-off-by: Damien George <damien@micropython.org>
---
 python-stdlib/inspect/inspect.py      | 5 +++++
 python-stdlib/inspect/manifest.py     | 2 +-
 python-stdlib/inspect/test_inspect.py | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/inspect/inspect.py b/python-stdlib/inspect/inspect.py
index fb2ad885d..c16c6b3e3 100644
--- a/python-stdlib/inspect/inspect.py
+++ b/python-stdlib/inspect/inspect.py
@@ -25,6 +25,11 @@ def isgenerator(obj):
     return isinstance(obj, type((_g)()))
 
 
+# In MicroPython there's currently no way to distinguish between generators and coroutines.
+iscoroutinefunction = isgeneratorfunction
+iscoroutine = isgenerator
+
+
 class _Class:
     def meth():
         pass
diff --git a/python-stdlib/inspect/manifest.py b/python-stdlib/inspect/manifest.py
index a9d5a2381..e99e659f2 100644
--- a/python-stdlib/inspect/manifest.py
+++ b/python-stdlib/inspect/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.2")
+metadata(version="0.1.3")
 
 module("inspect.py")
diff --git a/python-stdlib/inspect/test_inspect.py b/python-stdlib/inspect/test_inspect.py
index 6f262ca64..29ed80f11 100644
--- a/python-stdlib/inspect/test_inspect.py
+++ b/python-stdlib/inspect/test_inspect.py
@@ -44,6 +44,12 @@ def test_isgeneratorfunction(self):
     def test_isgenerator(self):
         self._test_is_helper(inspect.isgenerator, entities[2])
 
+    def test_iscoroutinefunction(self):
+        self._test_is_helper(inspect.iscoroutinefunction, entities[1])
+
+    def test_iscoroutine(self):
+        self._test_is_helper(inspect.iscoroutine, entities[2])
+
     def test_ismethod(self):
         self._test_is_helper(inspect.ismethod, entities[5])
 

From f8c8875e250e1dfef0158f15ccbb66e8cee9aa57 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Apr 2025 10:34:45 +1000
Subject: [PATCH 327/343] lora: Fix SNR value in SX126x received packets.

Wasn't being treated as a signed value.

Fixes issue #999.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/lora/lora-sx126x/lora/sx126x.py | 5 +++--
 micropython/lora/lora-sx126x/manifest.py    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/micropython/lora/lora-sx126x/lora/sx126x.py b/micropython/lora/lora-sx126x/lora/sx126x.py
index 641367a9f..7fa4896ae 100644
--- a/micropython/lora/lora-sx126x/lora/sx126x.py
+++ b/micropython/lora/lora-sx126x/lora/sx126x.py
@@ -596,8 +596,9 @@ def _read_packet(self, rx_packet, flags):
         pkt_status = self._cmd("B", _CMD_GET_PACKET_STATUS, n_read=4)
 
         rx_packet.ticks_ms = ticks_ms
-        rx_packet.snr = pkt_status[2]  # SNR, units: dB *4
-        rx_packet.rssi = 0 - pkt_status[1] // 2  # RSSI, units: dBm
+        # SNR units are dB * 4 (signed)
+        rx_packet.rssi, rx_packet.snr = struct.unpack("xBbx", pkt_status)
+        rx_packet.rssi //= -2  # RSSI, units: dBm
         rx_packet.crc_error = (flags & _IRQ_CRC_ERR) != 0
 
         return rx_packet
diff --git a/micropython/lora/lora-sx126x/manifest.py b/micropython/lora/lora-sx126x/manifest.py
index 038710820..76fa91d8d 100644
--- a/micropython/lora/lora-sx126x/manifest.py
+++ b/micropython/lora/lora-sx126x/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.4")
+metadata(version="0.1.5")
 require("lora")
 package("lora")

From d887a021e831ee3b7e6f00f6a4c32b36ee6c4769 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Apr 2025 10:41:10 +1000
Subject: [PATCH 328/343] top: Bump the Ruff version to 0.11.6.

With small code fixes to match.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ruff.yml                           |  3 ++-
 .pre-commit-config.yaml                              |  3 ++-
 .../bluetooth/aioble/examples/l2cap_file_client.py   |  2 +-
 .../bluetooth/aioble/examples/l2cap_file_server.py   |  2 +-
 micropython/drivers/codec/wm8960/wm8960.py           | 12 ++++--------
 micropython/drivers/display/lcd160cr/lcd160cr.py     |  6 ++----
 pyproject.toml                                       |  3 ++-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 71c4131f0..b347e34ee 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -6,6 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: pip install --user ruff==0.1.2
+    # Version should be kept in sync with .pre-commit_config.yaml & also micropython
+    - run: pip install --user ruff==0.11.6
     - run: ruff check --output-format=github .
     - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 335c1c2fc..05f5d3df0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,8 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.2
+    # Version should be kept in sync with .github/workflows/ruff.yml & also micropython
+    rev: v0.11.6
     hooks:
       - id: ruff
         id: ruff-format
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_client.py b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
index 9dce349a7..0817ca162 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_client.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
@@ -88,7 +88,7 @@ async def download(self, path, dest):
 
         await self._command(_COMMAND_SEND, path.encode())
 
-        with open(dest, "wb") as f:  # noqa: ASYNC101
+        with open(dest, "wb") as f:  # noqa: ASYNC230
             total = 0
             buf = bytearray(self._channel.our_mtu)
             mv = memoryview(buf)
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_server.py b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
index fb806effc..3c3b3b44d 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_server.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
@@ -83,7 +83,7 @@ async def l2cap_task(connection):
 
             if send_file:
                 print("Sending:", send_file)
-                with open(send_file, "rb") as f:  # noqa: ASYNC101
+                with open(send_file, "rb") as f:  # noqa: ASYNC230
                     buf = bytearray(channel.peer_mtu)
                     mv = memoryview(buf)
                     while n := f.readinto(buf):
diff --git a/micropython/drivers/codec/wm8960/wm8960.py b/micropython/drivers/codec/wm8960/wm8960.py
index dc0dd655d..313649f36 100644
--- a/micropython/drivers/codec/wm8960/wm8960.py
+++ b/micropython/drivers/codec/wm8960/wm8960.py
@@ -331,8 +331,7 @@ def __init__(
                 sysclk = 11289600
             else:
                 sysclk = 12288000
-            if sysclk < sample_rate * 256:
-                sysclk = sample_rate * 256
+            sysclk = max(sysclk, sample_rate * 256)
             if mclk_freq is None:
                 mclk_freq = sysclk
         else:  # sysclk_source == SYSCLK_MCLK
@@ -691,10 +690,8 @@ def alc_mode(self, channel, mode=ALC_MODE):
     def alc_gain(self, target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78):
         def limit(value, minval, maxval):
             value = int(value)
-            if value < minval:
-                value = minval
-            if value > maxval:
-                value = maxval
+            value = max(value, minval)
+            value = min(value, maxval)
             return value
 
         target = limit((16 + (target * 2) // 3), 0, 15)
@@ -718,8 +715,7 @@ def logb(value, limit):
             while value > 1:
                 value >>= 1
                 lb += 1
-            if lb > limit:
-                lb = limit
+            lb = min(lb, limit)
             return lb
 
         attack = logb(attack / 6, 7)
diff --git a/micropython/drivers/display/lcd160cr/lcd160cr.py b/micropython/drivers/display/lcd160cr/lcd160cr.py
index 42b5e215b..177c6fea3 100644
--- a/micropython/drivers/display/lcd160cr/lcd160cr.py
+++ b/micropython/drivers/display/lcd160cr/lcd160cr.py
@@ -189,10 +189,8 @@ def clip_line(c, w, h):
                         c[3] = h - 1
                 else:
                     if c[0] == c[2]:
-                        if c[1] < 0:
-                            c[1] = 0
-                        if c[3] < 0:
-                            c[3] = 0
+                        c[1] = max(c[1], 0)
+                        c[3] = max(c[3], 0)
                     else:
                         if c[3] < c[1]:
                             c[0], c[2] = c[2], c[0]
diff --git a/pyproject.toml b/pyproject.toml
index 4776ddfe9..83d29405d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -64,7 +64,7 @@ ignore = [
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
   "PLC1901",
-  "PLR1701",
+  "PLR1704",  # sometimes desirable to redefine an argument to save code size
   "PLR1714",
   "PLR5501",
   "PLW0602",
@@ -72,6 +72,7 @@ ignore = [
   "PLW2901",
   "RUF012",
   "RUF100",
+  "SIM101",
   "W191",  # tab-indent, redundant when using formatter
 ]
 line-length = 99

From 68e0dfce0a8708e7d9aef4446fad842cc5929410 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Apr 2025 11:01:42 +1000
Subject: [PATCH 329/343] all: Apply Ruff 0.11.6 reformatting changes.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 micropython/aiorepl/aiorepl.py                   | 16 ++++++++--------
 micropython/drivers/imu/lsm9ds1/lsm9ds1.py       |  1 +
 micropython/drivers/radio/nrf24l01/nrf24l01.py   |  3 +--
 micropython/drivers/sensor/hts221/hts221.py      |  2 +-
 micropython/drivers/sensor/lps22h/lps22h.py      |  1 +
 micropython/espflash/espflash.py                 | 16 ++++++++--------
 .../lora/examples/reliable_delivery/sender.py    |  2 +-
 .../examples/reliable_delivery/sender_async.py   |  2 +-
 micropython/senml/examples/actuator.py           |  1 -
 micropython/senml/examples/base.py               |  1 -
 micropython/senml/examples/basic.py              |  1 -
 micropython/senml/examples/basic2.py             |  1 -
 micropython/senml/examples/basic_cbor.py         |  1 -
 micropython/senml/examples/custom_record.py      |  1 -
 micropython/senml/examples/gateway.py            |  1 -
 micropython/senml/examples/gateway_actuators.py  |  1 -
 .../senml/examples/supported_data_types.py       |  1 -
 micropython/senml/senml/__init__.py              |  1 -
 micropython/senml/senml/senml_pack.py            |  1 -
 micropython/senml/senml/senml_record.py          |  1 -
 python-ecosys/cbor2/cbor2/__init__.py            |  1 -
 python-ecosys/cbor2/cbor2/_decoder.py            |  1 -
 python-ecosys/cbor2/cbor2/_encoder.py            |  1 -
 python-ecosys/cbor2/examples/cbor_test.py        |  1 -
 24 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 8f45dfac0..3f437459d 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -132,7 +132,7 @@ async def task(g=None, prompt="--> "):
                             continue
                         if curs:
                             # move cursor to end of the line
-                            sys.stdout.write("\x1B[{}C".format(curs))
+                            sys.stdout.write("\x1b[{}C".format(curs))
                             curs = 0
                         sys.stdout.write("\n")
                         if cmd:
@@ -153,10 +153,10 @@ async def task(g=None, prompt="--> "):
                             if curs:
                                 cmd = "".join((cmd[: -curs - 1], cmd[-curs:]))
                                 sys.stdout.write(
-                                    "\x08\x1B[K"
+                                    "\x08\x1b[K"
                                 )  # move cursor back, erase to end of line
                                 sys.stdout.write(cmd[-curs:])  # redraw line
-                                sys.stdout.write("\x1B[{}D".format(curs))  # reset cursor location
+                                sys.stdout.write("\x1b[{}D".format(curs))  # reset cursor location
                             else:
                                 cmd = cmd[:-1]
                                 sys.stdout.write("\x08 \x08")
@@ -207,21 +207,21 @@ async def task(g=None, prompt="--> "):
                         elif key == "[D":  # left
                             if curs < len(cmd) - 1:
                                 curs += 1
-                                sys.stdout.write("\x1B")
+                                sys.stdout.write("\x1b")
                                 sys.stdout.write(key)
                         elif key == "[C":  # right
                             if curs:
                                 curs -= 1
-                                sys.stdout.write("\x1B")
+                                sys.stdout.write("\x1b")
                                 sys.stdout.write(key)
                         elif key == "[H":  # home
                             pcurs = curs
                             curs = len(cmd)
-                            sys.stdout.write("\x1B[{}D".format(curs - pcurs))  # move cursor left
+                            sys.stdout.write("\x1b[{}D".format(curs - pcurs))  # move cursor left
                         elif key == "[F":  # end
                             pcurs = curs
                             curs = 0
-                            sys.stdout.write("\x1B[{}C".format(pcurs))  # move cursor right
+                            sys.stdout.write("\x1b[{}C".format(pcurs))  # move cursor right
                     else:
                         # sys.stdout.write("\\x")
                         # sys.stdout.write(hex(c))
@@ -231,7 +231,7 @@ async def task(g=None, prompt="--> "):
                         # inserting into middle of line
                         cmd = "".join((cmd[:-curs], b, cmd[-curs:]))
                         sys.stdout.write(cmd[-curs - 1 :])  # redraw line to end
-                        sys.stdout.write("\x1B[{}D".format(curs))  # reset cursor location
+                        sys.stdout.write("\x1b[{}D".format(curs))  # reset cursor location
                     else:
                         sys.stdout.write(b)
                         cmd += b
diff --git a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
index e3d46429d..e5a96ad5c 100644
--- a/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
+++ b/micropython/drivers/imu/lsm9ds1/lsm9ds1.py
@@ -43,6 +43,7 @@
     print("")
     time.sleep_ms(100)
 """
+
 import array
 from micropython import const
 
diff --git a/micropython/drivers/radio/nrf24l01/nrf24l01.py b/micropython/drivers/radio/nrf24l01/nrf24l01.py
index d015250cf..9fbadcd60 100644
--- a/micropython/drivers/radio/nrf24l01/nrf24l01.py
+++ b/micropython/drivers/radio/nrf24l01/nrf24l01.py
@@ -1,5 +1,4 @@
-"""NRF24L01 driver for MicroPython
-"""
+"""NRF24L01 driver for MicroPython"""
 
 from micropython import const
 import utime
diff --git a/micropython/drivers/sensor/hts221/hts221.py b/micropython/drivers/sensor/hts221/hts221.py
index fec52a738..c6cd51f48 100644
--- a/micropython/drivers/sensor/hts221/hts221.py
+++ b/micropython/drivers/sensor/hts221/hts221.py
@@ -52,7 +52,7 @@ def __init__(self, i2c, data_rate=1, address=0x5F):
 
         # Set configuration register
         # Humidity and temperature average configuration
-        self.bus.writeto_mem(self.slv_addr, 0x10, b"\x1B")
+        self.bus.writeto_mem(self.slv_addr, 0x10, b"\x1b")
 
         # Set control register
         # PD | BDU | ODR
diff --git a/micropython/drivers/sensor/lps22h/lps22h.py b/micropython/drivers/sensor/lps22h/lps22h.py
index 1e7f4ec3e..7dec72528 100644
--- a/micropython/drivers/sensor/lps22h/lps22h.py
+++ b/micropython/drivers/sensor/lps22h/lps22h.py
@@ -37,6 +37,7 @@
     print("Pressure: %.2f hPa Temperature: %.2f C"%(lps.pressure(), lps.temperature()))
     time.sleep_ms(10)
 """
+
 import machine
 from micropython import const
 
diff --git a/micropython/espflash/espflash.py b/micropython/espflash/espflash.py
index 74988777a..fbf4e1f7e 100644
--- a/micropython/espflash/espflash.py
+++ b/micropython/espflash/espflash.py
@@ -113,22 +113,22 @@ def _poll_reg(self, addr, flag, retry=10, delay=0.050):
             raise Exception(f"Register poll timeout. Addr: 0x{addr:02X} Flag: 0x{flag:02X}.")
 
     def _write_slip(self, pkt):
-        pkt = pkt.replace(b"\xDB", b"\xdb\xdd").replace(b"\xc0", b"\xdb\xdc")
-        self.uart.write(b"\xC0" + pkt + b"\xC0")
+        pkt = pkt.replace(b"\xdb", b"\xdb\xdd").replace(b"\xc0", b"\xdb\xdc")
+        self.uart.write(b"\xc0" + pkt + b"\xc0")
         self._log(pkt)
 
     def _read_slip(self):
         pkt = None
         # Find the packet start.
-        if self.uart.read(1) == b"\xC0":
+        if self.uart.read(1) == b"\xc0":
             pkt = bytearray()
             while True:
                 b = self.uart.read(1)
-                if b is None or b == b"\xC0":
+                if b is None or b == b"\xc0":
                     break
                 pkt += b
-            pkt = pkt.replace(b"\xDB\xDD", b"\xDB").replace(b"\xDB\xDC", b"\xC0")
-            self._log(b"\xC0" + pkt + b"\xC0", False)
+            pkt = pkt.replace(b"\xdb\xdd", b"\xdb").replace(b"\xdb\xdc", b"\xc0")
+            self._log(b"\xc0" + pkt + b"\xc0", False)
         return pkt
 
     def _strerror(self, err):
@@ -230,7 +230,7 @@ def flash_read_size(self):
             raise Exception(f"Unexpected flash size bits: 0x{flash_bits:02X}.")
 
         flash_size = 2**flash_bits
-        print(f"Flash size {flash_size/1024/1024} MBytes")
+        print(f"Flash size {flash_size / 1024 / 1024} MBytes")
         return flash_size
 
     def flash_attach(self):
@@ -265,7 +265,7 @@ def flash_write_file(self, path, blksize=0x1000):
                     self.md5sum.update(buf)
                 # The last data block should be padded to the block size with 0xFF bytes.
                 if len(buf) < blksize:
-                    buf += b"\xFF" * (blksize - len(buf))
+                    buf += b"\xff" * (blksize - len(buf))
                 checksum = self._checksum(buf)
                 if seq % erase_blocks == 0:
                     # print(f"Erasing {seq} -> {seq+erase_blocks}...")
diff --git a/micropython/lora/examples/reliable_delivery/sender.py b/micropython/lora/examples/reliable_delivery/sender.py
index 2fba0d4d7..957e9d824 100644
--- a/micropython/lora/examples/reliable_delivery/sender.py
+++ b/micropython/lora/examples/reliable_delivery/sender.py
@@ -149,7 +149,7 @@ def send(self, sensor_data, adjust_output_power=True):
                 delta = time.ticks_diff(maybe_ack.ticks_ms, sent_at)
                 print(
                     f"ACKed with RSSI {rssi}, {delta}ms after sent "
-                    + f"(skew {delta-ACK_DELAY_MS-ack_packet_ms}ms)"
+                    + f"(skew {delta - ACK_DELAY_MS - ack_packet_ms}ms)"
                 )
 
                 if adjust_output_power:
diff --git a/micropython/lora/examples/reliable_delivery/sender_async.py b/micropython/lora/examples/reliable_delivery/sender_async.py
index a27420f6b..4c14d6f11 100644
--- a/micropython/lora/examples/reliable_delivery/sender_async.py
+++ b/micropython/lora/examples/reliable_delivery/sender_async.py
@@ -141,7 +141,7 @@ async def send(self, sensor_data, adjust_output_power=True):
                 delta = time.ticks_diff(maybe_ack.ticks_ms, sent_at)
                 print(
                     f"ACKed with RSSI {rssi}, {delta}ms after sent "
-                    + f"(skew {delta-ACK_DELAY_MS-ack_packet_ms}ms)"
+                    + f"(skew {delta - ACK_DELAY_MS - ack_packet_ms}ms)"
                 )
 
                 if adjust_output_power:
diff --git a/micropython/senml/examples/actuator.py b/micropython/senml/examples/actuator.py
index 8e254349d..2fac474cd 100644
--- a/micropython/senml/examples/actuator.py
+++ b/micropython/senml/examples/actuator.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 
 
diff --git a/micropython/senml/examples/base.py b/micropython/senml/examples/base.py
index 426cbbd0e..6a49cfdd2 100644
--- a/micropython/senml/examples/base.py
+++ b/micropython/senml/examples/base.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 import time
 
diff --git a/micropython/senml/examples/basic.py b/micropython/senml/examples/basic.py
index 18a3a9a06..3f3ed6150 100644
--- a/micropython/senml/examples/basic.py
+++ b/micropython/senml/examples/basic.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 import time
 
diff --git a/micropython/senml/examples/basic2.py b/micropython/senml/examples/basic2.py
index c2ea153bd..ca53b4a6e 100644
--- a/micropython/senml/examples/basic2.py
+++ b/micropython/senml/examples/basic2.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 import time
 
diff --git a/micropython/senml/examples/basic_cbor.py b/micropython/senml/examples/basic_cbor.py
index 804a886fc..b9d9d620b 100644
--- a/micropython/senml/examples/basic_cbor.py
+++ b/micropython/senml/examples/basic_cbor.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 import time
 import cbor2
diff --git a/micropython/senml/examples/custom_record.py b/micropython/senml/examples/custom_record.py
index e68d05f5b..1e83ea06b 100644
--- a/micropython/senml/examples/custom_record.py
+++ b/micropython/senml/examples/custom_record.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 
 import time
diff --git a/micropython/senml/examples/gateway.py b/micropython/senml/examples/gateway.py
index d28e4cffc..e1827ff2d 100644
--- a/micropython/senml/examples/gateway.py
+++ b/micropython/senml/examples/gateway.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 import time
 
diff --git a/micropython/senml/examples/gateway_actuators.py b/micropython/senml/examples/gateway_actuators.py
index add5ed24c..a7e5b378c 100644
--- a/micropython/senml/examples/gateway_actuators.py
+++ b/micropython/senml/examples/gateway_actuators.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 
 
diff --git a/micropython/senml/examples/supported_data_types.py b/micropython/senml/examples/supported_data_types.py
index 3149f49d2..94976bb66 100644
--- a/micropython/senml/examples/supported_data_types.py
+++ b/micropython/senml/examples/supported_data_types.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml import *
 import time
 
diff --git a/micropython/senml/senml/__init__.py b/micropython/senml/senml/__init__.py
index 93cbd7700..908375fdb 100644
--- a/micropython/senml/senml/__init__.py
+++ b/micropython/senml/senml/__init__.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from .senml_base import SenmlBase
 from .senml_pack import SenmlPack
 from .senml_record import SenmlRecord
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
index 4e106fd3e..5a0554467 100644
--- a/micropython/senml/senml/senml_pack.py
+++ b/micropython/senml/senml/senml_pack.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from senml.senml_record import SenmlRecord
 from senml.senml_base import SenmlBase
 import json
diff --git a/micropython/senml/senml/senml_record.py b/micropython/senml/senml/senml_record.py
index 9dfe22873..ae40f0f70 100644
--- a/micropython/senml/senml/senml_record.py
+++ b/micropython/senml/senml/senml_record.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 import binascii
 from senml.senml_base import SenmlBase
 
diff --git a/python-ecosys/cbor2/cbor2/__init__.py b/python-ecosys/cbor2/cbor2/__init__.py
index 7cd98734e..80790f0da 100644
--- a/python-ecosys/cbor2/cbor2/__init__.py
+++ b/python-ecosys/cbor2/cbor2/__init__.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 from ._decoder import CBORDecoder
 from ._decoder import load
 from ._decoder import loads
diff --git a/python-ecosys/cbor2/cbor2/_decoder.py b/python-ecosys/cbor2/cbor2/_decoder.py
index 5d509a535..965dbfd46 100644
--- a/python-ecosys/cbor2/cbor2/_decoder.py
+++ b/python-ecosys/cbor2/cbor2/_decoder.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 import io
 import struct
 
diff --git a/python-ecosys/cbor2/cbor2/_encoder.py b/python-ecosys/cbor2/cbor2/_encoder.py
index 80a4ac022..fe8715468 100644
--- a/python-ecosys/cbor2/cbor2/_encoder.py
+++ b/python-ecosys/cbor2/cbor2/_encoder.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 import io
 import struct
 
diff --git a/python-ecosys/cbor2/examples/cbor_test.py b/python-ecosys/cbor2/examples/cbor_test.py
index b4f351786..a1cd7e93e 100644
--- a/python-ecosys/cbor2/examples/cbor_test.py
+++ b/python-ecosys/cbor2/examples/cbor_test.py
@@ -23,7 +23,6 @@
 THE SOFTWARE.
 """
 
-
 import cbor2
 
 input = [

From 0d60de65b7cf6bf784e2e4e9f84f1a70faf2ae83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 7 Mar 2024 15:01:10 +0100
Subject: [PATCH 330/343] utop: Add initial implementation for ESP32.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 micropython/utop/README.md   | 12 +++++
 micropython/utop/manifest.py |  6 +++
 micropython/utop/utop.py     | 85 ++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 micropython/utop/README.md
 create mode 100644 micropython/utop/manifest.py
 create mode 100644 micropython/utop/utop.py

diff --git a/micropython/utop/README.md b/micropython/utop/README.md
new file mode 100644
index 000000000..7b07e785d
--- /dev/null
+++ b/micropython/utop/README.md
@@ -0,0 +1,12 @@
+# utop
+
+Provides a top-like live overview of the running system.
+
+On the `esp32` port this depends on the `esp32.idf_task_info()` function, which
+can be enabled by adding the following lines to the board `sdkconfig`:
+
+```ini
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
+CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
+```
diff --git a/micropython/utop/manifest.py b/micropython/utop/manifest.py
new file mode 100644
index 000000000..ebba07270
--- /dev/null
+++ b/micropython/utop/manifest.py
@@ -0,0 +1,6 @@
+metadata(
+    version="0.1.0",
+    description="Provides a top-like live overview of the running system.",
+)
+
+module("utop.py")
diff --git a/micropython/utop/utop.py b/micropython/utop/utop.py
new file mode 100644
index 000000000..d4e94c94a
--- /dev/null
+++ b/micropython/utop/utop.py
@@ -0,0 +1,85 @@
+import time
+
+try:
+    import esp32
+    import _thread
+except ImportError:
+    esp32 = None
+
+
+def top(update_interval_ms=1000, timeout_ms=None, thread_names={}):
+    time_start = time.ticks_ms()
+    previous_total_runtime = None
+    previous_task_runtimes = {}
+    previous_line_count = 0
+    esp32_task_state_names = dict(
+        enumerate(("running", "ready", "blocked", "suspended", "deleted", "invalid"))
+    )
+
+    while timeout_ms is None or abs(time.ticks_diff(time.ticks_ms(), time_start)) < timeout_ms:
+        if previous_line_count > 0:
+            print("\x1b[{}A".format(previous_line_count), end="")
+        line_count = 0
+
+        if esp32 is not None:
+            if not hasattr(esp32, "idf_task_info"):
+                print(
+                    "INFO: esp32.idf_task_info() is not available, cannot list active tasks.\x1b[K"
+                )
+                line_count += 1
+            else:
+                print("   CPU%  CORE  PRIORITY  STATE      STACKWATERMARK  NAME\x1b[K")
+                line_count += 1
+
+                total_runtime, tasks = esp32.idf_task_info()
+                current_thread_id = _thread.get_ident()
+                tasks.sort(key=lambda t: t[0])
+                for (
+                    task_id,
+                    task_name,
+                    task_state,
+                    task_priority,
+                    task_runtime,
+                    task_stackhighwatermark,
+                    task_coreid,
+                ) in tasks:
+                    task_runtime_percentage = "-"
+                    if (
+                        total_runtime != previous_total_runtime
+                        and task_id in previous_task_runtimes
+                    ):
+                        task_runtime_percentage = "{:.2f}%".format(
+                            100
+                            * ((task_runtime - previous_task_runtimes[task_id]) & (2**32 - 1))
+                            / ((total_runtime - previous_total_runtime) & (2**32 - 1))
+                        )
+                    print(
+                        "{:>7}  {:>4}  {:>8d}  {:<9}  {:<14d}  {}{}\x1b[K".format(
+                            task_runtime_percentage,
+                            "-" if task_coreid is None else task_coreid,
+                            task_priority,
+                            esp32_task_state_names.get(task_state, "unknown"),
+                            task_stackhighwatermark,
+                            thread_names.get(task_id, task_name),
+                            " (*)" if task_id == current_thread_id else "",
+                        )
+                    )
+                    line_count += 1
+
+                    previous_task_runtimes[task_id] = task_runtime
+                previous_total_runtime = total_runtime
+        else:
+            print("INFO: Platform does not support listing active tasks.\x1b[K")
+            line_count += 1
+
+        if previous_line_count > line_count:
+            for _ in range(previous_line_count - line_count):
+                print("\x1b[K")
+            print("\x1b[{}A".format(previous_line_count - line_count), end="")
+
+        previous_line_count = line_count
+
+        try:
+            time.sleep_ms(update_interval_ms)
+        except KeyboardInterrupt:
+            break

From 08e09afbe3d16ea97b78ba486153a7ea4a750232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Mon, 12 May 2025 16:24:19 +0200
Subject: [PATCH 331/343] utop: Print MicroPython memory info.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 micropython/utop/utop.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/micropython/utop/utop.py b/micropython/utop/utop.py
index d4e94c94a..76fdaade0 100644
--- a/micropython/utop/utop.py
+++ b/micropython/utop/utop.py
@@ -1,3 +1,4 @@
+import micropython
 import time
 
 try:
@@ -72,6 +73,12 @@ def top(update_interval_ms=1000, timeout_ms=None, thread_names={}):
             print("INFO: Platform does not support listing active tasks.\x1b[K")
             line_count += 1
 
+        print("\x1b[K")
+        line_count += 1
+        print("MicroPython ", end="")
+        micropython.mem_info()
+        line_count += 3
+
         if previous_line_count > line_count:
             for _ in range(previous_line_count - line_count):
                 print("\x1b[K")

From 54d5f7cee2b95c976589bd4c815c24c358557e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 7 Mar 2024 15:01:45 +0100
Subject: [PATCH 332/343] utop: Print IDF heap details.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 micropython/utop/utop.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/micropython/utop/utop.py b/micropython/utop/utop.py
index 76fdaade0..799ff4212 100644
--- a/micropython/utop/utop.py
+++ b/micropython/utop/utop.py
@@ -79,6 +79,23 @@ def top(update_interval_ms=1000, timeout_ms=None, thread_names={}):
         micropython.mem_info()
         line_count += 3
 
+        if esp32 is not None:
+            print("\x1b[K")
+            line_count += 1
+            for name, cap in (("data", esp32.HEAP_DATA), ("exec", esp32.HEAP_EXEC)):
+                heaps = esp32.idf_heap_info(cap)
+                print(
+                    "IDF heap ({}): {} regions, {} total, {} free, {} largest contiguous, {} min free watermark\x1b[K".format(
+                        name,
+                        len(heaps),
+                        sum((h[0] for h in heaps)),
+                        sum((h[1] for h in heaps)),
+                        max((h[2] for h in heaps)),
+                        sum((h[3] for h in heaps)),
+                    )
+                )
+                line_count += 1
+
         if previous_line_count > line_count:
             for _ in range(previous_line_count - line_count):
                 print("\x1b[K")

From 567540d4e0be3fd4500cc199416bfa602bf7bcec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 14 May 2025 18:08:22 +0200
Subject: [PATCH 333/343] tools/verifygitlog.py: Sync with changes from the
 main repo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This includes the following commits:

- Allow long co-author and sign-off names.
- Disallow a leading slash in commit subject line.
- Apply stricter rules on git subject line.
- Show invalid commit subjects in quotes.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 tools/verifygitlog.py | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index 20be794f8..46fec1e0c 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -49,7 +49,7 @@ def git_log(pretty_format, *args):
 
 
 def diagnose_subject_line(subject_line, subject_line_format, err):
-    err.error("Subject line: " + subject_line)
+    err.error('Subject line: "' + subject_line + '"')
     if not subject_line.endswith("."):
         err.error('* must end with "."')
     if not re.match(r"^[^!]+: ", subject_line):
@@ -98,20 +98,47 @@ def verify_message_body(raw_body, err):
     if len(subject_line) >= 73:
         err.error("Subject line must be 72 or fewer characters: " + subject_line)
 
+    # Do additional checks on the prefix of the subject line.
+    verify_subject_line_prefix(subject_line.split(": ")[0], err)
+
     # Second one divides subject and body.
     if len(raw_body) > 1 and raw_body[1]:
         err.error("Second message line must be empty: " + raw_body[1])
 
     # Message body lines.
     for line in raw_body[2:]:
-        # Long lines with URLs are exempt from the line length rule.
-        if len(line) >= 76 and "://" not in line:
+        # Long lines with URLs or human names are exempt from the line length rule.
+        if len(line) >= 76 and not (
+            "://" in line
+            or line.startswith("Co-authored-by: ")
+            or line.startswith("Signed-off-by: ")
+        ):
             err.error("Message lines should be 75 or less characters: " + line)
 
     if not raw_body[-1].startswith("Signed-off-by: ") or "@" not in raw_body[-1]:
         err.error('Message must be signed-off. Use "git commit -s".')
 
 
+def verify_subject_line_prefix(prefix, err):
+    ext = (".c", ".h", ".cpp", ".js", ".rst", ".md")
+
+    if prefix.startswith((".", "/")):
+        err.error('Subject prefix cannot begin with "." or "/".')
+
+    if prefix.endswith("/"):
+        err.error('Subject prefix cannot end with "/".')
+
+    if prefix.startswith("ports/"):
+        err.error(
+            'Subject prefix cannot begin with "ports/", start with the name of the port instead.'
+        )
+
+    if prefix.endswith(ext):
+        err.error(
+            "Subject prefix cannot end with a file extension, use the main part of the filename without the extension."
+        )
+
+
 def run(args):
     verbose("run", *args)
 

From 96bd01ec047923c15bf936d2f77043968745542d Mon Sep 17 00:00:00 2001
From: Adam Lewis <dotdashnotdotsoftware@gmail.com>
Date: Sun, 22 Sep 2024 17:55:35 +0200
Subject: [PATCH 334/343] urllib.urequest: Add support for headers to
 urequest.urlopen.

This is an extension to CPython, similar to the `method` argument.

Signed-off-by: Adam Lewis <dotdashnotdotsoftware@gmail.com>
---
 micropython/urllib.urequest/manifest.py        | 2 +-
 micropython/urllib.urequest/urllib/urequest.py | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/micropython/urllib.urequest/manifest.py b/micropython/urllib.urequest/manifest.py
index 2790208a7..033022711 100644
--- a/micropython/urllib.urequest/manifest.py
+++ b/micropython/urllib.urequest/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.7.0")
+metadata(version="0.8.0")
 
 # Originally written by Paul Sokolovsky.
 
diff --git a/micropython/urllib.urequest/urllib/urequest.py b/micropython/urllib.urequest/urllib/urequest.py
index f83cbaa94..a9622ea89 100644
--- a/micropython/urllib.urequest/urllib/urequest.py
+++ b/micropython/urllib.urequest/urllib/urequest.py
@@ -1,7 +1,7 @@
 import socket
 
 
-def urlopen(url, data=None, method="GET"):
+def urlopen(url, data=None, method="GET", headers={}):
     if data is not None and method == "GET":
         method = "POST"
     try:
@@ -40,6 +40,12 @@ def urlopen(url, data=None, method="GET"):
         s.write(host)
         s.write(b"\r\n")
 
+        for k in headers:
+            s.write(k)
+            s.write(b": ")
+            s.write(headers[k])
+            s.write(b"\r\n")
+
         if data:
             s.write(b"Content-Length: ")
             s.write(str(len(data)))

From aad2e4809868354155c82de673c93abf0a38a194 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 5 May 2025 21:03:14 +1000
Subject: [PATCH 335/343] aiorepl: Use blocking reads for raw REPL and raw
 paste.

Raw REPL mode is generally used as a command channel where all stdio
traffic is related directly to the raw commands and responses sent.

For this to work in aiorepl we need to ensure background tasks don't sent/
receive anything on stdio else the command channel will be corrupted.

The simplest way to achieve this is to make the raw commands blocking and
atomic rather than asyncio, assuming the user wont leave the device in raw
mode for too long at any one time.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/aiorepl.py  | 17 +++++++++++------
 micropython/aiorepl/manifest.py |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index 3f437459d..a640efcd1 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -161,7 +161,7 @@ async def task(g=None, prompt="--> "):
                                 cmd = cmd[:-1]
                                 sys.stdout.write("\x08 \x08")
                     elif c == CHAR_CTRL_A:
-                        await raw_repl(s, g)
+                        raw_repl(sys.stdin, g)
                         break
                     elif c == CHAR_CTRL_B:
                         continue
@@ -239,7 +239,7 @@ async def task(g=None, prompt="--> "):
         micropython.kbd_intr(3)
 
 
-async def raw_paste(s, g, window=512):
+def raw_paste(s, window=512):
     sys.stdout.write("R\x01")  # supported
     sys.stdout.write(bytearray([window & 0xFF, window >> 8, 0x01]).decode())
     eof = False
@@ -248,7 +248,7 @@ async def raw_paste(s, g, window=512):
     file = b""
     while not eof:
         for idx in range(window):
-            b = await s.read(1)
+            b = s.read(1)
             c = ord(b)
             if c == CHAR_CTRL_C or c == CHAR_CTRL_D:
                 # end of file
@@ -267,7 +267,12 @@ async def raw_paste(s, g, window=512):
     return file
 
 
-async def raw_repl(s: asyncio.StreamReader, g: dict):
+def raw_repl(s, g: dict):
+    """
+    This function is blocking to prevent other
+    async tasks from writing to the stdio stream and
+    breaking the raw repl session.
+    """
     heading = "raw REPL; CTRL-B to exit\n"
     line = ""
     sys.stdout.write(heading)
@@ -276,7 +281,7 @@ async def raw_repl(s: asyncio.StreamReader, g: dict):
         line = ""
         sys.stdout.write(">")
         while True:
-            b = await s.read(1)
+            b = s.read(1)
             c = ord(b)
             if c == CHAR_CTRL_A:
                 rline = line
@@ -284,7 +289,7 @@ async def raw_repl(s: asyncio.StreamReader, g: dict):
 
                 if len(rline) == 2 and ord(rline[0]) == CHAR_CTRL_E:
                     if rline[1] == "A":
-                        line = await raw_paste(s, g)
+                        line = raw_paste(s)
                         break
                 else:
                     # reset raw REPL
diff --git a/micropython/aiorepl/manifest.py b/micropython/aiorepl/manifest.py
index 0fcc21849..ca2fa1513 100644
--- a/micropython/aiorepl/manifest.py
+++ b/micropython/aiorepl/manifest.py
@@ -1,5 +1,5 @@
 metadata(
-    version="0.2.0",
+    version="0.2.1",
     description="Provides an asynchronous REPL that can run concurrently with an asyncio, also allowing await expressions.",
 )
 

From 15a6233d040d18bf151c93675c9c4da793d5220e Mon Sep 17 00:00:00 2001
From: Nick Budak <thatbudakguy@gmail.com>
Date: Wed, 4 Jun 2025 09:55:47 -0700
Subject: [PATCH 336/343] errno: Add ENOTCONN constant.

This is present in core MicroPython so needs to be added here.

Signed-off-by: Nick Budak <thatbudakguy@gmail.com>
---
 python-stdlib/errno/errno.py    | 1 +
 python-stdlib/errno/manifest.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/errno/errno.py b/python-stdlib/errno/errno.py
index 05441b69c..c513a7f14 100644
--- a/python-stdlib/errno/errno.py
+++ b/python-stdlib/errno/errno.py
@@ -34,5 +34,6 @@
 ERANGE = 34  # Math result not representable
 EAFNOSUPPORT = 97  # Address family not supported by protocol
 ECONNRESET = 104  # Connection timed out
+ENOTCONN = 107 # Not connected
 ETIMEDOUT = 110  # Connection timed out
 EINPROGRESS = 115  # Operation now in progress
diff --git a/python-stdlib/errno/manifest.py b/python-stdlib/errno/manifest.py
index a1e1e6c7c..075d3403d 100644
--- a/python-stdlib/errno/manifest.py
+++ b/python-stdlib/errno/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.4")
+metadata(version="0.2.0")
 
 module("errno.py")

From 6e24cffe958df397c38e7b3085c16ae5d051cc92 Mon Sep 17 00:00:00 2001
From: Nick Budak <thatbudakguy@gmail.com>
Date: Wed, 4 Jun 2025 14:41:33 -0700
Subject: [PATCH 337/343] logging: Allow logging.exception helper to handle
 tracebacks.

Although `Logger.exception` supports passing exception info with
`exc_info`, when you use `logging.exception` keyword arguments are not
forwarded to the root logger, which makes passing `exc_info` raise
`TypeError`.

Signed-off-by: Nick Budak <thatbudakguy@gmail.com>
---
 python-stdlib/logging/logging.py  | 4 ++--
 python-stdlib/logging/manifest.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-stdlib/logging/logging.py b/python-stdlib/logging/logging.py
index f4874df7d..551bf7152 100644
--- a/python-stdlib/logging/logging.py
+++ b/python-stdlib/logging/logging.py
@@ -202,8 +202,8 @@ def critical(msg, *args):
     getLogger().critical(msg, *args)
 
 
-def exception(msg, *args):
-    getLogger().exception(msg, *args)
+def exception(msg, *args, exc_info=True):
+    getLogger().exception(msg, *args, exc_info=exc_info)
 
 
 def shutdown():
diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
index d9f0ee886..c2614e9ea 100644
--- a/python-stdlib/logging/manifest.py
+++ b/python-stdlib/logging/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.6.1")
+metadata(version="0.6.2")
 
 module("logging.py")

From 913498ef05a5b9c28a246d8db64e31f7c12a35e8 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 7 May 2025 21:19:43 +1000
Subject: [PATCH 338/343] aioble-l2cap: Raise correct error if l2cap
 disconnects during send.

If BLE disconnects in the middle of a send process, this change makes the
code raise `L2CAPDisconnectedError` rather than `TypeError` due to `_cid`
being `None`.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/bluetooth/aioble-l2cap/manifest.py | 2 +-
 micropython/bluetooth/aioble/aioble/l2cap.py   | 2 +-
 micropython/bluetooth/aioble/manifest.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/micropython/bluetooth/aioble-l2cap/manifest.py b/micropython/bluetooth/aioble-l2cap/manifest.py
index 9150ad547..34a96344e 100644
--- a/micropython/bluetooth/aioble-l2cap/manifest.py
+++ b/micropython/bluetooth/aioble-l2cap/manifest.py
@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 require("aioble-core")
 
diff --git a/micropython/bluetooth/aioble/aioble/l2cap.py b/micropython/bluetooth/aioble/aioble/l2cap.py
index e2d3bd9d4..397b7ceb6 100644
--- a/micropython/bluetooth/aioble/aioble/l2cap.py
+++ b/micropython/bluetooth/aioble/aioble/l2cap.py
@@ -133,7 +133,6 @@ def available(self):
     # Waits until the channel is free and then sends buf.
     # If the buffer is larger than the MTU it will be sent in chunks.
     async def send(self, buf, timeout_ms=None, chunk_size=None):
-        self._assert_connected()
         offset = 0
         chunk_size = min(self.our_mtu * 2, self.peer_mtu, chunk_size or self.peer_mtu)
         mv = memoryview(buf)
@@ -141,6 +140,7 @@ async def send(self, buf, timeout_ms=None, chunk_size=None):
             if self._stalled:
                 await self.flush(timeout_ms)
             # l2cap_send returns True if you can send immediately.
+            self._assert_connected()
             self._stalled = not ble.l2cap_send(
                 self._connection._conn_handle,
                 self._cid,
diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 832200570..1cf06c4d8 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.6.0")
+metadata(version="0.6.1")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.

From f95568da431c6506354adb93343206c04a94dc11 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Wed, 30 Apr 2025 16:54:02 +0300
Subject: [PATCH 339/343] abc: Add ABC base class.

This trivial addition will allow less code differences between standard
Python classes and MicroPython code.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
 python-stdlib/abc/abc.py      | 4 ++++
 python-stdlib/abc/manifest.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/python-stdlib/abc/abc.py b/python-stdlib/abc/abc.py
index 941be4f5e..c2c707f62 100644
--- a/python-stdlib/abc/abc.py
+++ b/python-stdlib/abc/abc.py
@@ -1,2 +1,6 @@
+class ABC:
+    pass
+
+
 def abstractmethod(f):
     return f
diff --git a/python-stdlib/abc/manifest.py b/python-stdlib/abc/manifest.py
index 66495fd75..c76312960 100644
--- a/python-stdlib/abc/manifest.py
+++ b/python-stdlib/abc/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.0.1")
+metadata(version="0.1.0")
 
 module("abc.py")

From b95ca2491aa405199a429fc24e227a32cb6564f8 Mon Sep 17 00:00:00 2001
From: FuNK3Y <fun__key@hotmail.com>
Date: Sat, 19 Jul 2025 12:14:17 +0000
Subject: [PATCH 340/343] aiohttp: Fix partial reads by using readexactly.

Fixes issue #1012.

Signed-off-by: FuNK3Y <fun__key@hotmail.com>
---
 python-ecosys/aiohttp/aiohttp/__init__.py   | 10 ++++++----
 python-ecosys/aiohttp/aiohttp/aiohttp_ws.py | 10 +++++-----
 python-ecosys/aiohttp/manifest.py           |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/python-ecosys/aiohttp/aiohttp/__init__.py b/python-ecosys/aiohttp/aiohttp/__init__.py
index 8c5493f30..1e6d89d05 100644
--- a/python-ecosys/aiohttp/aiohttp/__init__.py
+++ b/python-ecosys/aiohttp/aiohttp/__init__.py
@@ -42,7 +42,9 @@ def _decode(self, data):
         return data
 
     async def read(self, sz=-1):
-        return self._decode(await self.content.read(sz))
+        return self._decode(
+            await (self.content.read(sz) if sz == -1 else self.content.readexactly(sz))
+        )
 
     async def text(self, encoding="utf-8"):
         return (await self.read(int(self._get_header("content-length", -1)))).decode(encoding)
@@ -66,13 +68,13 @@ async def read(self, sz=4 * 1024 * 1024):
             self.chunk_size = int(l, 16)
             if self.chunk_size == 0:
                 # End of message
-                sep = await self.content.read(2)
+                sep = await self.content.readexactly(2)
                 assert sep == b"\r\n"
                 return b""
-        data = await self.content.read(min(sz, self.chunk_size))
+        data = await self.content.readexactly(min(sz, self.chunk_size))
         self.chunk_size -= len(data)
         if self.chunk_size == 0:
-            sep = await self.content.read(2)
+            sep = await self.content.readexactly(2)
             assert sep == b"\r\n"
         return self._decode(data)
 
diff --git a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
index 6e0818c92..53a640fe5 100644
--- a/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
+++ b/python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
@@ -189,7 +189,7 @@ async def close(self):
             await self.send(b"", self.CLOSE)
 
     async def _read_frame(self):
-        header = await self.reader.read(2)
+        header = await self.reader.readexactly(2)
         if len(header) != 2:  # pragma: no cover
             # raise OSError(32, "Websocket connection closed")
             opcode = self.CLOSE
@@ -197,13 +197,13 @@ async def _read_frame(self):
             return opcode, payload
         fin, opcode, has_mask, length = self._parse_frame_header(header)
         if length == 126:  # Magic number, length header is 2 bytes
-            (length,) = struct.unpack("!H", await self.reader.read(2))
+            (length,) = struct.unpack("!H", await self.reader.readexactly(2))
         elif length == 127:  # Magic number, length header is 8 bytes
-            (length,) = struct.unpack("!Q", await self.reader.read(8))
+            (length,) = struct.unpack("!Q", await self.reader.readexactly(8))
 
         if has_mask:  # pragma: no cover
-            mask = await self.reader.read(4)
-        payload = await self.reader.read(length)
+            mask = await self.reader.readexactly(4)
+        payload = await self.reader.readexactly(length)
         if has_mask:  # pragma: no cover
             payload = bytes(x ^ mask[i % 4] for i, x in enumerate(payload))
         return opcode, payload
diff --git a/python-ecosys/aiohttp/manifest.py b/python-ecosys/aiohttp/manifest.py
index d22a6ce11..bbf22bb29 100644
--- a/python-ecosys/aiohttp/manifest.py
+++ b/python-ecosys/aiohttp/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="HTTP client module for MicroPython asyncio module",
-    version="0.0.5",
+    version="0.0.6",
     pypi="aiohttp",
 )
 

From 34c4ee1647ac4b177ae40adf0ec514660e433dc0 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 17 Jun 2025 15:04:39 +1000
Subject: [PATCH 341/343] aiorepl: Handle stream shutdown.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
---
 micropython/aiorepl/aiorepl.py  | 2 ++
 micropython/aiorepl/manifest.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/micropython/aiorepl/aiorepl.py b/micropython/aiorepl/aiorepl.py
index a640efcd1..fbe513b7c 100644
--- a/micropython/aiorepl/aiorepl.py
+++ b/micropython/aiorepl/aiorepl.py
@@ -114,6 +114,8 @@ async def task(g=None, prompt="--> "):
             curs = 0  # cursor offset from end of cmd buffer
             while True:
                 b = await s.read(1)
+                if not b:  # Handle EOF/empty read
+                    break
                 pc = c  # save previous character
                 c = ord(b)
                 pt = t  # save previous time
diff --git a/micropython/aiorepl/manifest.py b/micropython/aiorepl/manifest.py
index ca2fa1513..83802e1c0 100644
--- a/micropython/aiorepl/manifest.py
+++ b/micropython/aiorepl/manifest.py
@@ -1,5 +1,5 @@
 metadata(
-    version="0.2.1",
+    version="0.2.2",
     description="Provides an asynchronous REPL that can run concurrently with an asyncio, also allowing await expressions.",
 )
 

From ea763cad8d5ee095361da75bed945af5ab858449 Mon Sep 17 00:00:00 2001
From: Hyx <hyx0329@outlook.com>
Date: Fri, 1 Aug 2025 12:47:43 +0800
Subject: [PATCH 342/343] usb-device: Raise RuntimeError when DCD error occurs.

So the behavior matches the comment.

Signed-off-by: Hyx <hyx0329@outlook.com>
---
 micropython/usb/usb-device/manifest.py        | 2 +-
 micropython/usb/usb-device/usb/device/core.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/micropython/usb/usb-device/manifest.py b/micropython/usb/usb-device/manifest.py
index 025e67547..fa0d8a3f5 100644
--- a/micropython/usb/usb-device/manifest.py
+++ b/micropython/usb/usb-device/manifest.py
@@ -1,2 +1,2 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 package("usb")
diff --git a/micropython/usb/usb-device/usb/device/core.py b/micropython/usb/usb-device/usb/device/core.py
index 7be09ee46..b0d91d8ff 100644
--- a/micropython/usb/usb-device/usb/device/core.py
+++ b/micropython/usb/usb-device/usb/device/core.py
@@ -600,7 +600,8 @@ def submit_xfer(self, ep_addr, data, done_cb=None):
         # function has returned to the caller.
         if not self._open:
             raise RuntimeError("Not open")
-        _dev._submit_xfer(ep_addr, data, done_cb)
+        if not _dev._submit_xfer(ep_addr, data, done_cb):
+            raise RuntimeError("DCD error")
 
     def stall(self, ep_addr, *args):
         # Set or get the endpoint STALL state.

From bdc4706cc700ae1c0a4520e252897bb0e03c327b Mon Sep 17 00:00:00 2001
From: Hyx <hyx0329@outlook.com>
Date: Fri, 1 Aug 2025 12:53:01 +0800
Subject: [PATCH 343/343] usb-device-hid: Return True after submit_xfer.

This tells the caller that no error has occurred. The child classes can
use this state to do double buffering correctly.

If any fundamental error occurs in submit_xfer, the underlying code will
raise an exception.

Signed-off-by: Hyx <hyx0329@outlook.com>
---
 micropython/usb/usb-device-hid/manifest.py       | 2 +-
 micropython/usb/usb-device-hid/usb/device/hid.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/micropython/usb/usb-device-hid/manifest.py b/micropython/usb/usb-device-hid/manifest.py
index af9b8cb84..4520325e3 100644
--- a/micropython/usb/usb-device-hid/manifest.py
+++ b/micropython/usb/usb-device-hid/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0")
+metadata(version="0.1.1")
 require("usb-device")
 package("usb")
diff --git a/micropython/usb/usb-device-hid/usb/device/hid.py b/micropython/usb/usb-device-hid/usb/device/hid.py
index 9e4c70dde..1c1c9ac6b 100644
--- a/micropython/usb/usb-device-hid/usb/device/hid.py
+++ b/micropython/usb/usb-device-hid/usb/device/hid.py
@@ -123,6 +123,7 @@ def send_report(self, report_data, timeout_ms=100):
         if not self.is_open():
             return False
         self.submit_xfer(self._int_ep, report_data)
+        return True
 
     def desc_cfg(self, desc, itf_num, ep_num, strs):
         # Add the standard interface descriptor
