Changeset 7494

Timestamp:

11/20/06 17:51:35 (2 years ago)

Author:

liori

Message:

Use iterators, better for memory usage.

Location:

trunk/src

Files:

• common/dataforms.py (modified) (5 diffs)
• common/xmpp/simplexml.py (modified) (1 diff)
• dataforms_widget.py (modified) (1 diff)

trunk/src/common/dataforms.py

@@ -49 +49 @@
 def ExtendField(node):
         ''' Helper function to extend a node to field of appropriate type. '''
-        # TODO: move the dict out
+        # when validation (XEP-122) will go in, we could have another classes
+        # like DateTimeField - so that dicts in Field() and ExtendField() will
+        # be different...
         typ=node.getAttr('type')
         f = {
@@ -217 +219 @@
 
         def iter_options(self):
-                for element in self.getTags('option'):  # TODO: iter!
+                for element in self.iterTags('option'):
                         v = element.getTagData('value')
                         if v is None: raise WrongFieldValue
@@ -255 +257 @@
                 def fget(self):
                         value = u''
-                        for element in self.getTags('value'):   # TODO: iter!
+                        for element in self.iterTags('value'):
                                 value += '\n' + element.getData()
                         return value[1:]
@@ -283 +285 @@
                         # fields into DataField objects
                         if fields is None:
-                                for field in self.getTags('field'): # TODO: iter!
+                                for field in self.iterTags('field'):
                                         if not isinstance(field, DataField):
                                                 ExtendField(field)
@@ -311 +313 @@
                 ''' Iterate over fields in this record. Do not take associated
                 into account. '''
-                for field in self.getTags('field'):     # TODO: iter!
+                for field in self.iterTags('field'):
                         yield field
 

trunk/src/common/xmpp/simplexml.py

@@ -201 +201 @@
                                         if not node.attrs.has_key(key) or \
                                                 node.attrs[key]!=attrs[key]: break
-                                        else:
-                                                yield node
+                                else:
+                                        yield node
 
         def setAttr(self, key, val):

trunk/src/dataforms_widget.py

@@ -77 +77 @@
                                 instructions = _('This is result of query.')
                         else:
-                                # form is writable (TODO: move that to build_*_data_form()?
+                                # form is writable (TODO: move that to build_*_data_form()?)
                                 if isinstance(dataform, dataforms.SimpleDataForm):
                                         instructions = _('Fill in the form.')