[Lxml-checkins] r39380 - in lxml/trunk/src/lxml: . tests

[scoder at codespeak.net]

Author: scoder
Date: Sun Feb 25 11:55:22 2007
New Revision: 39380

Modified:
   lxml/trunk/src/lxml/etree.pyx
   lxml/trunk/src/lxml/tests/test_elementtree.py
Log:
fixes for Element.attrib.update() and tests

Modified: lxml/trunk/src/lxml/etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/etree.pyx	(original)
+++ lxml/trunk/src/lxml/etree.pyx	Sun Feb 25 11:55:22 2007
@@ -1376,9 +1376,9 @@
 
     def update(self, sequence_or_dict):
         if isinstance(sequence_or_dict, dict):
-            sequence_or_dict = dict.iteritems()
-        for name, value in sequence_or_dict:
-            self[name] = value
+            sequence_or_dict = sequence_or_dict.iteritems()
+        for key, value in sequence_or_dict:
+            _setAttributeValue(self._element, key, value)
 
     # ACCESSORS
     def __repr__(self):

Modified: lxml/trunk/src/lxml/tests/test_elementtree.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_elementtree.py	(original)
+++ lxml/trunk/src/lxml/tests/test_elementtree.py	Sun Feb 25 11:55:22 2007
@@ -295,54 +295,54 @@
         
         root = XML('<doc alpha="Alpha" beta="Beta"/>')
         items = root.attrib.items()
-        values.sort()
+        items.sort()
         self.assertEquals(
             [('alpha', 'Alpha'), ('beta', 'Beta')],
-            values)
+            items)
 
         root.attrib.update({'alpha' : 'test', 'gamma' : 'Gamma'})
 
         items = root.attrib.items()
-        values.sort()
+        items.sort()
         self.assertEquals(
-            [('alpha', 'test'), ('beta', 'Beta'), ('gamma' : 'Gamma')],
-            values)
+            [('alpha', 'test'), ('beta', 'Beta'), ('gamma', 'Gamma')],
+            items)
 
     def test_attribute_update_sequence(self):
         XML = self.etree.XML
         
         root = XML('<doc alpha="Alpha" beta="Beta"/>')
         items = root.attrib.items()
-        values.sort()
+        items.sort()
         self.assertEquals(
             [('alpha', 'Alpha'), ('beta', 'Beta')],
-            values)
+            items)
 
         root.attrib.update({'alpha' : 'test', 'gamma' : 'Gamma'}.items())
 
         items = root.attrib.items()
-        values.sort()
+        items.sort()
         self.assertEquals(
-            [('alpha', 'test'), ('beta', 'Beta'), ('gamma' : 'Gamma')],
-            values)
+            [('alpha', 'test'), ('beta', 'Beta'), ('gamma', 'Gamma')],
+            items)
 
     def test_attribute_update_iter(self):
         XML = self.etree.XML
         
         root = XML('<doc alpha="Alpha" beta="Beta"/>')
         items = root.attrib.items()
-        values.sort()
+        items.sort()
         self.assertEquals(
             [('alpha', 'Alpha'), ('beta', 'Beta')],
-            values)
+            items)
 
         root.attrib.update({'alpha' : 'test', 'gamma' : 'Gamma'}.iteritems())
 
         items = root.attrib.items()
-        values.sort()
+        items.sort()
         self.assertEquals(
-            [('alpha', 'test'), ('beta', 'Beta'), ('gamma' : 'Gamma')],
-            values)
+            [('alpha', 'test'), ('beta', 'Beta'), ('gamma', 'Gamma')],
+            items)
 
     def test_attribute_keys(self):
         XML = self.etree.XML