django-multisite2 2.0.0__tar.gz → 2.0.1__tar.gz

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/.github/workflows/build.yml

@@ -68,7 +68,8 @@ jobs:
         env:
           DJANGO: ${{ matrix.django-version }}
 
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4.0.1
         with:
-          name: Python ${{ matrix.python-version }}
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: erikvw/django-multisite2

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/CHANGES

@@ -2,6 +2,12 @@
 Release Notes
 =============
 
+2.0.1
+-----
+- change from ValueError to multisite specific exceptions
+  when getting default SITE_ID in development mode.
+- add typing hints
+
 2.0.0
 -----
  - major refactor, drop support for lower than py 3.11 and DJ4.2

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-multisite2
-Version: 2.0.0
+Version: 2.0.1
 Summary: Serve multiple sites from a single Django application
 Home-page: http://github.com/erikvw/django-multisite
 Author: Leonid S Shestera
@@ -25,7 +25,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: tldextract
 
- |actions| |codecov| |downloads| |maintainability| |black|
+|pypi| |actions| |codecov| |downloads| |maintainability| |black|
 
 
 
@@ -46,7 +46,7 @@ Install with pip:
 
 .. code-block::
 
-    pip install django-multisite2 (no release yet)
+    pip install django-multisite2
 
 
 Replace your ``SITE_ID`` in ``settings.py`` to:
@@ -129,6 +129,9 @@ settings.py::
 
 Templates
 ---------
