Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't proxy special methods to model in ProxyModel.__getattr__ #108

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Don't proxy special methods to model in ProxyModel.__getattr__ #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee514e6
Don't proxy special methods to model in ProxyModel.__getattr__
optiz0r Oct 19, 2024
66bea0c
Fix black warning (alerts in 22.3.0 used by GHA, not in 24.10.0)
optiz0r Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion queryset_sequence/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,11 @@ def __init__(self, model=None):
self.DoesNotExist = ObjectDoesNotExist

def __getattr__(self, name):
return getattr(self._model, name)
if name == "_meta":
return getattr(self._model, name)
if hasattr(super(), "__getattr__"):
return super().__getattr__(name)
raise AttributeError(name)
Comment on lines 495 to +500
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So with this change the only thing being proxied is _meta. Would it make more sense to define only that?

@property
def _meta(self):
    return getattr(self._model, "_meta")



class QuerySetSequence:
Expand Down
34 changes: 34 additions & 0 deletions tests/test_proxymodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
from django.core.exceptions import ObjectDoesNotExist
from django.test import TestCase

from queryset_sequence import ProxyModel
from tests.models import Article


class TestProxyModel(TestCase):
"""Tests calls to proxy model are handled as expected"""

def test_no_model_doesnotexist(self):
"""When no model is defined, generic ObjectDoesNotExist exception is returned"""
proxy = ProxyModel(model=None)
self.assertIs(proxy.DoesNotExist, ObjectDoesNotExist)

def test_model_doesnotexist(self):
"""When a model is defined, model-specific DoesNotExist exception is returned"""
proxy = ProxyModel(model=Article)
self.assertIs(proxy.DoesNotExist, Article.DoesNotExist)

def test_model_meta(self):
"""When a model is defined, model._meta is accessible"""
proxy = ProxyModel(model=Article)
self.assertEqual(proxy._meta.model_name, "article")

def test_no_model_meta(self):
"""When a model is not defined, accessing model meta should fail"""
proxy = ProxyModel(model=None)
self.assertRaises(AttributeError, lambda: proxy._meta)

def test_model_special_methods_are_not_proxied(self):
"""When a model is defined, special methods are not proxied to the model"""
proxy = ProxyModel(model=Article)
self.assertIsNot(proxy.__str__, Article.__str__)
Loading