[robotframework] push by pekka.klarck - parsing.model.Variable: __nonzero__ -> has_data on 2012-08-29 12:50 GMT

[robotframework]

Revision: ebafe2dbd1da
Author:   Pekka Klärck
Date:     Wed Aug 29 05:50:26 2012
Log:      parsing.model.Variable: __nonzero__ -> has_data
http://code.google.com/p/robotframework/source/detail?r=ebafe2dbd1da

Modified:
 /src/robot/parsing/model.py
 /src/robot/variables/variables.py

=======================================
--- /src/robot/parsing/model.py Wed Aug 29 04:32:24 2012
+++ /src/robot/parsing/model.py Wed Aug 29 05:50:26 2012
@@ -464,7 +464,7 @@
         self.comment = Comment(comment)

     def as_list(self):
-        if self:
+        if self.has_data():
             return [self.name] + self.value + self.comment.as_list()
         return self.comment.as_list()

@@ -474,7 +474,7 @@
     def is_for_loop(self):
         return False

-    def __nonzero__(self):
+    def has_data(self):
         return bool(self.name or ''.join(self.value))


=======================================
--- /src/robot/variables/variables.py   Wed Aug 29 02:05:15 2012
+++ /src/robot/variables/variables.py   Wed Aug 29 05:50:26 2012
@@ -262,7 +262,7 @@

     def set_from_variable_table(self, variable_table, overwrite=False):
         for variable in variable_table:
-            if not variable:
+            if not variable.has_data():
                 continue
             try:
                 name, value = self._get_var_table_name_and_value(