[Python-modules-commits] [python-pyld] 08/276: Changed framing so null will not be auto-included in arrays.

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-pyld.

commit e86ea6749c16fcc67a2a66b3d60f9391e4459338
Author: Dave Longley <dlongley at digitalbazaar.com>
Date:   Fri Jul 29 14:38:00 2011 -0400

    Changed framing so null will not be auto-included in arrays.
---
 lib/pyld/jsonld.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pyld/jsonld.py b/lib/pyld/jsonld.py
index 64381ad..fb63703 100644
--- a/lib/pyld/jsonld.py
+++ b/lib/pyld/jsonld.py
@@ -1579,9 +1579,9 @@ def _frame(subjects, input, frame, embeds, options):
                                 tmp = []
                                 for v in value[key]:
                                     if v is None:
-                                        if omitOn:
-                                            tmp.append((f['@default'] if
-                                                '@default' in f else None))
+                                        # do not auto-include null in arrays
+                                        if not omitOn and '@default' in f:
+                                            tmp.append(f['@default'])
                                     else:
                                         tmp.append(v)
                                 value[key] = tmp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pyld.git