minor changes.

plq · plq · commit 9a0b607d8a57 · 2012-10-02T01:33:32.000+01:00
diff --git a/spyne/protocol/http.py b/spyne/protocol/http.py
@@ -110,10 +110,10 @@ def deserialize(self, ctx, message):
 
         if ctx.descriptor.in_header:
             ctx.in_header = self.flat_dict_to_object(ctx.in_header_doc,
-                                                    ctx.descriptor.in_header)
+                                      ctx.descriptor.in_header, self.validator)
         if ctx.descriptor.in_message:
             ctx.in_object = self.flat_dict_to_object(ctx.in_body_doc,
-                                                    ctx.descriptor.in_message)
+                                      ctx.descriptor.in_message, self.validator)
 
         self.event_manager.fire_event('after_deserialize', ctx)
 
diff --git a/spyne/test/model/test_complex.py b/spyne/test/model/test_complex.py
@@ -414,7 +414,7 @@ class CCM(ComplexModel):
 
         val = CCM(i=5, s='a', c=CM(i=7, s='b'))
 
-        d = DictObject().object_to_flat_dict(CCM, val)
+        d = DictObject.object_to_flat_dict(CCM, val)
 
         assert d['i'] == 5
         assert d['s'] == 'a'
diff --git a/spyne/test/protocol/test_soap.py b/spyne/test/protocol/test_soap.py
diff --git a/spyne/test/protocol/test_xml.py b/spyne/test/protocol/test_xml.py
diff --git a/spyne/test/test_soft_validation.py b/spyne/test/test_soft_validation.py
@@ -123,7 +123,6 @@ def __get_ctx(self, mn, qs):
         return ctx
 
     def test_http_rpc(self):
-
         ctx = self.__get_ctx('some_method', 's=1')
         self.assertEquals(ctx.in_error.faultcode, 'Client.ValidationError')
 
diff --git a/spyne/test/test_sqlalchemy.py b/spyne/test/test_sqlalchemy.py
@@ -509,7 +509,7 @@ class SomeClass(TableModel):
             __tablename__ = 'some_class'
             __table_args__ = {"sqlite_autoincrement": True}
 
-            id = Integer32(primary_key=True)
+            id = Integer32
             others = Array(SomeOtherClass, store_as='xml')
 
         get_sqlalchemy_table(SomeClass)
diff --git a/spyne/util/sqlalchemy.py b/spyne/util/sqlalchemy.py
@@ -39,7 +39,7 @@
 
 from sqlalchemy.dialects.postgresql import FLOAT
 from sqlalchemy.dialects.postgresql import DOUBLE_PRECISION
-from sqlalchemy.dialects.postgresql import PGUuid
+from sqlalchemy.dialects.postgresql.base import PGUuid
 
 from sqlalchemy.ext.compiler import compiles
 
@@ -181,7 +181,10 @@ def get_sqlalchemy_type(cls):
     elif issubclass(cls, Uuid):
         return PGUuid
 
+
 def get_pk_columns(cls):
+    """Return primary key fields of a Spyne object."""
+
     retval = []
     for k, v in cls._type_info.items():
         if v.Attributes.sqla_column_args[-1].get('primary_key', False):
@@ -206,9 +209,10 @@ def _get_col_o2o(k, v):
     return Column(fk_col_name, pk_sqla_type, fk)
 
 def _get_col_o2m(cls):
-    """Gets parent class, key and child type and returns a column that points to
-    the primary key of the parent.
+    """Gets the parent class and returns a column that points to the primary key
+    of the parent.
     """
+
     # get pkeys from current class
     pk_column, = get_pk_columns(cls) # FIXME: Support multi-col keys
 
@@ -224,6 +228,9 @@ def _get_col_o2m(cls):
     return col
 
 def _get_cols_m2m(cls, k, v):
+    """Gets the parent and child classes and returns foreign keys to both
+    tables. These columns can be used to create a relation table."""
+
     child, = v._type_info.values()
     return _get_col_o2m(cls), _get_col_o2o(k, child)
 
