Commit c2ba59fc authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Removed oldforms, validators, and related code: 

 * Removed `Manipulator`, `AutomaticManipulator`, and related classes.
 * Removed oldforms specific bits from model fields:
   * Removed `validator_list` and `core` arguments from constructors.
   * Removed the methods:
     * `get_manipulator_field_names`
     * `get_manipulator_field_objs`
     * `get_manipulator_fields`
     * `get_manipulator_new_data`
     * `prepare_field_objs_and_params`
     * `get_follow`
   * Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
 * Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
 * Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
 * Serialization framework
   * `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
   * Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
 * Removed `django.core.validators`:
   * Moved `ValidationError` exception to `django.core.exceptions`.
   * For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
 * Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
 * Removed an oldforms-style model creation hack (refs #2160).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a1575766

django/contrib/admin/util.py

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_ 
                        perms_needed.add(related.opts.verbose_name)

                        # We don't care about populating deleted_objects now.

                        continue

                if related.field.rel.edit_inline or not has_admin:

                if not has_admin:

                    # Don't display link to edit, because it either has no

                    # admin or is edited inline.

                    nh(deleted_objects, current_depth, [u'%s: %s' % (force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
@@ -101,7 +101,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_ 
            has_related_objs = False

            for sub_obj in getattr(obj, rel_opts_name).all():

                has_related_objs = True

                if related.field.rel.edit_inline or not has_admin:

                if not has_admin:

                    # Don't display link to edit, because it either has no

                    # admin or is edited inline.

                    nh(deleted_objects, current_depth, [u'%s: %s' % (force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
@@ -132,7 +132,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_ 


        if has_related_objs:

            for sub_obj in rel_objs.all():

                if related.field.rel.edit_inline or not has_admin:

                if not has_admin:

                    # Don't display link to edit, because it either has no

                    # admin or is edited inline.

                    nh(deleted_objects, current_depth, [_('One or more %(fieldname)s in %(name)s: %(obj)s') % \

django/contrib/auth/management/commands/createsuperuser.py

+14 −5
Original line number Diff line number Diff line
@@ -8,10 +8,19 @@ import re 
import sys

from optparse import make_option

from django.contrib.auth.models import User

from django.core import validators

from django.core import exceptions

from django.core.management.base import BaseCommand, CommandError

from django.utils.translation import ugettext as _



RE_VALID_USERNAME = re.compile('\w+$')

EMAIL_RE = re.compile(

    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom

    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"' # quoted-string

    r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain



def is_valid_email(value):

    if not EMAIL_RE.search(value):

        raise exceptions.ValidationError(_('Enter a valid e-mail address.'))



class Command(BaseCommand):

    option_list = BaseCommand.option_list + (
@@ -39,8 +48,8 @@ class Command(BaseCommand): 
            if not RE_VALID_USERNAME.match(username):

                raise CommandError("Invalid username. Use only letters, digits, and underscores")

            try:

                validators.isValidEmail(email, None)

            except validators.ValidationError:

                is_valid_email(email)

            except exceptions.ValidationError:

                raise CommandError("Invalid email address.")



        password = ''
@@ -94,8 +103,8 @@ class Command(BaseCommand): 
                    if not email:

                        email = raw_input('E-mail address: ')

                    try:

                        validators.isValidEmail(email, None)

                    except validators.ValidationError:

                        is_valid_email(email)

                    except exceptions.ValidationError:

                        sys.stderr.write("Error: That e-mail address is invalid.\n")

                        email = None

                    else:

django/contrib/auth/models.py

+0 −1
Original line number Diff line number Diff line 
from django.contrib import auth

from django.core import validators

from django.core.exceptions import ImproperlyConfigured

from django.db import models

from django.db.models.manager import EmptyManager

django/contrib/comments/forms.py

+0 −3
Original line number Diff line number Diff line
@@ -117,9 +117,6 @@ class CommentForm(forms.Form): 
        """

        comment = self.cleaned_data["comment"]

        if settings.COMMENTS_ALLOW_PROFANITIES == False:

            # Logic adapted from django.core.validators; it's not clear if they

            # should be used in newforms or will be deprecated along with the

            # rest of oldforms

            bad_words = [w for w in settings.PROFANITIES_LIST if w in comment.lower()]

            if bad_words:

                plural = len(bad_words) > 1

django/contrib/comments/models.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from django.contrib.contenttypes import generic 
from django.contrib.contenttypes.models import ContentType

from django.contrib.sites.models import Site

from django.db import models

from django.core import urlresolvers, validators

from django.core import urlresolvers

from django.utils.translation import ugettext_lazy as _

from django.conf import settings