Merge pull request Pylons#70 from aodag/fix.from_deformdemo

Fix.from deformdemo

deform/tests/test_widget.py

@@ -1264,7 +1264,7 @@ def test_serialize_with_sequence_widgets(self):
         field.sequence_fields = [sequence_field]
         result = widget.serialize(field, ['123'])
         self.assertEqual(result, 'abc')
-        subfields = list(renderer.kw['subfields'])
+        subfields = renderer.kw['subfields'])
         self.assertEqual(len(subfields), 1)
         self.assertEqual(subfields[0], ('123', sequence_field))
         self.assertEqual(renderer.kw['field'], field)

deform/widget.py

@@ -1017,7 +1017,7 @@ def serialize(self, field, cstruct, readonly=False):
             # this serialization is being performed as a result of a
             # validation failure (``deserialize`` was previously run)
             assert(len(cstruct) == len(field.sequence_fields))
-            subfields = zip(cstruct, field.sequence_fields)
+            subfields = list(zip(cstruct, field.sequence_fields))
         else:
             # this serialization is being performed as a result of a
             # first-time rendering

setup.py

@@ -20,8 +20,10 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 try:
-    README = open(os.path.join(here, 'README.txt')).read()
-    CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
+    with open(os.path.join(here, 'README.txt')) as f:
+        README = f.read()
+    with open(os.path.join(here, 'CHANGES.txt')) as f:
+        CHANGES = f.read()
 except:
     README = ''
     CHANGES = ''