enaml/core/dynamicscope.py

@@ -48,11 +48,11 @@ def keys(self):
         return iter(self)
 
     def values(self):
-        return tuple(self[key] for key in self)
+        return (self[key] for key in self)
 
     def items(self):
-        return tuple((key, self[key]) for key in self)
+        return ((key, self[key]) for key in self)
 
-    def update(self, value):
-        for key, value in value.items():
+    def update(self, state):
+        for key, value in state.items():
             self[key] = value

enaml/src/dynamicscope.cpp

@@ -787,7 +787,7 @@ DynamicScope_contains( DynamicScope* self, PyObject* key )
 
 PyObject* DynamicScope_get_owner( DynamicScope* self )
 {
-    return cppy::incref(self->owner );
+    return cppy::incref( self->owner );
 }
 
 
@@ -799,25 +799,25 @@ PyObject* DynamicScope_get_change( DynamicScope* self )
 
 PyObject* DynamicScope_get_f_locals( DynamicScope* self )
 {
-    return cppy::incref(self->f_locals );
+    return cppy::incref( self->f_locals );
 }
 
 
 PyObject* DynamicScope_get_f_globals( DynamicScope* self )
 {
-    return cppy::incref(self->f_globals );
+    return cppy::incref( self->f_globals );
 }
 
 
 PyObject* DynamicScope_get_f_builtins( DynamicScope* self )
 {
-    return cppy::incref(self->f_builtins );
+    return cppy::incref( self->f_builtins );
 }
 
 
 PyObject* DynamicScope_get_f_writes( DynamicScope* self )
 {
-    return cppy::incref(self->f_writes ? self->f_writes : Py_None );
+    return cppy::incref( self->f_writes ? self->f_writes : Py_None );
 }
 
 static PyGetSetDef
@@ -826,7 +826,7 @@ DynamicScope_getset[] = {
     { "_change", ( getter )DynamicScope_get_change, 0, "Get change." },
     { "_f_locals", ( getter )DynamicScope_get_f_locals, 0, "Get f_locals." },
     { "_f_globals", ( getter )DynamicScope_get_f_globals, 0, "Get f_globals." },
-    { "_f_builtins", ( getter )DynamicScope_get_f_builtins, 0, "Get f_builtins."},
+    { "_f_builtins", ( getter )DynamicScope_get_f_builtins, 0, "Get f_builtins." },
     { "_f_writes", ( getter )DynamicScope_get_f_writes, 0, "Get f_writes." },
     { 0 } // sentinel
 };

tests/core/test_dynamicscope.py

@@ -286,7 +286,7 @@ def test_dynamicscope_mapping(dynamicscope):
     owner.__class__.non_data_key_raise.should_raise = False
 
     parent = owner._parent
-    values = dynamicscope.values()
+    values = list(dynamicscope.values())
     for v in (0, 1, 2, 3, 5, owner, change, parent):
         assert v in values