Changeset 70

Timestamp:

02/22/07 09:30:26 (6 years ago)

Author:

ged

Message:

Applied patch from Robin Munn to make the code python 2.3 compatible

Location:

elixir/trunk

Files:

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

elixir/trunk/CHANGES

@@ -1 +1 @@
 0.1.1
+- Applied patch from Robin Munn to make the code python 2.3 compatible
 - Per a suggestion on the mailing list, look at the calling stack frame to
   ensure that we apply statements to the proper class.  We now attach the

elixir/trunk/elixir/__init__.py

@@ -25 +25 @@
 from elixir.fields                  import *
 from elixir.relationships           import *
+
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 __all__ = ['Entity', 'Field', 'has_field', 'with_fields', 

elixir/trunk/elixir/entity.py

@@ -8 +8 @@
 from elixir.fields                  import Field
 from elixir.options                 import options_defaults
+
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 import sys
@@ -263 +268 @@
         return res
 
-    @classmethod
     def setup_relationships(cls):
         for relationship in list(EntityDescriptor.uninitialized_rels):
             if relationship.setup():
                 EntityDescriptor.uninitialized_rels.remove(relationship)
+    setup_relationships = classmethod(setup_relationships)
 
 

elixir/trunk/elixir/fields.py

@@ -80 +80 @@
         self.kwargs = kwargs
     
-    @property
     def column(self):
         '''
@@ -90 +89 @@
                                   *self.args, **self.kwargs)
         return self._column
+    column = property(column)
 
 

elixir/trunk/elixir/relationships.py

@@ -235 +235 @@
         return True
     
-    @property
     def target(self):
         if not self._target:
@@ -264 +263 @@
         
         return self._target
-    
-    @property
+    target = property(target)
+    
     def inverse(self):
         if not self._inverse:
@@ -288 +287 @@
         
         return self._inverse
+    inverse = property(inverse)
     
     def match_type_of(self, other):

elixir/trunk/elixir/statements.py

@@ -24 +24 @@
         statements.append((self, args, kwargs))
         
-    @classmethod
     def process(cls, entity):
         '''
@@ -33 +32 @@
         for statement, args, kwargs in getattr(entity, STATEMENTS):
             statement.target(entity, *args, **kwargs)
+    process = classmethod(process)