Ticket #2135: urlify.4.diff

django/db/models/base.py

@@ -2 +2 @@
 import django.db.models.manager
 from django.core import validators
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models.fields import AutoField, ImageField, FieldDoesNotExist
+from django.db.models.fields import AutoField, ImageField, FieldDoesNotExist, URLify
 from django.db.models.fields.related import OneToOneRel, ManyToOneRel
 from django.db.models.related import RelatedObject
 from django.db.models.query import orderlist2sql, delete_objects
@@ -144 +144 @@
         dispatcher.send(signal=signals.class_prepared, sender=cls)
 
     _prepare = classmethod(_prepare)
+    
+    def prepopulate(self):
+        for f in self._meta.fields:
+            if not f.prepopulate_from: continue
+            if getattr(self, f.attname): continue
+            value = [getattr(self, p) for p in f.prepopulate_from]
+            value = URLify(' '.join(value), f.maxlength)
+            setattr(self, f.attname, value)
 
     def save(self):
         dispatcher.send(signal=signals.pre_save, sender=self.__class__, instance=self)

django/db/models/fields/__init__.py

@@ -7 +7 @@
 from django.utils.functional import curry, lazy
 from django.utils.text import capfirst
 from django.utils.translation import gettext, gettext_lazy, ngettext
-import datetime, os, time
+import datetime, os, time, re
 
 class NOT_PROVIDED:
     pass
@@ -702 +702 @@
 
     def get_manipulator_field_objs(self):
         return [forms.TextField]
+    
+def URLify(s, num_chars):
+    '''
+    Changes, e.g., "Petty theft" to "petty_theft".
+    This function is the Python equivalent of the javascript function
+    of the same name in django/contrib/admin/media/js/urlify.js.
+    It can get invoked for any field that has a prepopulate_from
+    attribute defined, although it only really makes sense for
+    SlugFields.
+    
+    NOTE: this implementation corresponds to the Python implementation
+          of the same algorithm in django/contrib/admin/media/js/urlify.js
+    '''
+    # remove all these words from the string before urlifying
+    removelist = ["a", "an", "as", "at", "before", "but", "by", "for",
+                  "from", "is", "in", "into", "like", "of", "off", "on",
+                  "onto", "per", "since", "than", "the", "this", "that",
+                  "to", "up", "via", "with"]
+    ignore_words = '|'.join([r for r in removelist])
+    ignore_words_pat = re.compile(r'\b(%s)\b' % ignore_words, re.I)
+    ignore_chars_pat = re.compile(r'[^-a-z0-9\s]')
+    inside_space_pat = re.compile(r'[-\s]+')
+    
+    s = s.lower()                    # convert to lowercase
+    s = ignore_words_pat.sub('', s)  # remove unimportant words
+    s = ignore_chars_pat.sub('', s)  # remove unneeded chars
+    s = s.strip()                    # trim leading/trailing spaces
+    s = inside_space_pat.sub('-', s) # convert remaining spaces to hyphens
+    if num_chars is not None:
+        s = s[:num_chars]            # trim to first num_chars chars
+    return s
 
 class SmallIntegerField(IntegerField):
     def get_manipulator_field_objs(self):

django/contrib/admin/media/js/urlify.js

@@ -1 +1 @@
 function URLify(s, num_chars) {
     // changes, e.g., "Petty theft" to "petty_theft"
     // remove all these words from the string before urlifying
+    // NOTE: this implementation corresponds to the Python implementation
+    //       of the same algorithm in django/db/models/fields/__init__.py
     removelist = ["a", "an", "as", "at", "before", "but", "by", "for", "from",
                   "is", "in", "into", "like", "of", "off", "on", "onto", "per",
                   "since", "than", "the", "this", "that", "to", "up", "via",

django/template/defaultfilters.py

@@ -3 +3 @@
 from django.template import resolve_variable, Library
 from django.conf import settings
 from django.utils.translation import gettext
+from django.db.models.fields import URLify
 import re
 import random as random_module
 
@@ -63 +64 @@
     """
     return list(str(value))
 
-def slugify(value):
-    "Converts to lowercase, removes non-alpha chars and converts spaces to hyphens"
-    value = re.sub('[^\w\s-]', '', value).strip().lower()
-    return re.sub('[-\s]+', '-', value)
+def slugify(value, maxlen=None):
+    """
+    Converts to lowercase, removes non-alpha chars and converts spaces
+    to hyphens
+    """
+    return URLify(value, maxlen)
 
 def stringformat(value, arg):
     """

tests/othertests/defaultfilters.py

@@ -40 +40 @@
 ['1', '2', '3', '4']
 
 >>> slugify(' Jack & Jill like numbers 1,2,3 and 4 and silly characters ?%.$!/')
-'jack-jill-like-numbers-123-and-4-and-silly-characters'
+'jack-jill-numbers-123-and-4-and-silly-characters'
 
+>>> slugify('the test of testers  ')
+'test-testers'
+
 >>> stringformat(1, '03d')
 '001'
 

docs/templates.txt

@@ -993 +993 @@
 slugify
 ~~~~~~~
 
-Converts to lowercase, removes non-word characters (alphanumerics and
-underscores) and converts spaces to hyphens. Also strips leading and trailing
-whitespace.
+Converts to lowercase, removes unimportant words, removes non-word
+characters (everything but letters and digits), and converts spaces to
+hyphens. Also strips leading and trailing whitespace.
 
 stringformat
 ~~~~~~~~~~~~