[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pyamf-commits
Subject:    [pyamf-commits] r1809 - in pyamf/branches: .
From:       commits () pyamf ! org (commits () pyamf ! org)
Date:       2008-11-27 20:15:09
Message-ID: 20081127191453.4130F7BC030 () mail ! collab ! com
[Download RAW message or body]

Author: nick
Date: 2008-11-27 20:14:52 +0100 (Thu, 27 Nov 2008)
New Revision: 1809

Added:
   pyamf/branches/messaging-static-attrs-357-2/
Modified:
   pyamf/branches/messaging-static-attrs-357-2/pyamf/adapters/_django_db_models_fields.py
  pyamf/branches/messaging-static-attrs-357-2/pyamf/adapters/_django_db_models_query.py
 Log:
Re-branching to source:pyamf/branches/messaging-static-attrs-357-2

Modified: pyamf/branches/messaging-static-attrs-357-2/pyamf/adapters/_django_db_models_fields.py
 ===================================================================
--- pyamf/trunk/pyamf/adapters/_django_db_models_fields.py	2008-11-25 23:11:33 UTC \
                (rev 1807)
+++ pyamf/branches/messaging-static-attrs-357-2/pyamf/adapters/_django_db_models_fields.py	2008-11-27 \
19:14:52 UTC (rev 1809) @@ -12,7 +12,7 @@
 
 import pyamf
 
-def convert_NOT_PROVIDED(x):
+def convert_NOT_PROVIDED(x, encoder):
     return pyamf.Undefined
 
 pyamf.add_type(lambda x: x is fields.NOT_PROVIDED, convert_NOT_PROVIDED)

Modified: pyamf/branches/messaging-static-attrs-357-2/pyamf/adapters/_django_db_models_query.py
 ===================================================================
--- pyamf/trunk/pyamf/adapters/_django_db_models_query.py	2008-11-25 23:11:33 UTC \
                (rev 1807)
+++ pyamf/branches/messaging-static-attrs-357-2/pyamf/adapters/_django_db_models_query.py	2008-11-27 \
19:14:52 UTC (rev 1809) @@ -15,7 +15,7 @@
 
 import pyamf
 
-def write_queryset(qs):
+def write_queryset(qs, encoder):
     return list(qs)
 
 pyamf.add_type(query.QuerySet, write_queryset)


[prev in list] [next in list] [prev in thread] [next in thread]