Changeset 443

Timestamp:

01/14/09 11:12:41 (3 years ago)

Author:

ged

Message:

apply patch from "Secator" to fix py2.6 warnings

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (2 diffs)
• elixir/ext/perform_ddl.py (modified) (2 diffs)
• elixir/properties.py (modified) (1 diff)
• elixir/relationships.py (modified) (1 diff)
• tests/test_m2o.py (modified) (5 diffs)

elixir/trunk/elixir/entity.py

@@ -128 +128 @@
                 tablename = "%s_%s" % (modulename, entity.__name__)
                 self.tablename = tablename.lower()
-        elif callable(self.tablename):
+        elif hasattr(self.tablename, '__call__'):
             self.tablename = self.tablename(entity)
 
@@ -141 +141 @@
                             'polymorphic_identity mapper option at the same '
                             'time.')
-        elif callable(self.identity):
+        elif hasattr(self.identity, '__call__'):
             self.identity = self.identity(entity)
 

elixir/trunk/elixir/ext/perform_ddl.py

@@ -67 +67 @@
     def after_table(self):
         statement = self.statement
-        if callable(statement):
+        if hasattr(statement, '__call__'):
             statement = statement()
         if not isinstance(statement, list):
@@ -94 +94 @@
                 columns = all_columns
             data = self.data
-            if callable(data):
+            if hasattr(data, '__call__'):
                 data = data()
             insert = schema_item.insert()

elixir/trunk/elixir/properties.py

@@ -152 +152 @@
 
     def create_properties(self):
-        if callable(self.prop):
+        if hasattr(self.prop, '__call__'):
             prop_value = self.prop(self.entity.table.c)
         else:

elixir/trunk/elixir/relationships.py

@@ -458 +458 @@
                     'foreign_keys'):
             kwarg = kwargs.get(arg, None)
-            if callable(kwarg):
+            if hasattr(kwarg, '__call__'):
                 kwargs[arg] = kwarg()
 

elixir/trunk/tests/test_m2o.py

@@ -65 +65 @@
         setup_all(True)
 
-        assert A.table.primary_key.columns.has_key('id')
-        assert B.table.columns.has_key('a_id')
+        assert 'id' in A.table.primary_key.columns
+        assert 'a_id' in B.table.columns
 
         a = A()
@@ -112 +112 @@
         setup_all()
 
-        assert A.table.primary_key.columns.has_key('name')
-        assert B.table.primary_key.columns.has_key('a_name')
-        assert C.table.primary_key.columns.has_key('b_a_name')
+        assert 'name' in A.table.primary_key.columns
+        assert 'a_name' in B.table.primary_key.columns
+        assert 'b_a_name' in C.table.primary_key.columns
 
     def test_m2o_is_only_pk(self):
@@ -125 +125 @@
         setup_all()
 
-        assert A.table.primary_key.columns.has_key('id')
-        assert B.table.primary_key.columns.has_key('a_id')
-        assert not B.table.primary_key.columns.has_key('id')
+        assert 'id' in A.table.primary_key.columns
+        assert 'a_id' in B.table.primary_key.columns
+        assert 'id' not in B.table.primary_key.columns
 
     def test_multi_pk_in_target(self):
@@ -144 +144 @@
         setup_all()
 
-        assert A.table.primary_key.columns.has_key('key1')
-        assert A.table.primary_key.columns.has_key('key2')
-
-        assert B.table.primary_key.columns.has_key('num')
-        assert B.table.primary_key.columns.has_key('a_key1')
-        assert B.table.primary_key.columns.has_key('a_key2')
-
-        assert C.table.primary_key.columns.has_key('num')
-        assert C.table.primary_key.columns.has_key('b_num')
-        assert C.table.primary_key.columns.has_key('b_a_key1')
-        assert C.table.primary_key.columns.has_key('b_a_key2')
+        assert 'key1' in A.table.primary_key.columns
+        assert 'key2' in A.table.primary_key.columns
+
+        assert 'num' in B.table.primary_key.columns
+        assert 'a_key1' in B.table.primary_key.columns
+        assert 'a_key2' in B.table.primary_key.columns
+
+        assert 'num' in C.table.primary_key.columns
+        assert 'b_num' in C.table.primary_key.columns
+        assert 'b_a_key1' in C.table.primary_key.columns
+        assert 'b_a_key2' in C.table.primary_key.columns
 
     def test_cycle_but_use_alter(self):
@@ -168 +168 @@
         setup_all()
 
-        assert B.table.primary_key.columns.has_key('a_id')
-        assert C.table.primary_key.columns.has_key('b_a_id')
-        assert A.table.primary_key.columns.has_key('id')
-        assert A.table.columns.has_key('c_b_a_id')
+        assert 'a_id' in B.table.primary_key.columns
+        assert 'b_a_id' in C.table.primary_key.columns
+        assert 'id' in A.table.primary_key.columns
+        assert 'c_b_a_id' in A.table.columns
 
     def test_multi(self):