Give all ModelMetaclass classes a `meta` attribute. · 7dracoder/python-spanner-orm@c9897d0 · GitHub

7dracoder / python-spanner-orm Public

forked from google/python-spanner-orm

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit c9897d0

Browse filesBrowse the repository at this point in the historyBrowse files

dseomn

committed

Give all ModelMetaclass classes a meta attribute.

This fixes bugs where pytype got the type for `meta` wrong because it only existed on some classes. I'm not 100% sure adding a default (empty) metadata to classes that didn't previously have it makes sense, but tests pass and it seems likely to be safe to me. This change also has the side effect of parsing Model-specific attributes from the Model class itself (as opposed to just subclasses of Model), but it doesn't look like Model has any attributes that would be affected. Addresses google#93. Tested: Ran tests and pytype.

1 parent 60b334e commit c9897d0
Copy full SHA for c9897d0

2 files changed

+1-5Lines changed: 1 addition & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• spanner_orm
  • model.py
  • tests
    • metadata_test.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎spanner_orm/model.py‎

Copy file name to clipboardExpand all lines: spanner_orm/model.py

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -35,11 +35,10 @@
35	35
36	36	class ModelMetaclass(type):
37	37	"""Populates ModelMetadata based on class attributes."""
	38	+ meta: metadata.ModelMetadata
38	39
39	40	def __new__(mcs, name: str, bases: Any, attrs: Dict[str, Any], **kwargs: Any):
40	41	parents = [base for base in bases if isinstance(base, ModelMetaclass)]
41		- if not parents:
42		- return super().__new__(mcs, name, bases, attrs, **kwargs)
43	42
44	43	model_metadata = metadata.ModelMetadata()
45	44	for parent in parents:

Collapse file

‎spanner_orm/tests/metadata_test.py‎

Copy file name to clipboardExpand all lines: spanner_orm/tests/metadata_test.py

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -13,9 +13,6 @@
13	13	# See the License for the specific language governing permissions and
14	14	# limitations under the License.
15	15
16		- # TODO(#93): Remove pytype disable below.
17		- # type: ignore
18		-
19	16	import logging
20	17	import unittest
21	18

0 commit comments

Comments

0 (0)