Changes between Version 35 and Version 36 of RemovingTheMagic

Timestamp:

Jan 11, 2006, 12:35:16 PM (19 years ago)

Author:

Adrian Holovaty

Comment:

Couple of rewordings

RemovingTheMagic

@@ -1 +1 @@
 = Removing the magic =
 
-The "magic-removal" branch aims to make several sweeping changes to the Django codebase. Most changes involve the database API and removing some of its unneeded magic, which confuses newbies and is a bit of a wart.
+The "magic-removal" branch aims to make several sweeping changes to the Django codebase, removing warts that Django has accumulated over the years. Most changes involve the database API and removing some of its unneeded magic, and other changes involve improving the framework's simplicity and usability.
+
+These changes will be integrated into the next Django release, 0.92.
 
 This document explains the changes in the branch.
 
-These changes will be integrated into the next Django release (either 0.91 or 0.92, depending on whether we decide to release a 0.91 as a "middle" release for people who want new features currently in trunk but don't want to wait for magic-removal).
+== How to get the branch ==
+
+Play with it! The branch is available via Subversion at http://code.djangoproject.com/svn/django/branches/magic-removal .
 
 == Models support properties ==
@@ -190 +194 @@
 '''Status: Done'''
 
-You can override any table-level functions, such as {{{get_list()}}} or {{{get_object()}}}. Do this by creating a custom {{{models.Manager}}} subclass and passing it to your model. The term "manager" could be replaced with some other word.
+You can override any table-level functions, such as {{{get_list()}}} or {{{get_object()}}}. Do this by creating a custom {{{models.Manager}}} subclass and passing it to your model.
 
 {{{
@@ -279 +283 @@
 The {{{class META}}} within models should now be {{{class Meta}}}. The latter is nicer on the eyes.
 
+== Moved admin options to 'class Admin' ==
+
+'''Status: Done'''
+
+Instead of {{{admin=meta.Admin}}} in the {{{class META}}}, all admin options are in an inner {{{class Admin}}}.
+
+Old:
+{{{
+#!python
+class Person(meta.Model):
+    first_name = meta.CharField(maxlength=30)
+    last_name = meta.CharField(maxlength=30)
+    class META:
+        admin = meta.Admin(
+            list_display = ('first_name', 'last_name')
+        )
+}}}
+
+New:
+{{{
+#!python
+class Person(models.Model):
+    first_name = models.CharField(maxlength=30)
+    last_name = models.CharField(maxlength=30)
+    class Admin:
+        list_display = ('first_name', 'last_name')
+}}}
+
 == get_object_or_404 and get_list_or_404 now take model classes, not modules ==
 
@@ -324 +356 @@
 }}}
 
-== Move "auth" and "core" models to django.contrib ==
+== Moved "auth" and "core" models to django.contrib ==
 
 '''Status: Done'''
@@ -340 +372 @@
 
  * Old: {{{django.models.core.packages}}}
- * New: {{{django.contrib.contenttypes.models}}} (This will most likely be removed in the future.)
+ * New: {{{django.contrib.contenttypes.models}}} ("Packages" will most likely be removed in the future.)
 
 == Moved Session model and middleware from core to django.contrib ==
@@ -359 +391 @@
 '''Status: Not done yet'''
 
-== Move admin options to 'class Admin' ==
-
-'''Status: Done in [1864]'''
-
-Instead of {{{admin=meta.Admin}}} in the {{{class META}}}, we'll move all admin options into an inner {{{class Admin}}}.
-
 == Database lookup API changes ==
 
@@ -371 +397 @@
 See DescriptorFields, rjwittams' proposal on the API changes.
 
-
 == Namespace Simplification ==