[robotframework] r3781 committed - cleanup by pekes suggestions

[robotframework]

Revision: 3781
Author: jussi.ao.malinen
Date: Wed Jun 16 00:14:45 2010
Log: cleanup by pekes suggestions
http://code.google.com/p/robotframework/source/detail?r=3781

Modified:
 /trunk/src/robot/parsing/settings.py

=======================================
--- /trunk/src/robot/parsing/settings.py        Tue Jun 15 08:32:16 2010
+++ /trunk/src/robot/parsing/settings.py        Wed Jun 16 00:14:45 2010
@@ -69,14 +69,6 @@
             ret.extend(self.value)
         return ret

-    def _extend_from_third_position(self, ret, tail):
-        if len(ret) == 2:
-            ret.extend(tail)
-        elif len(ret) == 1:
-            ret.extend([''] + tail)
-        else:
-            raise ValueError('Illegal length %d' % len(ret))
-

 class Documentation(_Setting):

@@ -125,10 +117,10 @@

     def _data_as_list(self):
         ret = [self.setting_name]
-        if self.name:
-            ret.append(self.name)
+        if self.name or self.args:
+            ret.append(self.name if self.name else '')
         if self.args:
-            self._extend_from_third_position(ret, self.args)
+            ret.extend(self.args)
         return ret


@@ -149,10 +141,10 @@

     def _data_as_list(self):
         ret = [self.setting_name]
-        if self.value:
-            ret.append(self.value)
+        if self.value or self.message:
+            ret.append(self.value if self.value else '')
         if self.message:
-            self._extend_from_third_position(ret, [self.message])
+            ret.append(self.message)
         return ret