Changeset 490 for elixir/trunk/elixir

Timestamp:

10/02/09 12:06:14 (3 years ago)

Author:

ged

Message:

Dropped support for python 2.3, SQLAlchemy 0.4 and deprecated stuff from Elixir
0.7

Location:

elixir/trunk/elixir

Files:

• __init__.py (modified) (1 diff)
• collection.py (modified) (2 diffs)
• entity.py (modified) (9 diffs)
• ext/list.py (deleted)
• options.py (modified) (2 diffs)
• py23compat.py (deleted)
• relationships.py (modified) (4 diffs)

elixir/trunk/elixir/__init__.py

@@ -86 +86 @@
     '''Setup the table and mapper of all entities in the default entity
     collection.
-
-    This is called automatically if any entity of the collection is configured
-    with the `autosetup` option and it is first accessed,
-    instanciated (called) or the create_all method of a metadata containing
-    tables from any of those entities is called.
     '''
     setup_entities(entities)

elixir/trunk/elixir/collection.py

@@ -3 +3 @@
 '''
 import sys
-
-from elixir.py23compat import rsplit
 
 # default entity collection
@@ -33 +31 @@
         "source" entity when resolving relationship targets.
         '''
-        path = rsplit(key, '.', 1)
+        path = key.rsplit('.', 1)
         classname = path.pop()
         if path:

elixir/trunk/elixir/entity.py

