newforms-admin: Made import visibility of formsets and Media consistent with that of fields, widgets and forms.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6029 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/admin/options.py

@@ -1,8 +1,6 @@
 from django import oldforms, template
 from django import newforms as forms
 from django.newforms.formsets import all_valid
-from django.newforms.models import inline_formset
-from django.newforms.widgets import Media, MediaDefiningClass
 from django.contrib.admin import widgets
 from django.contrib.admin.util import get_deleted_objects
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
@@ -67,8 +65,8 @@ class Fieldset(object):
     def _media(self):
         from django.conf import settings
         if 'collapse' in self.classes:
-            return Media(js=['%sjs/admin/CollapsedFieldsets.js' % settings.ADMIN_MEDIA_PREFIX])
-        return Media()
+            return forms.Media(js=['%sjs/admin/CollapsedFieldsets.js' % settings.ADMIN_MEDIA_PREFIX])
+        return forms.Media()
     media = property(_media)
     
 class BoundFieldset(object):
@@ -165,7 +163,7 @@ class BaseModelAdmin(object):
 
 class ModelAdmin(BaseModelAdmin):
     "Encapsulates all admin options and functionality for a given model."
-    __metaclass__ = MediaDefiningClass
+    __metaclass__ = forms.MediaDefiningClass
     
     list_display = ('__str__',)
     list_display_links = ()
@@ -220,7 +218,7 @@ class ModelAdmin(BaseModelAdmin):
         if self.filter_vertical or self.filter_horizontal:
             js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
         
-        return Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
+        return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
     media = property(_media)
     
     def fieldsets(self, request):
@@ -613,7 +611,7 @@ class ModelAdmin(BaseModelAdmin):
     def get_inline_formsets(self):
         inline_formset_classes = []
         for opts in self.inlines:
-            inline = inline_formset(self.model, opts.model, formfield_callback=opts.formfield_for_dbfield, fields=opts.fields, extra=opts.extra)
+            inline = forms.inline_formset(self.model, opts.model, formfield_callback=opts.formfield_for_dbfield, fields=opts.fields, extra=opts.extra)
             inline_formset_classes.append(inline)
         return inline_formset_classes
 

django/newforms/__init__.py

@@ -15,3 +15,4 @@ from widgets import *
 from fields import *
 from forms import *
 from models import *
+from formsets import *

django/newforms/formsets.py

@@ -2,6 +2,8 @@ from forms import Form, ValidationError
 from fields import IntegerField, BooleanField
 from widgets import HiddenInput, Media
 
+__all__ = ('BaseFormSet', 'formset_for_form', 'all_valid')
+
 # special field names
 FORM_COUNT_FIELD_NAME = 'COUNT'
 ORDERING_FIELD_NAME = 'ORDER'

django/newforms/models.py

@@ -15,7 +15,7 @@ from widgets import Select, SelectMultiple, HiddenInput, MultipleHiddenInput
 
 __all__ = (
     'save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields',
-    'ModelChoiceField', 'ModelMultipleChoiceField'
+    'ModelChoiceField', 'ModelMultipleChoiceField', 'inline_formset'
 )
 
 def save_instance(form, instance, fields=None, fail_message='saved', commit=True):

django/newforms/widgets.py

@@ -17,7 +17,7 @@ from util import flatatt
 from urlparse import urljoin
 
 __all__ = (
-    'Media', 'Widget', 'TextInput', 'PasswordInput',
+    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput',
     'HiddenInput', 'MultipleHiddenInput',
     'FileInput', 'Textarea', 'CheckboxInput',
     'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',