Revision: 3447
Author: KariHusa
Date: Mon May 24 23:59:49 2010
Log: User correct ternary operator instead of incorrectly implemented hack
http://code.google.com/p/robotframework/source/detail?r=3447
Modified:
/trunk/src/robot/running/model.py
=======================================
--- /trunk/src/robot/running/model.py Mon May 24 07:26:21 2010
+++ /trunk/src/robot/running/model.py Mon May 24 23:59:49 2010
@@ -277,8 +277,8 @@
def _get_tags(self, tc_data):
force_tags = self._get_parent_force_tags(tc_data.parent.parent)
- tc_tags = tc_data.tags.is_set() and tc_data.tags.value or \
- tc_data.parent.parent.setting_table.default_tags.value
+ tc_tags = tc_data.tags.value if tc_data.tags.is_set() \
+ else tc_data.parent.parent.setting_table.default_tags.value
return list(set(tc_tags + force_tags))
def _get_parent_force_tags(self, data):
