Ticket #17320: remove_whitespace_from_domain.diff

django/contrib/sites/tests.py

@@ -54 +54 @@
         site = get_current_site(request)
         self.assertTrue(isinstance(site, RequestSite))
         self.assertEqual(site.name, u"example.com")
+
+    def test_no_whitespace_in_domain(self):
+        # Test that all whitespace is removed from domain before being saved
+        incorrect = '  example . com  '
+        correct = 'example.com'
+
+        new_site = Site.objects.create(domain=incorrect, name="An example site with whitespace in the domain")
+        site_from_db = Site.objects.get(pk=new_site.pk)
+
+        # Test that domain whitespace has been removed on create() insert
+        self.assertEqual(site_from_db.domain, correct)
+
+        site_from_db.domain = incorrect
+        site_from_db.save()
+        another_site_from_db = Site.objects.get(pk=site_from_db.pk)
+
+        # Test that domain whitespace has been removed on save() update
+        self.assertEqual(another_site_from_db.domain, correct)

django/contrib/sites/models.py

@@ -48 +48 @@
         return self.domain
 
     def save(self, *args, **kwargs):
+        # Domains with spaces cause problems when generating links. 
+        self.domain = self.domain.replace(' ', '')
         super(Site, self).save(*args, **kwargs)
         # Cached information will likely be incorrect now.
         if self.id in SITE_CACHE: