[robotframework] push by pekka.klarck - small cleanup and old cruft removal on 2011-11-15 13:56 GMT

[robotframework]

Revision: db5df2e59c75
Author:   Pekka Klärck
Date:     Tue Nov 15 04:40:38 2011
Log:      small cleanup and old cruft removal
http://code.google.com/p/robotframework/source/detail?r=db5df2e59c75

Modified:
 /src/robot/model/criticality.py
 /src/robot/model/tagstatistics.py

=======================================
--- /src/robot/model/criticality.py     Mon Nov 14 09:03:47 2011
+++ /src/robot/model/criticality.py     Tue Nov 15 04:40:38 2011
@@ -28,15 +28,9 @@
         return self.non_critical_tags.match(tag)

     def test_is_critical(self, test):
-        if self.non_critical_tags.match(test.tags):
+        if self.critical_tags and not self.critical_tags.match(test.tags):
             return False
-        if self.critical_tags.match(test.tags):
-            return True
-        return not self.critical_tags
+        return not self.non_critical_tags.match(test.tags)

     def __nonzero__(self):
         return bool(self.critical_tags or self.non_critical_tags)
-
-    # TODO: Remove below compatibility code when possible
-    is_critical = tag_is_critical
-    is_non_critical = tag_is_non_critical
=======================================
--- /src/robot/model/tagstatistics.py   Mon Nov 14 16:39:48 2011
+++ /src/robot/model/tagstatistics.py   Tue Nov 15 04:40:38 2011
@@ -71,8 +71,8 @@

     def get_stat(self, tag):
         return TagStat(tag, self._get_doc(tag), self._get_links(tag),
-                       self._criticality.is_critical(tag),
-                       self._criticality.is_non_critical(tag))
+                       self._criticality.tag_is_critical(tag),
+                       self._criticality.tag_is_non_critical(tag))

     def get_combined_stat(self, pattern, name=None):
         name = name or pattern