Changeset 5275

Timestamp:

05/17/07 10:14:09 (1 year ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: Merged to [5274]

Files:

• django/branches/boulder-oracle-sprint/django/newforms/extras/widgets.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/newforms/fields.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/newforms/forms.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/newforms/models.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/newforms/util.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/newforms/widgets.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/docs/contributing.txt (modified) (2 diffs)

django/branches/boulder-oracle-sprint/django/newforms/extras/widgets.py

@@ -3 +3 @@
-"""
-
+import datetime
+
-from django.newforms.widgets import Widget, Select
-from django.utils.dates import MONTHS
-import datetime
-
-__all__ = ('SelectDateWidget',)

django/branches/boulder-oracle-sprint/django/newforms/fields.py

@@ -3 +3 @@
-"""
-
-from django.utils.translation import gettext
-from django.utils.encoding import smart_unicode
-from util import ErrorList, ValidationError
-from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple
-import datetime
-import re
-import time
+
+from django.utils.translation import gettext
+from django.utils.encoding import smart_unicode
+
+from util import ErrorList, ValidationError
+from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple
-
-__all__ = (

django/branches/boulder-oracle-sprint/django/newforms/forms.py

@@ -3 +3 @@
-"""
-
-
+
+
+
-from django.utils.html import escape
-from django.utils.encoding import StrAndUnicode
+
-from fields import Field
-, HiddenInput, MultipleHiddenInput
+
-from util import flatatt, ErrorDict, ErrorList, ValidationError
-import copy
-
-__all__ = ('BaseForm', 'Form')

django/branches/boulder-oracle-sprint/django/newforms/models.py

@@ -5 +5 @@
-
-from django.utils.translation import gettext
+
-from util import ValidationError
-DeclarativeFieldsMetaclass, 
+
-from fields import Field, ChoiceField
-from widgets import Select, SelectMultiple, MultipleHiddenInput
-
-
-
+
+
+
+
-
-def save_instance(form, instance, fields=None, fail_message='saved', commit=True):

django/branches/boulder-oracle-sprint/django/newforms/util.py

@@ -1 @@
-from django.conf import settings
-from django.utils.html import escape
-from django.utils.functional import Promise, lazy
-from django.utils.encoding import smart_unicode
-

django/branches/boulder-oracle-sprint/django/newforms/widgets.py

@@ -3 +3 @@
-"""
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-from django.utils.datastructures import MultiValueDict
-from django.utils.html import escape
-from django.utils.translation import gettext
-from django.utils.encoding import StrAndUnicode, smart_unicode
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-class Widget(object):

django/branches/boulder-oracle-sprint/docs/contributing.txt

@@ -280 +280 @@
-      for details.
-
-    * In Django template code, put one (and only one) space between the curly
-      brackets and the tag contents.
-
-      Do this::
-
-          {{ foo }}
-
-      Don't do this::
-
-          {{foo}}
-
-    * In Django views, the first parameter in a view function should be called
-      ``request``.
-
-      Do this::
-
-          def my_view(request, foo):
-              # ...
-
-      Don't do this::
-
-          def my_view(req, foo):
-              # ...
-
-    * Please don't put your name in the code you contribute. Our policy is to
-      keep contributors' names in the ``AUTHORS`` file distributed with Django
@@ -309 +285 @@
-      change to the ``AUTHORS`` file in your patch if you make more than a
-      single trivial change.
+
+Template style
+--------------
+
+    * In Django template code, put one (and only one) space between the curly
+      brackets and the tag contents.
+
+      Do this::
+
+          {{ foo }}
+
+      Don't do this::
+
+          {{foo}}
+
+View style
+----------
+
+    * In Django views, the first parameter in a view function should be called
+      ``request``.
+
+      Do this::
+
+          def my_view(request, foo):
+              # ...
+
+      Don't do this::
+
+          def my_view(req, foo):
+              # ...
+
+Model style
+-----------
+
+    * Field names should be all lowercase, using underscores instead of
+      camelCase.
+
+      Do this::
+
+          class Person(models.Model):
+              first_name = models.CharField(maxlength=20)
+              last_name = models.CharField(maxlength=40)
+
+      Don't do this::
+
+          class Person(models.Model):
+              FirstName = models.CharField(maxlength=20)
+              Last_Name = models.CharField(maxlength=40)
+
+    * The ``class Meta`` should appear *after* the fields are defined, with
+      a single blank line separating the fields and the class definition.
+
+      Do this::
+
+          class Person(models.Model):
+              first_name = models.CharField(maxlength=20)
+              last_name = models.CharField(maxlength=40)
+
+              class Meta:
+                  verbose_name_plural = 'people'
+
+      Don't do this::
+
+          class Person(models.Model):
+              first_name = models.CharField(maxlength=20)
+              last_name = models.CharField(maxlength=40)
+              class Meta:
+                  verbose_name_plural = 'people'
+
+      Don't do this, either::
+
+          class Person(models.Model):
+              class Meta:
+                  verbose_name_plural = 'people'
+
+              first_name = models.CharField(maxlength=20)
+              last_name = models.CharField(maxlength=40)
+
+    * The order of model inner classes and standard methods should be as
+      follows (noting that these are not all required):
+
+        * All database fields
+        * ``class Meta``
+        * ``class Admin``
+        * ``def __str__()``
+        * ``def save()``
+        * ``def get_absolute_url()``
+        * Any custom methods
+
+    * If ``choices`` is defined for a given model field, define the choices as
+      a tuple of tuples, with an all-uppercase name, either near the top of the
+      model module or just above the model class. Example::
+
+          GENDER_CHOICES = (
+              ('M', 'Male'),
+              ('F', 'Female'),
+          )
-
-Committing code