Merge 'pycopy/master' into main

Author: smurfix

_boot/_boot.py

@@ -8,12 +8,20 @@ def vars(obj):
 def getrecursionlimit():
     return 100
 
+class Warning(Exception):
+    pass
+class RuntimeWarning(Warning):
+    pass
+
 
 def _setup():
     import builtins
 
     builtins.vars = vars
     builtins.FileNotFoundError = OSError
+    builtins.IOError = OSError
+    builtins.Warning = Warning
+    builtins.RuntimeWarning = RuntimeWarning
 
     from micropython import writable_ns
     import sys
@@ -23,10 +31,10 @@ def _setup():
 
     PATCHES = {
         str: (
-            string, ("encode", "expandtabs", "isidentifier", "ljust", "translate"),
+            string, ("capitalize", "encode", "expandtabs", "isalnum", "isidentifier", "ljust", "translate"),
         ),
         bytes: (
-            byteslib, ("fromhex", "hex"),
+            byteslib, ("decode", "fromhex", "hex"),
         ),
         set: (
             setlib, ("update", "union", "intersection_update", "intersection", "difference_update", "difference"),
@@ -44,6 +52,8 @@ def _setup():
     # to sys.stdout and friends. So, patch the module namespace directly.
     writable_ns(sys, True)
     sys.getrecursionlimit = getrecursionlimit
+    sys.executable = "pycopy-dev"
+    sys.warnoptions = []
     writable_ns(sys, False)
 
 

_boot/metadata.txt

@@ -1,6 +1,6 @@
 srctype = pycopy-lib
 type = module
-version = 0.4
+version = 0.4.5
 author = Paul Sokolovsky
 desc = Bootstrapping module for pycopy-dev for CPython compatibility
 dist_name = boot

argparse/argparse.py

@@ -161,25 +161,26 @@ def error(self, msg):
         sys.stderr.write("error: %s\n" % msg)
         sys.exit(2)
 
-    def parse_args(self, args=None):
-        return self._parse_args_impl(args, False)
+    def parse_args(self, args=None, namespace=None):
+        return self._parse_args_impl(args, namespace, False)
 
-    def parse_known_args(self, args=None):
-        return self._parse_args_impl(args, True)
+    def parse_known_args(self, args=None, namespace=None):
+        return self._parse_args_impl(args, namespace, True)
 
-    def _parse_args_impl(self, args, return_unknown):
+    def _parse_args_impl(self, args, namespace, return_unknown):
         if args is None:
             args = sys.argv[1:]
         else:
             args = args[:]
+        if namespace is None:
+            namespace = Namespace()
         try:
-            return self._parse_args(args, return_unknown)
+            return self._parse_args(args, namespace, return_unknown)
         except _ArgError as e:
             self.usage(False)
             self.error(str(e))
 
-    def _parse_args(self, args, return_unknown):
-        argholder = Namespace()
+    def _parse_args(self, args, argholder, return_unknown):
         # add optional args with defaults
         for opt in self.opt:
             setattr(argholder, opt.dest, opt.default)

argparse/metadata.txt

@@ -1,4 +1,4 @@
 srctype = pycopy-lib
 type = module
-version = 0.5.2
+version = 0.5.3
 author = Damien George, Paul Sokolovsky

byteslib/byteslib.py

@@ -30,6 +30,14 @@
 import ubinascii
 
 
+# In case it's overriden later
+_org_decode = bytes.decode
+def decode(b, encoding="utf-8", errors="strict"):
+    assert encoding in ("utf-8", "ascii", "us-ascii"), "Unsupported encoding: %s" % encoding
+    assert errors in ("strict", "surrogateescape", "surrogatepass"), "Unsupported errors param: %s" % errors
+    return _org_decode(b, encoding, errors)
+
+
 def hex(s):
     s = ubinascii.hexlify(s)
     return pycopy.icast(s, str)

byteslib/metadata.txt

@@ -1,5 +1,5 @@
 srctype = pycopy-lib
 type = module
-version = 0.1.1
+version = 0.1.2
 author = Paul Sokolovsky
 long_desc = Additional bytes methods (for CPython compatibility) represented as functions.

byteslib/test_byteslib.py

@@ -29,5 +29,7 @@
 import byteslib
 
 
-byteslib.hex(b"\xab\xcd") == "abcd"
-byteslib.fromhex("abcd") == b"\xab\xcd"
+assert byteslib.hex(b"\xab\xcd") == "abcd"
+assert byteslib.fromhex("abcd") == b"\xab\xcd"
+assert byteslib.decode(b"1234") == "1234"
+assert byteslib.decode(b"1234", "ascii", "strict") == "1234"

collections.chainmap/collections/chainmap.py

@@ -0,0 +1,27 @@
+class ChainMap:
+
+    def __init__(self, *maps):
+        if maps:
+            self.maps = list(maps)
+        else:
+            self.maps = [{}]
+
+    def __getitem__(self, k):
+        for m in self.maps:
+            if k in m:
+                return m[k]
+        raise KeyError(k)
+
+    def __setitem__(self, k, v):
+        self.maps[0][k] = v
+
+    def __delitem__(self, k):
+        del self.maps[0][k]
+
+    def items(self):
+        seen = set()
+        for m in self.maps:
+            for k, v in m.items():
+                if k not in seen:
+                    yield k, v
+                    seen.add(k)

collections.chainmap/metadata.txt

@@ -0,0 +1,3 @@
+srctype = pycopy-lib
+type = package
+version = 0.1.1

collections.chainmap/test_chainmap.py

@@ -0,0 +1,17 @@
+from collections.chainmap import ChainMap
+
+
+cm = ChainMap({"k1": "v11", "k2": "v2"}, {"k1": "v12", "k3": "v3"})
+assert cm["k1"] == "v11"
+assert cm["k2"] == "v2"
+assert cm["k3"] == "v3"
+
+items = sorted(list(cm.items()))
+assert items == [('k1', 'v11'), ('k2', 'v2'), ('k3', 'v3')]
+
+del cm["k1"]
+assert cm["k1"] == "v12"
+cm["k1"] = "newv"
+assert cm["k1"] == "newv"
+del cm["k1"]
+assert cm["k1"] == "v12"