Changeset 119

Timestamp:

06/08/07 10:28:46 (6 years ago)

Author:

ged

Message:

- Made EntityMeta public, so that people can actually define their own base

class (I thought I already made this possible but it seems like not).

- Removed all all declarations from subpackages as they are IMHO useless

since we can't get to them from outside of the lib, consequently replaced
all the "from xyz import *" lines in init.py by explicit imports.

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/__init__.py (modified) (2 diffs)
• elixir/entity.py (modified) (2 diffs)
• elixir/fields.py (modified) (1 diff)
• elixir/options.py (modified) (1 diff)
• elixir/relationships.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -1 +1 @@
 0.4.0
+- Added ext sub-package for additional Elixir statements.
 - Added ext.associable for generating polymorphic associations with Elixir
   Statements. (Many thanks to Mike Bayer for his support on writing this.)
-- Added ext sub-package for additional Elixir statements.
 - Added default __init__ method on entities so that subclasses can override it
   and still have the "set attribute by keyword" behavior by calling super()
 - Added .q property on the metaclass, so that you can get a query on an entity
   by just using Entity.q, instead of using Entity.query()
+- Made EntityMeta public, so that people can actually define their own base 
+  class.
 - Fixed relationships to tables using a schema (Patch by Neil Blakey-Milner)
 

elixir/trunk/elixir/__init__.py

@@ -19 +19 @@
 import sqlalchemy
 
-from sqlalchemy.ext.sessioncontext  import SessionContext
-from sqlalchemy.types               import *
-from elixir.options                 import *
-from elixir.entity                  import Entity, EntityDescriptor
-from elixir.fields                  import *
-from elixir.relationships           import *
+from sqlalchemy.ext.sessioncontext import SessionContext
+from sqlalchemy.types import *
+
+from elixir.options import using_options, using_table_options, \
+                           using_mapper_options, options_defaults
+from elixir.entity import Entity, EntityMeta, EntityDescriptor
+from elixir.fields import has_field, with_fields, Field
+from elixir.relationships import belongs_to, has_one, has_many, \
+                                 has_and_belongs_to_many
 
 try:
@@ -33 +36 @@
 __version__ = '0.3.0'
 
-__all__ = ['Entity', 'Field', 'has_field', 'with_fields',
+__all__ = ['Entity', 'EntityMeta', 'Field', 'has_field', 'with_fields',
            'belongs_to', 'has_one', 'has_many', 'has_and_belongs_to_many',
            'using_options', 'using_table_options', 'using_mapper_options',

elixir/trunk/elixir/entity.py

@@ -18 +18 @@
 import elixir
 
-
-__all__ = ['Entity']
-
-__pudge_all__ = __all__
+__pudge_all__ = ['Entity', 'EntityMeta']
 
 DEFAULT_AUTO_PRIMARYKEY_NAME = "id"
@@ -296 +293 @@
 class EntityMeta(type):
     """
-    Entity meta class.
+    Entity meta class. 
+    You should only use this if you want to define your own base class for your
+    entities (ie you don't want to use the provided 'Entity' class).
     """
 

elixir/trunk/elixir/fields.py

@@ -77 +77 @@
 from elixir.statements      import Statement
 
-__all__ = ['has_field', 'with_fields', 'Field']
-
 __pudge_all__ = ['Field']
 

elixir/trunk/elixir/options.py

@@ -112 +112 @@
 from elixir.statements import Statement
 
-__all__ = ['using_options', 'using_table_options', 'using_mapper_options',
-           'options_defaults']
-
 __pudge_all__ = ['options_defaults']
 

elixir/trunk/elixir/relationships.py

@@ -198 +198 @@
 import sys
 
-
-__all__ = ['belongs_to', 'has_one', 'has_many', 'has_and_belongs_to_many']
-
 __pudge_all__ = []