Commit b31eea06 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge branch 'master' into schema-alteration

parents 76d93a52 f54a8880

AUTHORS

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ The PRIMARY AUTHORS are (and/or have been): 
    * Preston Holmes

    * Simon Charette

    * Donald Stufft

    * Marc Tamlyn



More information on the main contributors to Django can be found in

docs/internals/committers.txt.
@@ -121,6 +122,7 @@ answer newbie questions, and generally made Django that much better: 
    Chris Cahoon <chris.cahoon@gmail.com>

    Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>

    Trevor Caira <trevor@caira.com>

    Aaron Cannon <cannona@fireantproductions.com>

    Brett Cannon <brett@python.org>

    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>

    Jeremy Carbaugh <jcarbaugh@gmail.com>
@@ -539,7 +541,6 @@ answer newbie questions, and generally made Django that much better: 
    Aaron Swartz <http://www.aaronsw.com/>

    Ville Säävuori <http://www.unessa.net/>

    Mart Sõmermaa <http://mrts.pri.ee/>

    Marc Tamlyn

    Christian Tanzer <tanzer@swing.co.at>

    Tyler Tarabula <tyler.tarabula@gmail.com>

    Tyson Tate <tyson@fallingbullets.com>

django/conf/global_settings.py

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ DEFAULT_EXCEPTION_REPORTER_FILTER = 'django.views.debug.SafeExceptionReporterFil 
###########



# The name of the class to use to run the test suite

TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'

TEST_RUNNER = 'django.test.runner.DiscoverRunner'



############

# FIXTURES #

django/contrib/admin/options.py

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ from django.utils.encoding import force_text 


HORIZONTAL, VERTICAL = 1, 2

# returns the <ul> class for a given radio_admin field

get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '')

get_ul_class = lambda x: 'radiolist%s' % (' inline' if x == HORIZONTAL else '')





class IncorrectLookupParameters(Exception):
@@ -189,7 +189,7 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)): 
            kwargs['widget'] = widgets.AdminRadioSelect(attrs={

                'class': get_ul_class(self.radio_fields[db_field.name]),

            })

            kwargs['empty_label'] = db_field.blank and _('None') or None

            kwargs['empty_label'] = _('None') if db_field.blank else None



        queryset = self.get_field_queryset(db, db_field, request)

        if queryset is not None:

django/contrib/admindocs/tests/__init__.py

+0 −1
Original line number Diff line number Diff line 
from .test_fields import TestFieldType

django/contrib/admindocs/views.py

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ def model_detail(request, app_label, model_name): 
    return render_to_response('admin_doc/model_detail.html', {

        'root_path': urlresolvers.reverse('admin:index'),

        'name': '%s.%s' % (opts.app_label, opts.object_name),

        'summary': _("Fields on %s objects") % opts.object_name,

        'summary': _("Attributes on %s objects") % opts.object_name,

        'description': model.__doc__,

        'fields': fields,

    }, context_instance=RequestContext(request))