Added TransactionTestCase.available_apps. (4daf570b) · Commits · Dom Sekotill / django

django/contrib/auth/management/init.py

+12 −3

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ from django.contrib.auth import models as auth_app, get_user_model
		from django.core import exceptions
		from django.core.management.base import CommandError
		from django.db import DEFAULT_DB_ALIAS, router
		from django.db.models import get_models, signals
		from django.db.models import get_model, get_models, signals, UnavailableApp
		from django.utils.encoding import DEFAULT_LOCALE_ENCODING
		from django.utils import six
		from django.utils.six.moves import input
		@@ -60,6 +60,11 @@ def _check_permission_clashing(custom, builtin, ctype):
		pool.add(codename)

		def create_permissions(app, created_models, verbosity, db=DEFAULT_DB_ALIAS, **kwargs):
		try:
		get_model('auth', 'Permission')
		except UnavailableApp:
		return

		if not router.allow_syncdb(db, auth_app.Permission):
		return

		@@ -101,9 +106,13 @@ def create_permissions(app, created_models, verbosity, db=DEFAULT_DB_ALIAS, **kw


		def create_superuser(app, created_models, verbosity, db, **kwargs):
		from django.core.management import call_command

		try:
		get_model('auth', 'Permission')
		UserModel = get_user_model()
		except UnavailableApp:
		return

		from django.core.management import call_command

		if UserModel in created_models and kwargs.get('interactive', True):
		msg = ("\nYou just installed Django's auth system, which means you "

django/contrib/contenttypes/management.py

+6 −1

Original line number	Diff line number	Diff line
		from django.contrib.contenttypes.models import ContentType
		from django.db import DEFAULT_DB_ALIAS, router
		from django.db.models import get_apps, get_models, signals
		from django.db.models import get_apps, get_model, get_models, signals, UnavailableApp
		from django.utils.encoding import smart_text
		from django.utils import six
		from django.utils.six.moves import input
		@@ -11,6 +11,11 @@ def update_contenttypes(app, created_models, verbosity=2, db=DEFAULT_DB_ALIAS, *
		Creates content types for models in the given app, removing any model
		entries that no longer have a matching model class.
		"""
		try:
		get_model('contenttypes', 'ContentType')
		except UnavailableApp:
		return

		if not router.allow_syncdb(db, ContentType):
		return

django/db/models/init.py

+1 −1

Original line number	Diff line number	Diff line
		from functools import wraps

		from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
		from django.db.models.loading import get_apps, get_app_paths, get_app, get_models, get_model, register_models
		from django.db.models.loading import get_apps, get_app_paths, get_app, get_models, get_model, register_models, UnavailableApp
		from django.db.models.query import Q
		from django.db.models.expressions import F
		from django.db.models.manager import Manager

django/db/models/loading.py

+50 −12

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@ import os
		__all__ = ('get_apps', 'get_app', 'get_models', 'get_model', 'register_models',
		'load_app', 'app_cache_ready')

		class UnavailableApp(Exception):
		pass

		class AppCache(object):
		"""
		@@ -43,6 +45,7 @@ class AppCache(object):
		postponed=[],
		nesting_level=0,
		_get_models_cache={},
		available_apps=None,
		)

		def __init__(self):
		@@ -135,12 +138,17 @@ class AppCache(object):
		"""
		self._populate()

		apps = self.app_store.items()
		if self.available_apps is not None:
		apps = [elt for elt in apps
		if self._label_for(elt[0]) in self.available_apps]

		# Ensure the returned list is always in the same order (with new apps
		# added at the end). This avoids unstable ordering on the admin app
		# list page, for example.
		apps = [(v, k) for k, v in self.app_store.items()]
		apps.sort()
		return [elt[1] for elt in apps]
		apps = sorted(apps, key=lambda elt: elt[1])

		return [elt[0] for elt in apps]

		def get_app_paths(self):
		"""
		@@ -161,8 +169,12 @@ class AppCache(object):

		def get_app(self, app_label, emptyOK=False):
		"""
		Returns the module containing the models for the given app_label. If
		the app has no models in it and 'emptyOK' is True, returns None.
		Returns the module containing the models for the given app_label.

		Returns None if the app has no models in it and emptyOK is True.

		Raises UnavailableApp when set_available_apps() in in effect and
		doesn't include app_label.
		"""
		self._populate()
		imp.acquire_lock()
		@@ -170,11 +182,10 @@ class AppCache(object):
		for app_name in settings.INSTALLED_APPS:
		if app_label == app_name.split('.')[-1]:
		mod = self.load_app(app_name, False)
		if mod is None:
		if emptyOK:
		return None
		if mod is None and not emptyOK:
		raise ImproperlyConfigured("App with label %s is missing a models.py module." % app_label)
		else:
		if self.available_apps is not None and app_label not in self.available_apps:
		raise UnavailableApp("App with label %s isn't available." % app_label)
		return mod
		raise ImproperlyConfigured("App with label %s could not be found" % app_label)
		finally:
		@@ -209,8 +220,13 @@ class AppCache(object):
		include_swapped, they will be.
		"""
		cache_key = (app_mod, include_auto_created, include_deferred, only_installed, include_swapped)
		model_list = None
		try:
		return self._get_models_cache[cache_key]
		model_list = self._get_models_cache[cache_key]
		if self.available_apps is not None and only_installed:
		model_list = [m for m in model_list
		if m._meta.app_label in self.available_apps]
		return model_list
		except KeyError:
		pass
		self._populate()
		@@ -235,6 +251,9 @@ class AppCache(object):
		(not model._meta.swapped or include_swapped))
		)
		self._get_models_cache[cache_key] = model_list
		if self.available_apps is not None and only_installed:
		model_list = [m for m in model_list
		if m._meta.app_label in self.available_apps]
		return model_list

		def get_model(self, app_label, model_name,
		@@ -244,12 +263,21 @@ class AppCache(object):
		model_name.

		Returns None if no model is found.

		Raises UnavailableApp when set_available_apps() in in effect and
		doesn't include app_label.
		"""
		if seed_cache:
		self._populate()
		if only_installed and app_label not in self.app_labels:
		return None
		return self.app_models.get(app_label, SortedDict()).get(model_name.lower())
		if (self.available_apps is not None and only_installed
		and app_label not in self.available_apps):
		raise UnavailableApp("App with label %s isn't available." % app_label)
		try:
		return self.app_models[app_label][model_name.lower()]
		except KeyError:
		return None

		def register_models(self, app_label, *models):
		"""
		@@ -274,6 +302,16 @@ class AppCache(object):
		model_dict[model_name] = model
		self._get_models_cache.clear()

		def set_available_apps(self, available):
		if not set(available).issubset(set(settings.INSTALLED_APPS)):
		extra = set(available) - set(settings.INSTALLED_APPS)
		raise ValueError("Available apps isn't a subset of installed "
		"apps, extra apps: " + ", ".join(extra))
		self.available_apps = set(app.rsplit('.', 1)[-1] for app in available)

		def unset_available_apps(self):
		self.available_apps = None

		cache = AppCache()

		# These methods were always module level, so are kept that way for backwards

django/test/testcases.py

+30 −14

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ from django.core.servers.basehttp import (WSGIRequestHandler, WSGIServer,
		WSGIServerException)
		from django.core.urlresolvers import clear_url_caches, set_urlconf
		from django.db import connection, connections, DEFAULT_DB_ALIAS, transaction
		from django.db.models.loading import cache
		from django.forms.fields import CharField
		from django.http import QueryDict
		from django.test.client import Client
		@@ -725,6 +726,9 @@ class TransactionTestCase(SimpleTestCase):
		# test case
		reset_sequences = False

		# Subclasses can enable only a subset of apps for faster tests
		available_apps = None

		def _pre_setup(self):
		"""Performs any pre-test setup. This includes:

		@@ -733,7 +737,14 @@ class TransactionTestCase(SimpleTestCase):
		named fixtures.
		"""
		super(TransactionTestCase, self)._pre_setup()
		if self.available_apps is not None:
		cache.set_available_apps(self.available_apps)
		try:
		self._fixture_setup()
		except Exception:
		if self.available_apps is not None:
		cache.unset_available_apps()
		raise

		def _databases_names(self, include_mirrors=True):
		# If the test case has a multi_db=True flag, act on all databases,
		@@ -775,22 +786,27 @@ class TransactionTestCase(SimpleTestCase):
		* Force closing the connection, so that the next test gets
		a clean cursor.
		"""
		try:
		self._fixture_teardown()
		super(TransactionTestCase, self)._post_teardown()
		# Some DB cursors include SQL statements as part of cursor
		# creation. If you have a test that does rollback, the effect
		# of these statements is lost, which can effect the operation
		# of tests (e.g., losing a timezone setting causing objects to
		# be created with the wrong time).
		# To make sure this doesn't happen, get a clean connection at the
		# start of every test.
		# creation. If you have a test that does rollback, the effect of
		# these statements is lost, which can effect the operation of
		# tests (e.g., losing a timezone setting causing objects to be
		# created with the wrong time). To make sure this doesn't happen,
		# get a clean connection at the start of every test.
		for conn in connections.all():
		conn.close()
		finally:
		cache.unset_available_apps()

		def _fixture_teardown(self):
		# Allow TRUNCATE ... CASCADE when flushing only a subset of the apps
		allow_cascade = self.available_apps is not None
		for db_name in self._databases_names(include_mirrors=False):
		call_command('flush', verbosity=0, interactive=False, database=db_name,
		skip_validation=True, reset_sequences=False)
		call_command('flush', verbosity=0, interactive=False,
		database=db_name, skip_validation=True,
		reset_sequences=False, allow_cascade=allow_cascade)

		def assertQuerysetEqual(self, qs, values, transform=repr, ordered=True):
		items = six.moves.map(transform, qs)