Changeset 10293:af9752826214 in orange

Timestamp:

02/17/12 19:22:34 (15 months ago)

Author:

Miha Stajdohar <miha.stajdohar@…>

Branch:

default

Message:

Added python 2.6 unittest2 support.

Location:

Orange/testing/unit/tests

Files:

• test_evaluation_scoring.py (modified) (2 diffs)
• test_evaluation_testing.py (modified) (4 diffs)

Orange/testing/unit/tests/test_evaluation_scoring.py

@@ -1 @@
-import random, unittest
+import random
 from Orange import data
 from Orange.evaluation import scoring, testing
 from Orange.statistics import distribution
+
+try:
+    import unittest2 as unittest
+except:
+    import unittest
 
 random.seed(0)
@@ -9 +14 @@
         prob = [random.random() for _ in data.domain.class_var.values]
         sprob = sum(prob)
-        prob = [i/sprob for i in prob]
+        prob = [i / sprob for i in prob]
         distribution.Discrete(prob)
         return data.domain.class_var[random.randint(0,
-            len(data.domain.class_var.values)-1)], prob
+            len(data.domain.class_var.values) - 1)], prob
     return random_classifier
 

Orange/testing/unit/tests/test_evaluation_testing.py

@@ -1 @@
-import itertools, operator, unittest
+import itertools, operator
 import collections
+
+try:
+    import unittest2 as unittest
+except:
+    import unittest
 
 import Orange
@@ -6 +11 @@
 class DummyLearner(Orange.classification.majority.MajorityLearner):
     def __init__(self, id=None):
-        self.id=id
+        self.id = id
         self.data = []
         self.classifiers = []
@@ -22 +27 @@
 
 class DummyClassifier(object):
-    name="DummyClassifier"
+    name = "DummyClassifier"
     def __init__(self, base_class, learner_id, classifier_no):
         self.base_class = base_class
@@ -61 +66 @@
     for i, inst in enumerate(ds):
         inst[ID] = i
-        inst[WEIGHT] = 2*i
+        inst[WEIGHT] = 2 * i
     return ds