8000 unix-ffi: Move more unix-only packages to unix-ffi. · micropython/micropython-lib@4130ab6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4130ab6

Browse files
jimmojimmo
committed
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 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=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>
1 parent 3299cb8 commit 4130ab6

Some content is hidden

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

82 files changed

+122
-104
lines changed

‎python-stdlib/base64/base64.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def b64decode(s, altchars=None, validate=False):
9696
altchars = _bytes_from_decode_data(altchars)
9797
assert len(altchars) == 2, repr(altchars)
9898
s = s.translate(bytes.maketrans(altchars, b"+/"))
99-
if validate and not re.match(b"^[A-Za-z0-9+/]*={0,2}$", s):
99+
if validate and not re.match(b"^[A-Za-z0-9+/]*=*$", s):
100100
raise binascii.Error("Non-base64 digit found")
101101
return binascii.a2b_base64(s)
102102

‎python-stdlib/base64/manifest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# base64
22

33
require("binascii")
4-
require("re-pcre")
54
require("struct")
65

76
module("base64.py", version="3.3.3-4")

‎python-stdlib/email.feedparser/manifest.py

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

‎python-stdlib/email.header/manifest.py

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

‎python-stdlib/email.message/manifest.py

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

‎python-stdlib/email.parser/manifest.py

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

‎python-stdlib/glob/manifest.py

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

‎python-stdlib/html.parser/manifest.py

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

‎python-stdlib/http.client/manifest.py

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

‎python-stdlib/os.path/manifest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22

33
# Originally written by Paul Sokolovsky.
44

5+
require("os")
6+
57
package("os", version="0.1.3")

‎python-stdlib/uu/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# uu
22

33
require("binascii")
4-
require("os")
4+
require("os.path")
55

66
module("uu.py", version="0.5.1")

‎unix-ffi/README.md

Lines changed: 16 additions & 3 deletions

‎python-stdlib/_markupbase/_markupbase.py renamed to ‎unix-ffi/_markupbase/_markupbase.py

File renamed without changes.

‎python-stdlib/_markupbase/manifest.py renamed to ‎unix-ffi/_markupbase/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# _markupbase
22

3-
require("re-pcre")
3+
require("re", unix=True)
44

55
module("_markupbase.py", version="3.3.3-1")

‎python-stdlib/argparse/argparse.py renamed to ‎unix-ffi/argparse/argparse.py

File renamed without changes.

‎python-stdlib/argparse/manifest.py renamed to ‎unix-ffi/argparse/manifest.py

File renamed without changes.

‎python-stdlib/argparse/test_argparse.py renamed to ‎unix-ffi/argparse/test_argparse.py

File renamed without changes.

‎python-stdlib/cgi/cgi.py renamed to ‎unix-ffi/cgi/cgi.py

File renamed without changes.

‎python-stdlib/cgi/manifest.py renamed to ‎unix-ffi/cgi/manifest.py

File renamed without changes.

‎python-stdlib/email.charset/email/charset.py renamed to ‎unix-ffi/email.charset/email/charset.py

File renamed without changes.

‎python-stdlib/email.charset/manifest.py renamed to ‎unix-ffi/email.charset/manifest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# email.charset
22

33
require("functools")
4-
require("email.encoders")
5-
require("email.errors")
4+
require("email.encoders", unix=True)
5+
require("email.errors", unix=True)
66

77
package("email", version="0.5.1")

‎python-stdlib/email.encoders/email/base64mime.py renamed to ‎unix-ffi/email.encoders/email/base64mime.py

File renamed without changes.

‎python-stdlib/email.encoders/email/encoders.py renamed to ‎unix-ffi/email.encoders/email/encoders.py

File renamed without changes.

‎python-stdlib/email.encoders/email/quoprimime.py renamed to ‎unix-ffi/email.encoders/email/quoprimime.py

File renamed without changes.

‎python-stdlib/email.encoders/manifest.py renamed to ‎unix-ffi/email.encoders/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require("base64")
44
require("binascii")
55
require("quopri")
6-
require("re-pcre")
6+
require("re", unix=True)
77
require("string")
88

99
package("email", version="0.5.1")

‎python-stdlib/email.errors/email/errors.py renamed to ‎unix-ffi/email.errors/email/errors.py

File renamed without changes.

‎python-stdlib/email.errors/manifest.py renamed to ‎unix-ffi/email.errors/manifest.py

File renamed without changes.

‎python-stdlib/email.feedparser/email/feedparser.py renamed to ‎unix-ffi/email.feedparser/email/feedparser.py

File renamed without changes.

‎unix-ffi/email.feedparser/manifest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# email.feedparser
2+
3+
require("re", unix=True)
4+
require("email.errors", unix=True)
5+
require("email.message", unix=True)
6+
require("email.internal", unix=True)
7+
8+
package("email", version="0.5.1")

‎python-stdlib/email.header/email/header.py renamed to ‎unix-ffi/email.header/email/header.py

File renamed without changes.

‎unix-ffi/email.header/manifest.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# email.header
2+
3+
require("re", unix=True)
4+
require("binascii")
5+
require("email.encoders", unix=True)
6+
require("email.errors", unix=True)
7+
require("email.charset", unix=True)
8+
9+
package("email", version="0.5.2")

‎python-stdlib/email.internal/email/_encoded_words.py renamed to ‎unix-ffi/email.internal/email/_encoded_words.py

File renamed without changes.

‎python-stdlib/email.internal/email/_parseaddr.py renamed to ‎unix-ffi/email.internal/email/_parseaddr.py

File renamed without changes.

‎python-stdlib/email.internal/email/_policybase.py renamed to ‎unix-ffi/email.internal/email/_policybase.py

File renamed without changes.

‎python-stdlib/email.internal/manifest.py renamed to ‎unix-ffi/email.internal/manifest.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# email.internal
22

3-
require("re-pcre")
3+
require("re", unix=True)
44
require("base64")
55
require("binascii")
66
require("functools")
77
require("string")
88
# require("calendar") TODO
99
require("abc")
10-
require("email.errors")
11-
require("email.header")
12-
require("email.charset")
13-
require("email.utils")
10+
require("email.errors", unix=True)
11+
require("email.header", unix=True)
12+
require("email.charset", unix=True)
13+
require("email.utils", unix=True)
1414

1515
package("email", version="0.5.1")

‎python-stdlib/email.message/email/iterators.py renamed to ‎unix-ffi/email.message/email/iterators.py

File renamed without changes.

‎python-stdlib/email.message/email/message.py renamed to ‎unix-ffi/email.message/email/message.py

File renamed without changes.

‎unix-ffi/email.message/manifest.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# email.message
2+
3+
require("re", unix=True)
4+
require("uu")
5+
require("base64")
6+
require("binascii")
7+
require("email.utils", unix=True)
8+
require("email.errors", unix=True)
9+
require("email.charset", unix=True)
10+
11+
package("email", version="0.5.3")

‎python-stdlib/email.parser/email/parser.py renamed to ‎unix-ffi/email.parser/email/parser.py

File renamed without changes.

‎unix-ffi/email.parser/manifest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# email.parser
2+
3+
require("warnings")
4+
require("email.feedparser", unix=True)
5+
require("email.message", unix=True)
6+
require("email.internal", unix=True)
7+
8+
package("email", version="0.5.1")

‎python-stdlib/email.utils/email/utils.py renamed to ‎unix-ffi/email.utils/email/utils.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,10 @@ def make_msgid(idstring=None, domain=None):
215215
"""
216216
timeval = time.time()
217217
utcdate = time.strftime("%Y%m%d%H%M%S", time.gmtime(timeval))
218-
pid = os.getpid()
218+
if hasattr(os, 'getpid'):
219+
pid = os.getpid()
220+
else:
221+
pid = 0
219222
randint = random.randrange(100000)
220223
if idstring is None:
221224
idstring = ""

‎python-stdlib/email.utils/manifest.py renamed to ‎unix-ffi/email.utils/manifest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# email.utils
22

3-
require("os")
4-
require("re-pcre")
3+
require("os", unix=True)
4+
require("re", unix=True)
55
require("base64")
66
require("random")
77
require("datetime")
8-
require("urllib.parse")
8+
require("urllib.parse", unix=True)
99
require("warnings")
1010
require("quopri")
11-
require("email.charset")
11+
require("email.charset", unix=True)
1212

1313
package("email", version="3.3.3-2")

‎unix-ffi/fcntl/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66

77
module("fcntl.py", version="0.0.4")

‎python-stdlib/getopt/getopt.py renamed to ‎unix-ffi/getopt/getopt.py

File renamed without changes.

‎python-stdlib/getopt/manifest.py renamed to ‎unix-ffi/getopt/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# getopt
22

3-
require("os")
3+
require("os", unix=True)
44

55
module("getopt.py", version="3.3.3-1")

‎unix-ffi/gettext/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# Originally written by Riccardo Magliocchetti.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66

77
module("gettext.py", version="0.1")

‎python-stdlib/glob/glob.py renamed to ‎unix-ffi/glob/glob.py

File renamed without changes.

‎unix-ffi/glob/manifest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# glob
2+
3+
require("os", unix=True)
4+
require("os.path")
5+
require("re", unix=True)
6+
require("fnmatch")
7+
8+
module("glob.py", version="0.5.2")

‎python-stdlib/glob/test_glob.py renamed to ‎unix-ffi/glob/test_glob.py

File renamed without changes.

‎python-stdlib/html.entities/html/entities.py renamed to ‎unix-ffi/html.entities/html/entities.py

File renamed without changes.

‎python-stdlib/html.entities/manifest.py renamed to ‎unix-ffi/html.entities/manifest.py

File renamed without changes.

‎python-stdlib/html.parser/html/parser.py renamed to ‎unix-ffi/html.parser/html/parser.py

File renamed without changes.

‎unix-ffi/html.parser/manifest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# html.parser
2+
3+
require("_markupbase", unix=True)
4+
require("warnings")
5+
require("html.entities", unix=True)
6+
require("re", unix=True)
7+
8+
package("html", version="3.3.3-2")

‎python-stdlib/http.client/example_client.py renamed to ‎unix-ffi/http.client/example_client.py

File renamed without changes.

‎python-stdlib/http.client/http/client.py renamed to ‎unix-ffi/http.client/http/client.py

File renamed without changes.

‎unix-ffi/http.client/manifest.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# http.client
2+
3+
require("email.parser", unix=True)
4+
require("email.message", unix=True)
5+
require("socket", unix=True)
6+
require("collections")
7+
require("urllib.parse", unix=True)
8+
require("warnings")
9+
10+
package("http", version="0.5.1")

‎unix-ffi/machine/manifest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("ffilib")
6-
require("os")
7-
require("signal")
5+
require("ffilib", unix=True)
6+
require("os", unix=True)
7+
require("signal", unix=True)
88

99
package("machine", version="0.2.1")

‎unix-ffi/multiprocessing/manifest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("os")
6-
require("select")
5+
require("os", unix=True)
6+
require("select", unix=True)
77
require("pickle")
88

99
module("multiprocessing.py", version="0.1.2")

‎unix-ffi/os/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66
require("errno")
77
require("stat")
88

‎unix-ffi/pwd/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# Originally written by Riccardo Magliocchetti.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66

77
module("pwd.py", version="0.1")

‎unix-ffi/re-pcre/manifest.py renamed to ‎unix-ffi/re/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66

77
module("re.py", version="0.2.5")

‎unix-ffi/re-pcre/re.py renamed to ‎unix-ffi/re/re.py

File renamed without changes.

‎unix-ffi/re-pcre/test_re.py renamed to ‎unix-ffi/re/test_re.py

File renamed without changes.

‎unix-ffi/select/manifest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("os")
6-
require("ffilib")
5+
require("os", unix=True)
6+
require("ffilib", unix=True)
77

88
module("select.py", version="0.3")

‎unix-ffi/signal/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66

77
module("signal.py", version="0.3.2")

‎python-stdlib/socket/manifest.py renamed to ‎unix-ffi/socket/manifest.py

File renamed without changes.

‎python-stdlib/socket/socket.py renamed to ‎unix-ffi/socket/socket.py

File renamed without changes.

‎unix-ffi/sqlite3/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# Originally written by Paul Sokolovsky.
44

5-
require("ffilib")
5+
require("ffilib", unix=True)
66

77
module("sqlite3.py", version="0.2.4")

‎micropython/test.support/manifest.py renamed to ‎unix-ffi/test.support/manifest.py

File renamed without changes.

‎micropython/test.support/test/support.py renamed to ‎unix-ffi/test.support/test/support.py

File renamed without changes.

‎unix-ffi/time/manifest.py

Lines changed: 1 addition & 1 deletion
AFEA
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# time
22

3-
require("ffilib")
3+
require("ffilib", unix=True)
44

55
module("time.py", version="0.5")

‎python-stdlib/timeit/manifest.py renamed to ‎unix-ffi/timeit/manifest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# timeit
22

3-
require("getopt")
3+
require("getopt", unix=True)
44
require("itertools")
55
# require("linecache") TODO
6-
require("time")
6+
require("time", unix=True)
77
require("traceback")
88

99
module("timeit.py", version="3.3.3-3")

‎python-stdlib/timeit/timeit.py renamed to ‎unix-ffi/timeit/timeit.py

File renamed without changes.

0 commit comments

Comments
 (0)
0