micropython · dpgeorge · Jul 23, 2023 · Jul 21, 2023 · Jul 21, 2023
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/micropython/utarfile-write/manifest.py b/micropython/utarfile-write/manifest.py
diff --git a/python-ecosys/requests/README.md 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 → python-ecosys/requests/example_xively.py b/python-ecosys/urequests/example_xively.py → 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
@@ -0,0 +1,3 @@
+metadata(version="0.8.0", pypi="requests")
+
+package("requests")
diff --git a/python-ecosys/urequests/urequests.py → python-ecosys/requests/requests/__init__.py b/python-ecosys/urequests/urequests.py → python-ecosys/requests/requests/__init__.py
diff --git a/python-ecosys/urequests/manifest.py b/python-ecosys/urequests/manifest.py
diff --git a/micropython/utarfile-write/example-append.py → ...on-stdlib/tarfile-write/example-append.py b/micropython/utarfile-write/example-append.py → ...on-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 → ...on-stdlib/tarfile-write/example-create.py b/micropython/utarfile-write/example-create.py → ...on-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
@@ -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 → python-stdlib/tarfile-write/tarfile/write.py b/micropython/utarfile-write/utarfile/write.py → 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 → python-stdlib/tarfile/example-extract.py b/micropython/utarfile/example-extract.py → 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 → python-stdlib/tarfile/manifest.py b/micropython/utarfile/manifest.py → 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 → python-stdlib/tarfile/tarfile/__init__.py b/micropython/utarfile/utarfile/__init__.py → 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:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		metadata(version="0.8.0", pypi="requests")

		package("requests")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		# Originally written by Paul Sokolovsky.

		package("utarfile")
		package("tarfile")