+
+This feature has been removed in version 2.0.0.
+
 If required, create template subdirectories for domain level templates (in a
 location specified in settings.TEMPLATES['DIRS'].
 

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/README.rst

@@ -1,4 +1,4 @@
- |actions| |codecov| |downloads| |maintainability| |black|
+|pypi| |actions| |codecov| |downloads| |maintainability| |black|
 
 
 
@@ -19,7 +19,7 @@ Install with pip:
 
 .. code-block::
 
-    pip install django-multisite2 (no release yet)
+    pip install django-multisite2
 
 
 Replace your ``SITE_ID`` in ``settings.py`` to:
@@ -102,6 +102,9 @@ settings.py::
 
 Templates
 ---------
+
+This feature has been removed in version 2.0.0.
+
 If required, create template subdirectories for domain level templates (in a
 location specified in settings.TEMPLATES['DIRS'].
 

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/django_multisite2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-multisite2
-Version: 2.0.0
+Version: 2.0.1
 Summary: Serve multiple sites from a single Django application
 Home-page: http://github.com/erikvw/django-multisite
 Author: Leonid S Shestera
@@ -25,7 +25,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: tldextract
 
- |actions| |codecov| |downloads| |maintainability| |black|
+|pypi| |actions| |codecov| |downloads| |maintainability| |black|
 
 
 
@@ -46,7 +46,7 @@ Install with pip:
 
 .. code-block::
 
-    pip install django-multisite2 (no release yet)
+    pip install django-multisite2
 
 
 Replace your ``SITE_ID`` in ``settings.py`` to:
@@ -129,6 +129,9 @@ settings.py::
 
 Templates
 ---------
+
+This feature has been removed in version 2.0.0.
+
 If required, create template subdirectories for domain level templates (in a
 location specified in settings.TEMPLATES['DIRS'].
 

django-multisite2-2.0.1/django_multisite2.egg-info/SOURCES.txt

@@ -0,0 +1,105 @@
+.coveragerc
+.gitignore
+.pre-commit-config.yaml
+.yamllint
+CHANGES
+LICENSE
+MANIFEST.in
+README.rst
+pyproject.toml
+runtests.py
+setup.cfg
+.github/workflows/build.yml
+django_multisite2.egg-info/PKG-INFO
+django_multisite2.egg-info/SOURCES.txt
+django_multisite2.egg-info/dependency_links.txt
+django_multisite2.egg-info/not-zip-safe
+django_multisite2.egg-info/requires.txt
+django_multisite2.egg-info/top_level.txt
+multisite/__init__.py
+multisite/apps.py
+multisite/exceptions.py
+multisite/forms.py
+multisite/hacks.py
+multisite/threadlocals.py
+multisite/utils.py
+multisite/__pycache__/__init__.cpython-312.pyc
+multisite/__pycache__/apps.cpython-312.pyc
+multisite/__pycache__/exceptions.cpython-312.pyc
+multisite/__pycache__/forms.cpython-312.pyc
+multisite/__pycache__/hacks.cpython-312.pyc
+multisite/__pycache__/threadlocals.cpython-312.pyc
+multisite/__pycache__/utils.cpython-312.pyc
+multisite/admin/__init__.py
+multisite/admin/alias_admin.py
+multisite/admin/multisite_changelist.py
+multisite/admin/multisite_model_admin.py
+multisite/admin/__pycache__/__init__.cpython-312.pyc
+multisite/admin/__pycache__/alias_admin.cpython-312.pyc
+multisite/admin/__pycache__/multisite_changelist.cpython-312.pyc
+multisite/admin/__pycache__/multisite_model_admin.cpython-312.pyc
+multisite/management/__init__.py
+multisite/management/__pycache__/__init__.cpython-312.pyc
+multisite/management/commands/__init__.py
+multisite/management/commands/update_public_suffix_list.py
+multisite/management/commands/__pycache__/__init__.cpython-312.pyc
+multisite/management/commands/__pycache__/update_public_suffix_list.cpython-312.pyc
+multisite/middleware/__init__.py
+multisite/middleware/cookie_domain_middleware.py
+multisite/middleware/dynamic_site_middleware.py
+multisite/middleware/__pycache__/__init__.cpython-312.pyc
+multisite/middleware/__pycache__/cookie_domain_middleware.cpython-312.pyc
+multisite/middleware/__pycache__/dynamic_site_middleware.cpython-312.pyc
+multisite/migrations/0001_initial.py
+multisite/migrations/0002_alter_alias_id_alter_alias_is_canonical.py
+multisite/migrations/0003_alter_alias_options_alter_alias_unique_together_and_more.py
+multisite/migrations/0004_alter_alias_managers.py
+multisite/migrations/__init__.py
+multisite/migrations/__pycache__/0001_initial.cpython-312.pyc
+multisite/migrations/__pycache__/0002_alter_alias_id_alter_alias_is_canonical.cpython-312.pyc
+multisite/migrations/__pycache__/0003_alter_alias_options_alter_alias_unique_together_and_more.cpython-312.pyc
+multisite/migrations/__pycache__/0004_alter_alias_managers.cpython-312.pyc
+multisite/migrations/__pycache__/__init__.cpython-312.pyc
+multisite/models/__init__.py
+multisite/models/alias.py
+multisite/models/managers.py
+multisite/models/signals.py
+multisite/models/validators.py
+multisite/models/__pycache__/__init__.cpython-312.pyc
+multisite/models/__pycache__/alias.cpython-312.pyc
+multisite/models/__pycache__/managers.cpython-312.pyc
+multisite/models/__pycache__/signals.cpython-312.pyc
+multisite/models/__pycache__/validators.cpython-312.pyc
+multisite/tests/__init__.py
+multisite/tests/get_test_allowed_hosts.py
+multisite/tests/get_test_http_response.py
+multisite/tests/hosts.py
+multisite/tests/test_settings.py
+multisite/tests/__pycache__/__init__.cpython-312.pyc
+multisite/tests/__pycache__/get_test_allowed_hosts.cpython-312.pyc
+multisite/tests/__pycache__/get_test_http_response.cpython-312.pyc
+multisite/tests/__pycache__/test_settings.cpython-312.pyc
+multisite/tests/tests/__init__.py
+multisite/tests/tests/request_factory.py
+multisite/tests/tests/test_alias.py
+multisite/tests/tests/test_contrib_site.py
+multisite/tests/tests/test_cookie_domain_middleware.py
+multisite/tests/tests/test_dynamic_site_middleware.py
+multisite/tests/tests/test_site_cache.py
+multisite/tests/tests/test_site_domain.py
+multisite/tests/tests/test_site_id.py
+multisite/tests/tests/test_template_loader.py
+multisite/tests/tests/__pycache__/__init__.cpython-312.pyc
+multisite/tests/tests/__pycache__/request_factory.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_alias.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_contrib_site.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_cookie_domain_middleware.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_dynamic_site_middleware.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_site_cache.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_site_domain.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_site_id.cpython-312.pyc
+multisite/tests/tests/__pycache__/test_template_loader.cpython-312.pyc
+multisite_app/__init__.py
+multisite_app/apps.py
+multisite_app/urls.py
+multisite_app/views.py

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/multisite/exceptions.py

@@ -9,6 +9,10 @@ class MultisiteSiteDoesNotExist(Exception):
     pass
 
 
+class MultisiteAliasDoesNotExist(Exception):
+    pass
+
+
 class MultisiteCacheError(Exception):
     pass
 

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/multisite/middleware/dynamic_site_middleware.py

@@ -7,11 +7,12 @@ from django.conf import settings
 from django.contrib.sites.models import SITE_CACHE, Site
 from django.core import mail
 from django.core.cache import caches
-from django.core.exceptions import DisallowedHost
+from django.core.exceptions import DisallowedHost, ObjectDoesNotExist
 from django.db.models.signals import post_delete, post_init, pre_save
 from django.http import HttpResponse, HttpResponsePermanentRedirect
 
 from ..exceptions import (
+    MultisiteAliasDoesNotExist,
     MultisiteError,
     MultisiteInvalidHostError,
     debug_check_status_code,
@@ -170,11 +171,16 @@ class DynamicSiteMiddleware:
             try:
                 # Prefer the default SITE_ID
                 site_id = settings.SITE_ID.get_default()
-            except ValueError:
+            except MultisiteError:
                 # Fallback to the first Site object
                 alias = Alias.canonical.order_by("site")[0]
             else:
-                alias = Alias.canonical.get(site=site_id)
+                try:
+                    alias = Alias.canonical.get(site=site_id)
+                except ObjectDoesNotExist as e:
+                    raise MultisiteAliasDoesNotExist(
+                        f"Invalid default SITE_ID. See {settings}. Got `{e}` for SITE_ID=`{site_id}`."
+                    )
         return alias
 
     @classmethod

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/multisite/tests/tests/test_site_id.py

@@ -2,6 +2,7 @@ from django.contrib.sites.models import Site
 from django.test import TestCase
 
 from multisite import SiteID
+from multisite.exceptions import MultisiteError
 
 
 class TestSiteID(TestCase):
@@ -11,8 +12,8 @@ class TestSiteID(TestCase):
         self.site_id = SiteID()
 
     def test_invalid_default(self):
-        self.assertRaises(ValueError, SiteID, default="a")
-        self.assertRaises(ValueError, SiteID, default=self.site_id)
+        self.assertRaises(MultisiteError, SiteID, default="a")
+        self.assertRaises(MultisiteError, SiteID, default=self.site_id)
 
     def test_compare_default_site_id(self):
         self.site_id = SiteID(default=self.site.id)

{django-multisite2-2.0.0 → django-multisite2-2.0.1}/multisite/threadlocals.py

@@ -4,6 +4,8 @@ from threading import local
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
+from multisite.exceptions import MultisiteError
+
 
 class SiteID(local):
     """
@@ -17,13 +19,15 @@ class SiteID(local):
     when combined with the appropriate middleware.
     """
 
-    def __init__(self, default=None, *args, **kwargs):
+    def __init__(self, default: int | None = None, *args, **kwargs):
         """
         ``default``, if specified, determines the default SITE_ID,
         if that is unset.
         """
         if default is not None and not isinstance(default, int):
-            raise ValueError("%r is not a valid default." % default)
+            raise MultisiteError(
+                f"Invalid default value for SITE_ID. See settings.SITE_ID. Got `{default}`."
+            )
         self.default = default
         self.reset()
 
@@ -100,7 +104,7 @@ class SiteID(local):
     def get_default(self):
         """Returns the default SITE_ID."""
         if self.default is None:
-            raise ValueError("SITE_ID has not been set.")
+            raise MultisiteError("SITE_ID default has not been set. See settings.SITE_ID.")
         return self.default
 
 

django-multisite2-2.0.0/django_multisite2.egg-info/SOURCES.txt

@@ -1,64 +0,0 @@
-.coveragerc
-.gitignore
-.pre-commit-config.yaml
-.yamllint
-CHANGES
-LICENSE
-MANIFEST.in
-README.rst
-pyproject.toml
-runtests.py
-setup.cfg
-.github/workflows/build.yml
-django_multisite2.egg-info/PKG-INFO
-django_multisite2.egg-info/SOURCES.txt
-django_multisite2.egg-info/dependency_links.txt
-django_multisite2.egg-info/not-zip-safe
-django_multisite2.egg-info/requires.txt
-django_multisite2.egg-info/top_level.txt
-multisite/__init__.py
-multisite/apps.py
-multisite/exceptions.py
-multisite/forms.py
-multisite/hacks.py
-multisite/threadlocals.py
-multisite/utils.py
-multisite/admin/__init__.py
-multisite/admin/alias_admin.py
-multisite/admin/multisite_changelist.py
-multisite/admin/multisite_model_admin.py
-multisite/management/__init__.py
-multisite/management/commands/__init__.py
-multisite/management/commands/update_public_suffix_list.py
-multisite/middleware/__init__.py
-multisite/middleware/cookie_domain_middleware.py
-multisite/middleware/dynamic_site_middleware.py
-multisite/migrations/0001_initial.py
-multisite/migrations/0002_alter_alias_id_alter_alias_is_canonical.py
-multisite/migrations/0003_alter_alias_options_alter_alias_unique_together_and_more.py
-multisite/migrations/0004_alter_alias_managers.py
-multisite/migrations/__init__.py
-multisite/models/__init__.py
-multisite/models/alias.py
-multisite/models/managers.py
-multisite/models/signals.py
-multisite/models/validators.py
-multisite/tests/__init__.py
-multisite/tests/get_test_allowed_hosts.py
-multisite/tests/get_test_http_response.py
-multisite/tests/hosts.py
-multisite/tests/test_settings.py
-multisite/tests/tests/__init__.py
-multisite/tests/tests/request_factory.py
-multisite/tests/tests/test_alias.py
-multisite/tests/tests/test_contrib_site.py
-multisite/tests/tests/test_cookie_domain_middleware.py
-multisite/tests/tests/test_dynamic_site_middleware.py
-multisite/tests/tests/test_site_cache.py
-multisite/tests/tests/test_site_domain.py
-multisite/tests/tests/test_site_id.py
-multisite/tests/tests/test_template_loader.py
-multisite_app/__init__.py
-multisite_app/apps.py
-multisite_app/urls.py
-multisite_app/views.py