Django

Code

Changeset 7605

Show
Ignore:
Timestamp:
06/09/08 23:15:06 (3 months ago)
Author:
brosner
Message:

newforms-admin: Removed the leading underscore from modelforms factory functions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/options.py

    r7603 r7605  
    22from django import newforms as forms 
    33from django.newforms.formsets import all_valid 
    4 from django.newforms.models import _modelform_factory, _inlineformset_factory 
     4from django.newforms.models import modelform_factory, inlineformset_factory 
    55from django.contrib.contenttypes.models import ContentType 
    66from django.contrib.admin import widgets 
    …… 
    319319        else: 
    320320            fields = None 
    321         return _modelform_factory(self.model, form=self.form, fields=fields, formfield_callback=self.formfield_for_dbfield) 
     321        return modelform_factory(self.model, form=self.form, fields=fields, formfield_callback=self.formfield_for_dbfield) 
    322322 
    323323    def get_formsets(self, request, obj=None): 
    …… 
    718718        else: 
    719719            fields = None 
    720         return _inlineformset_factory(self.parent_model, self.model, form=self.form, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra) 
     720        return inlineformset_factory(self.parent_model, self.model, form=self.form, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra) 
    721721 
    722722    def get_fieldsets(self, request, obj=None): 

  • django/branches/newforms-admin/django/newforms/models.py

    r7603 r7605  
    280280    __metaclass__ = ModelFormMetaclass 
    281281 
    282 # XXX: This API *will* change. Use at your own risk. 
    283 def _modelform_factory(model, form=ModelForm, fields=None, exclude=None, 
     282def modelform_factory(model, form=ModelForm, fields=None, exclude=None, 
    284283                       formfield_callback=lambda f: f.formfield()): 
    285284    # HACK: we should be able to construct a ModelForm without creating 
    …… 
    370369        super(BaseModelFormSet, self).add_fields(form, index) 
    371370 
    372 # XXX: Use at your own risk. This API *will* change. 
    373 def _modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.formfield(), 
     371def modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.formfield(), 
    374372                          formset=BaseModelFormSet, 
    375373                          extra=1, can_delete=False, can_order=False, 
    …… 
    378376    Returns a FormSet class for the given Django model class. 
    379377    """ 
    380     form = _modelform_factory(model, form=form, fields=fields, exclude=exclude, 
     378    form = modelform_factory(model, form=form, fields=fields, exclude=exclude, 
    381379                              formfield_callback=formfield_callback) 
    382380    FormSet = _formset_factory(form, formset, extra=extra, can_order=can_order, can_delete=can_delete) 
    …… 
    445443 
    446444 
    447 # XXX: This API *will* change. Use at your own risk. 
    448 def _inlineformset_factory(parent_model, model, form=ModelForm, 
     445def inlineformset_factory(parent_model, model, form=ModelForm, 
    449446                           formset=BaseInlineFormset, fk_name=None, 
    450447                           fields=None, exclude=None, 
    …… 
    464461    else: 
    465462        exclude = [fk.name] 
    466     FormSet = _modelformset_factory(model, form=form, 
     463    FormSet = modelformset_factory(model, form=form, 
    467464                                    formfield_callback=formfield_callback, 
    468465                                    formset=formset, 

  • django/branches/newforms-admin/tests/modeltests/model_formsets/models.py

    r7603 r7605  
    1717__test__ = {'API_TESTS': """ 
    1818 
    19 >>> from django.newforms.models import _modelformset_factory 
     19>>> from django.newforms.models import modelformset_factory 
    2020 
    2121>>> qs = Author.objects.all() 
    22 >>> AuthorFormSet = _modelformset_factory(Author, extra=3) 
     22>>> AuthorFormSet = modelformset_factory(Author, extra=3) 
    2323 
    2424>>> formset = AuthorFormSet(queryset=qs) 
    …… 
    5656 
    5757>>> qs = Author.objects.order_by('name') 
    58 >>> AuthorFormSet = _modelformset_factory(Author, extra=1, can_delete=False) 
     58>>> AuthorFormSet = modelformset_factory(Author, extra=1, can_delete=False) 
    5959 
    6060>>> formset = AuthorFormSet(queryset=qs) 
    …… 
    9595 
    9696>>> qs = Author.objects.order_by('name') 
    97 >>> AuthorFormSet = _modelformset_factory(Author, extra=1, can_delete=True) 
     97>>> AuthorFormSet = modelformset_factory(Author, extra=1, can_delete=True) 
    9898 
    9999>>> formset = AuthorFormSet(queryset=qs) 
    …… 
    164164admin system's edit inline functionality works. 
    165165 
    166 >>> from django.newforms.models import _inlineformset_factory 
    167  
    168 >>> AuthorBooksFormSet = _inlineformset_factory(Author, Book, can_delete=False, extra=3) 
     166>>> from django.newforms.models import inlineformset_factory 
     167 
     168>>> AuthorBooksFormSet = inlineformset_factory(Author, Book, can_delete=False, extra=3) 
    169169>>> author = Author.objects.get(name='Charles Baudelaire') 
    170170 
    …… 
    200200book. 
    201201 
    202 >>> AuthorBooksFormSet = _inlineformset_factory(Author, Book, can_delete=False, extra=2) 
     202>>> AuthorBooksFormSet = inlineformset_factory(Author, Book, can_delete=False, extra=2) 
    203203>>> author = Author.objects.get(name='Charles Baudelaire') 
    204204 

  • django/branches/newforms-admin/tests/regressiontests/inline_formsets/models.py

    r7270 r7605  
    1616__test__ = {'API_TESTS': """ 
    1717 
    18 >>> from django.newforms.models import _inlineformset_factory 
     18>>> from django.newforms.models import inlineformset_factory 
    1919 
    2020 
    …… 
    2222for the inline formset, we should get an exception. 
    2323 
    24 >>> ifs = _inlineformset_factory(Parent, Child) 
     24>>> ifs = inlineformset_factory(Parent, Child) 
    2525Traceback (most recent call last): 
    2626    ... 
    …… 
    3030These two should both work without a problem. 
    3131 
    32 >>> ifs = _inlineformset_factory(Parent, Child, fk_name='mother') 
    33 >>> ifs = _inlineformset_factory(Parent, Child, fk_name='father') 
     32>>> ifs = inlineformset_factory(Parent, Child, fk_name='mother') 
     33>>> ifs = inlineformset_factory(Parent, Child, fk_name='father') 
    3434 
    3535 
    …… 
    3737parent model, we should get an exception. 
    3838 
    39 >>> ifs = _inlineformset_factory(Parent, Child, fk_name='school') 
     39>>> ifs = inlineformset_factory(Parent, Child, fk_name='school') 
    4040Traceback (most recent call last): 
    4141    ... 
    …… 
    4646exception. 
    4747 
    48 >>> ifs = _inlineformset_factory(Parent, Child, fk_name='test') 
     48>>> ifs = inlineformset_factory(Parent, Child, fk_name='test') 
    4949Traceback (most recent call last): 
    5050    ...