omlish 0.0.0.dev63__py3-none-any.whl → 0.0.0.dev64__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev63'
-__revision__ = '6de2b8280b36325b4e4b319adfe01b6a284bbdcc'
+__version__ = '0.0.0.dev64'
+__revision__ = '65b4d26bc20b482253b288f29eebe58b9ae531dd'
 
 
 #
@@ -92,7 +92,7 @@ class Project(ProjectBase):
             # 'psycopg ~= 3.2',
 
             'pymysql ~= 1.1',
-            # 'mysql-connector-python ~= 9.0',
+            # 'mysql-connector-python ~= 9.1',
             # 'mysqlclient ~= 2.2',
 
             'aiomysql ~= 0.2',

omlish/lang/classes/simple.py

@@ -14,6 +14,17 @@ V = ta.TypeVar('V')
 ##
 
 
+class SimpleMetaDict(dict):
+    def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
+        for k, v in m.items():
+            self[k] = v
+        for k, v in kwargs.items():  # type: ignore
+            self[k] = v
+
+
+##
+
+
 class _NamespaceMeta(abc.ABCMeta):
     def __new__(mcls, name, bases, namespace):
         if bases:
@@ -23,9 +34,14 @@ class _NamespaceMeta(abc.ABCMeta):
         return super().__new__(mcls, name, bases, namespace)
 
     def __iter__(cls) -> ta.Iterator[tuple[str, ta.Any]]:
-        for a in dir(cls):
-            if not a.startswith('_'):
-                yield (a, getattr(cls, a))
+        seen: set[str] = set()
+        for bcls in reversed(cls.__mro__):
+            for a in bcls.__dict__:
+                if a in seen:
+                    continue
+                seen.add(a)
+                if not a.startswith('_'):
+                    yield (a, getattr(cls, a))
 
     def __getitem__(cls, n: str) -> ta.Any:
         return getattr(cls, n)
@@ -75,17 +91,6 @@ class Marker(NotInstantiable, metaclass=_MarkerMeta):
 ##
 
 
-class SimpleMetaDict(dict):
-    def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
-        for k, v in m.items():
-            self[k] = v
-        for k, v in kwargs.items():  # type: ignore
-            self[k] = v
-
-
-##
-
-
 _SINGLETON_INSTANCE_ATTR = '__singleton_instance__'
 _SINGLETON_LOCK = threading.RLock()
 

{omlish-0.0.0.dev63.dist-info → omlish-0.0.0.dev64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev63
+Version: 0.0.0.dev64
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev63.dist-info → omlish-0.0.0.dev64.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=jvyoQ7x8UJ9lpRgkh7eElwJ8qnzyG5aUGameT9Yk8GM,1419
-omlish/__about__.py,sha256=qlJrMz3s8VM_C0-4usZE5Jgx7f83IqPBmrc1ird0yoY,3420
+omlish/__about__.py,sha256=GXVeIGR5dUduDtgf1PYJSdJKJyBBSxbzWMxY1GQOHN8,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=XLrLFCLNY1RfbiXIAELkzHK-vUPum_9dyylEdJi9Pog,7068
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -258,7 +258,7 @@ omlish/lang/typing.py,sha256=lJ2NGe4Pmb61I0Tx4A_rOqXNFTws1XHOzafg2knRUio,4155
 omlish/lang/classes/__init__.py,sha256=h9QXrvAKD17_pIog0uF-7BCqZbSpJZYxL7kzVzvljp0,583
 omlish/lang/classes/abstract.py,sha256=IRnjuLLNwpxvEJsp8fwoQdCIpw0MDAd0TiQfoDMgsn4,2306
 omlish/lang/classes/restrict.py,sha256=pSK7ZT_kpwqS6lWRrxwuEe-tt07F0-uZVazgGh-HDco,3921
-omlish/lang/classes/simple.py,sha256=roGxmtl5BAXl6_WAt89Hfd1Xmu-Cvnwo-YCZgs1Wq-s,3116
+omlish/lang/classes/simple.py,sha256=XQ8b86WvQA0qtSYqlbMOJS7tHgE8sv9onda33uQmbkM,3294
 omlish/lang/classes/virtual.py,sha256=W-QJuKsDehOcrydwg6eMN0bFPTYbk3Tz84TSH3blb44,3367
 omlish/lifecycles/__init__.py,sha256=1FjYceXs-4fc-S-C9zFYmc2axHs4znnQHcJVHdY7a6E,578
 omlish/lifecycles/abstract.py,sha256=70CQyZy-c9a2o0ZJxPeUT7eYjWZTBrp2HpUBnrHdAOM,1109
@@ -408,9 +408,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev63.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev63.dist-info/METADATA,sha256=3QDOoC7dBsLktT4vePuK9dx8FjSwpxlZnE27yP_qQ8c,4167
-omlish-0.0.0.dev63.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev63.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev63.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev63.dist-info/RECORD,,
+omlish-0.0.0.dev64.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev64.dist-info/METADATA,sha256=fd-7ozSHicCgpU4SOmqEUW7WJAsroSMO531X7vxMDVo,4167
+omlish-0.0.0.dev64.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev64.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev64.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev64.dist-info/RECORD,,