@@ -3 +3 @@
 ``EntityMeta``.
 '''
-
-from py23compat import sorted
 
 import sys
@@ -499 +497 @@
             self.has_pk = True
 
-        # Autosetup triggers shouldn't be active anymore at this point, so we
-        # can theoretically access the entity's table safely. But the problem
-        # is that if, for some reason, the trigger removal phase didn't
-        # happen, we'll get an infinite loop. So we just make sure we don't
-        # get one in any case.
-        table = type.__getattribute__(self.entity, 'table')
+        table = self.entity.table
         if table is not None:
             if check_duplicate and col.key in table.columns.keys():
@@ -691 +684 @@
 
 
-class TriggerProxy(object):
-    """
-    A class that serves as a "trigger" ; accessing its attributes runs
-    the setup_all function.
-
-    Note that the `setup_all` is called on each access of the attribute.
-    """
-
-    def __init__(self, class_, attrname):
-        self.class_ = class_
-        self.attrname = attrname
-
-    def __getattr__(self, name):
-        elixir.setup_all()
-        #FIXME: it's possible to get an infinite loop here if setup_all doesn't
-        #remove the triggers for this entity. This can happen if the entity is
-        #not in the `entities` list for some reason.
-        proxied_attr = getattr(self.class_, self.attrname)
-        return getattr(proxied_attr, name)
-
-    def __repr__(self):
-        proxied_attr = getattr(self.class_, self.attrname)
-        return "<TriggerProxy (%s)>" % (self.class_.__name__)
-
-
-class TriggerAttribute(object):
-
-    def __init__(self, attrname):
-        self.attrname = attrname
-
-    def __get__(self, instance, owner):
-        #FIXME: it's possible to get an infinite loop here if setup_all doesn't
-        #remove the triggers for this entity. This can happen if the entity is
-        #not in the `entities` list for some reason.
-        elixir.setup_all()
-        return getattr(owner, self.attrname)
-
 def is_entity(cls):
     """
@@ -774 +730 @@
         prop.attach(cls, name)
 
-    # Process mutators. Needed before _install_autosetup_triggers so that
-    # we know of the metadata (and whether the entity is autosetuped or not).
+    # Process mutators
     process_mutators(cls)
 
     # setup misc options here (like tablename etc.)
     desc.setup_options()
-
-    # create trigger proxies
-    # TODO: support entity_name... It makes sense only for autoloaded
-    # tables for now, and would make more sense if we support "external"
-    # tables
-    if desc.autosetup:
-        _install_autosetup_triggers(cls)
 
 
@@ -808 +756 @@
         instrument_class(cls)
 
-    def __call__(cls, *args, **kwargs):
-        if cls._descriptor.autosetup and not hasattr(cls, '_setup_done'):
-            elixir.setup_all()
-        return type.__call__(cls, *args, **kwargs)
-
     def __setattr__(cls, key, value):
         if isinstance(value, Property):
@@ -824 +767 @@
 
 
-def _install_autosetup_triggers(cls, entity_name=None):
-    #TODO: move as much as possible of those "_private" values to the
-    # descriptor, so that we don't mess the initial class.
-    warnings.warn("The 'autosetup' option on entities is deprecated. "
-        "Please call setup_all() manually after all your entities have been "
-        "declared.", DeprecationWarning, stacklevel=4)
-    tablename = cls._descriptor.tablename
-    schema = cls._descriptor.table_options.get('schema', None)
-    cls._table_key = sqlalchemy.schema._get_table_key(tablename, schema)
-
-    table_proxy = TriggerProxy(cls, 'table')
-
-    md = cls._descriptor.metadata
-    md.tables[cls._table_key] = table_proxy
-
-    # We need to monkeypatch the metadata's table iterator method because
-    # otherwise it doesn't work if the setup is triggered by the
-    # metadata.create_all().
-    # This is because ManyToMany relationships add tables AFTER the list
-    # of tables that are going to be created is "computed"
-    # (metadata.tables.values()).
-    # see:
-    # - table_iterator method in MetaData class in sqlalchemy/schema.py
-    # - visit_metadata method in sqlalchemy/ansisql.py
-    if SA05orlater:
-        warnings.warn(
-            "The automatic setup via metadata.create_all() through "
-            "the autosetup option doesn't work with SQLAlchemy 0.5 and later!")
-    else:
-        # SA 0.6 does not use table_iterator anymore (it was already deprecated
-        # since SA 0.5.0)
-        original_table_iterator = md.table_iterator
-        if not hasattr(original_table_iterator,
-                       '_non_elixir_patched_iterator'):
-            def table_iterator(*args, **kwargs):
-                elixir.setup_all()
-                return original_table_iterator(*args, **kwargs)
-            table_iterator.__doc__ = original_table_iterator.__doc__
-            table_iterator._non_elixir_patched_iterator = \
-                original_table_iterator
-            md.table_iterator = table_iterator
-
-    #TODO: we might want to add all columns that will be available as
-    #attributes on the class itself (in SA 0.4+). This is a pretty
-    #rare usecase, as people will normally hit the query attribute before the
-    #column attributes, but I've seen people hitting this problem...
-    for name in ('c', 'table', 'mapper', 'query'):
-        setattr(cls, name, TriggerAttribute(name))
-
-    cls._has_triggers = True
-
-
-def _cleanup_autosetup_triggers(cls):
-    if not hasattr(cls, '_has_triggers'):
-        return
-
-    for name in ('table', 'mapper'):
-        setattr(cls, name, None)
-
-    for name in ('c', 'query'):
-        delattr(cls, name)
-
-    desc = cls._descriptor
-    md = desc.metadata
-
-    # the fake table could have already been removed (namely in a
-    # single table inheritance scenario)
-    md.tables.pop(cls._table_key, None)
-
-    # restore original table iterator if not done already
-    if not SA05orlater:
-        if hasattr(md.table_iterator, '_non_elixir_patched_iterator'):
-            md.table_iterator = \
-                md.table_iterator._non_elixir_patched_iterator
-
-    del cls._has_triggers
-
-
 def setup_entities(entities):
     '''Setup all entities in the list passed as argument'''
@@ -912 +777 @@
             if isinstance(attr, Property):
                 delattr(entity, name)
-
-        if entity._descriptor.autosetup:
-            _cleanup_autosetup_triggers(entity)
 
     for method_name in (
@@ -940 +802 @@
     """
     Try to revert back the list of entities passed as argument to the state
-    they had just before their setup phase. It will not work entirely for
-    autosetup entities as we need to remove the autosetup triggers.
+    they had just before their setup phase.
 
     As of now, this function is *not* functional in that it doesn't revert to
@@ -953 +814 @@
     for entity in entities:
         desc = entity._descriptor
-        if desc.autosetup:
-            _cleanup_autosetup_triggers(entity)
 
         if hasattr(entity, '_setup_done'):

elixir/trunk/elixir/options.py

@@ -116 +116 @@
 |                     | that module.                                          |
 +---------------------+-------------------------------------------------------+
-| ``autosetup``       | DEPRECATED. Specify whether that entity will contain  |
-|                     | automatic setup triggers.                             |
-|                     | That is if this entity will be                        |
-|                     | automatically setup (along with all other entities    |
-|                     | which were already declared) if any of the following  |
-|                     | condition happen: some of its attributes are accessed |
-|                     | ('c', 'table', 'mapper' or 'query'), instanciated     |
-|                     | (called) or the create_all method of this entity's    |
-|                     | metadata is called. Defaults to ``False``.            |
-+---------------------+-------------------------------------------------------+
 | ``allowcoloverride``| Specify whether it is allowed to override columns.    |
 |                     | By default, Elixir forbids you to add a column to an  |
@@ -214 +204 @@
 #
 options_defaults = dict(
-    autosetup=False,
     inheritance='single',
     polymorphic=True,

elixir/trunk/elixir/relationships.py

@@ -303 +303 @@
 | ``table_kwargs``   | A dictionary holding any other keyword argument you    |
 |                    | might want to pass to the underlying Table object.     |
-+--------------------+--------------------------------------------------------+| ``column_format``  | DEPRECATED. Specify an alternate format string for     |
-|                    | naming the                                             |
-|                    | columns in the mapping table.  The default value is    |
-|                    | defined in ``elixir.options.M2MCOL_NAMEFORMAT``.  You  |
-|                    | will be passed ``tablename``, ``key``, and ``entity``  |
-|                    | as arguments to the format string.                     |
 +--------------------+--------------------------------------------------------+
 
@@ -839 +833 @@
                  ondelete=None, onupdate=None,
                  table=None, schema=None,
-                 column_format=None,
                  filter=None,
                  table_kwargs=None,
@@ -858 +851 @@
         self.schema = schema
 
-        if column_format:
-            warnings.warn("The 'column_format' argument on ManyToMany "
-                "relationships is deprecated. Please use the 'local_colname' "
-                "and/or 'remote_colname' arguments if you want custom "
-                "column names for this table only, or modify "
-                "options.M2MCOL_NAMEFORMAT if you want a custom format for "
-                "all ManyToMany tables", DeprecationWarning, stacklevel=3)
-        self.column_format = column_format or options.M2MCOL_NAMEFORMAT
+        #TODO: this can probably be simplified/moved elsewhere since the
+        #argument disappeared
+        self.column_format = options.M2MCOL_NAMEFORMAT
         if not hasattr(self.column_format, '__call__'):
             # we need to store the format in a variable so that the
@@ -890 +878 @@
 
         super(ManyToMany, self).__init__(of_kind, *args, **kwargs)
-
-    def get_table(self):
-        warnings.warn("The secondary_table attribute on ManyToMany objects is "
-                      "deprecated. You should rather use the table attribute.",
-                      DeprecationWarning, stacklevel=2)
-        return self.table
-    secondary_table = property(get_table)
 
     def match_type_of(self, other):