Changeset 383

Timestamp:

08/04/08 10:52:41 (4 years ago)

Author:

ged

Message:

removed support for the deprecated with_fields syntax

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/__init__.py (modified) (2 diffs)
• elixir/fields.py (modified) (5 diffs)
• elixir/properties.py (modified) (1 diff)
• tests/test_fields.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -9 +9 @@
   underlying constructs
 
+Changes:
+- removed support for the deprecated with_fields syntax
 
 0.6.0 - 2008-07-18

elixir/trunk/elixir/__init__.py

@@ -33 +33 @@
 from elixir.entity import Entity, EntityMeta, EntityDescriptor, \
                           setup_entities, cleanup_entities
-from elixir.fields import has_field, with_fields, Field
+from elixir.fields import has_field, Field
 from elixir.relationships import belongs_to, has_one, has_many, \
                                  has_and_belongs_to_many, \
@@ -45 +45 @@
 
 __all__ = ['Entity', 'EntityMeta', 'EntityCollection', 'entities',
-           'Field', 'has_field', 'with_fields',
+           'Field', 'has_field',
            'has_property', 'GenericProperty', 'ColumnProperty', 'Synonym',
            'belongs_to', 'has_one', 'has_many', 'has_and_belongs_to_many',

elixir/trunk/elixir/fields.py

@@ -3 +3 @@
 entities. Elixir currently supports two syntaxes to do so: the default
 `Attribute-based syntax`_ as well as the has_field_ DSL statement.
-
-Note that the old with_fields_ statement is currently deprecated in favor of
-the `Attribute-based syntax`_.
 
 Attribute-based syntax
@@ -107 +104 @@
         has_field('id', Integer, primary_key=True)
         has_field('name', String(50))
-
-
-with_fields
------------
-The `with_fields` statement is **deprecated** in favor of the `attribute-based
-syntax`_.
-
-It allows you to define all fields of an entity at once.
-Each keyword argument to this statement represents one field, which should
-be a `Field` object. The first argument to a Field object is its type.
-Following it, any number of keyword arguments can be specified for
-additional behavior. The `with_fields` statement supports the same keyword
-arguments than the `has_field` statement.
-
-Here is a quick example of how to use ``with_fields``.
-
-.. sourcecode:: python
-
-    class Person(Entity):
-        with_fields(
-            id = Field(Integer, primary_key=True),
-            name = Field(String(50))
-        )
 '''
 import sys
@@ -148 +122 @@
 
     This class represents a column on the table where the entity is stored.
-    This object is only used with the `with_fields` syntax for defining all
-    fields for an entity at the same time. The `has_field` syntax does not
-    require the manual creation of this object.
     '''
 
@@ -197 +168 @@
             self.property = deferred(self.column, group=group)
         elif self.name != self.colname:
-            # if the property name is different from the column name, we need 
+            # if the property name is different from the column name, we need
             # to add an explicit property (otherwise nothing is needed as it's
             # done automatically by SA)
@@ -219 +190 @@
     field.attach(entity, name)
 
-
-def with_fields_handler(entity, *args, **fields):
-    for name, field in fields.iteritems():
-        field.attach(entity, name)
-
-
 has_field = ClassMutator(has_field_handler)
-with_fields = ClassMutator(with_fields_handler)

elixir/trunk/elixir/properties.py

@@ -154 +154 @@
         super(GenericProperty, self).__init__(*args, **kwargs)
         self.prop = prop
+        #XXX: move this to Property?
         self.args = args
         self.kwargs = kwargs

elixir/trunk/tests/test_fields.py

@@ -45 +45 @@
 
         assert p.surname == 'Simpson'
-
-    def test_with_fields(self):
-        class Person(Entity):
-            with_fields(
-                firstname = Field(String(30)),
-                surname = Field(String(30))
-            )
-
-        setup_all(True)
-
-        homer = Person(firstname="Homer", surname="Simpson")
-        bart = Person(firstname="Bart", surname="Simpson")
-
-        session.commit()
-        session.clear()
-
-        p = Person.get_by(firstname="Homer")
-
-        assert p.surname == 'Simpson'
-