Merge pull request #177 from enthought/merge-4.5.0

Merge 4.5.0 release branch into master

traits/tests/test_interfaces_with_implements.py

@@ -36,150 +36,148 @@
 _adaptation_manager = get_global_adaptation_manager()
 
 
-if sys.version_info[0] >= 3:
-    import nose
-    raise nose.SkipTest("""
-        Currently, under Python 3, class advisors do not work anymore.
-        Therefore, this test will fail due to the use of "adapts".
-    """)
-
-
 #------------------------------------------------------------------------------
 #  Test 'Interface' definitions:
 #------------------------------------------------------------------------------
 
-class IFoo(Interface):
+# 'adapts' and 'implements' are not supported in Python 3.
+if sys.version_info < (3,):
+
+    class IFoo(Interface):
 
-    def get_foo(self):
-        """ Returns the current foo. """
+        def get_foo(self):
+            """ Returns the current foo. """
 
 
-class IFooPlus(IFoo):
+    class IFooPlus(IFoo):
 
-    def get_foo_plus(self):
-        """ Returns even more foo. """
+        def get_foo_plus(self):
+            """ Returns even more foo. """
 
 
-class IAverage(Interface):
+    class IAverage(Interface):
 
-    def get_average(self):
-        """ Returns the average value for the object. """
+        def get_average(self):
+            """ Returns the average value for the object. """
 
 
-class IList(Interface):
+    class IList(Interface):
 
-    def get_list(self):
-        """ Returns the list value for the object. """
+        def get_list(self):
+            """ Returns the list value for the object. """
 
 
-class Sample(HasTraits):
-    s1 = Int(1, sample=True)
-    s2 = Int(2, sample=True)
-    s3 = Int(3, sample=True)
-    i1 = Int(4)
-    i2 = Int(5)
-    i3 = Int(6)
+    class Sample(HasTraits):
+        s1 = Int(1, sample=True)
+        s2 = Int(2, sample=True)
+        s3 = Int(3, sample=True)
+        i1 = Int(4)
+        i2 = Int(5)
+        i3 = Int(6)
 
 
-class SampleList(HasTraits):
+    class SampleList(HasTraits):
 
-    implements(IList)
+        implements(IList)
 
-    data = List(Int, [10, 20, 30])
+        data = List(Int, [10, 20, 30])
 
-    def get_list(self):
-        return self.data
+        def get_list(self):
+            return self.data
 
 
-class SampleAverage(HasTraits):
+    class SampleAverage(HasTraits):
 
-    implements(IList, IAverage)
+        implements(IList, IAverage)
 
-    data = List(Int, [100, 200, 300])
+        data = List(Int, [100, 200, 300])
 
-    def get_list(self):
-        return self.data
+        def get_list(self):
+            return self.data
 
-    def get_average(self):
-        value = self.get_list()
-        if len(value) == 0:
-            return 0.0
+        def get_average(self):
+            value = self.get_list()
+            if len(value) == 0:
+                return 0.0
 
-        average = 0.0
-        for item in value:
-            average += item
-        return (average / len(value))
+            average = 0.0
+            for item in value:
+                average += item
+            return (average / len(value))
 
 
-class SampleBad(HasTraits):
-    pass
+    class SampleBad(HasTraits):
+        pass
 
 
-class TraitsHolder(HasTraits):
+    class TraitsHolder(HasTraits):
 
-    a_no = Instance(IAverage, adapt='no')
-    a_yes = Instance(IAverage, adapt='yes')
-    a_default = Instance(IAverage, adapt='default')
-    list_adapted_to = Supports(IList)
-    foo_adapted_to = Supports(IFoo)
-    foo_plus_adapted_to = Supports(IFooPlus)
-    list_adapts_to = AdaptsTo(IList)
-    foo_adapts_to = AdaptsTo(IFoo)
-    foo_plus_adapts_to = AdaptsTo(IFooPlus)
+        a_no = Instance(IAverage, adapt='no')
+        a_yes = Instance(IAverage, adapt='yes')
+        a_default = Instance(IAverage, adapt='default')
+        list_adapted_to = Supports(IList)
+        foo_adapted_to = Supports(IFoo)
+        foo_plus_adapted_to = Supports(IFooPlus)
+        list_adapts_to = AdaptsTo(IList)
+        foo_adapts_to = AdaptsTo(IFoo)
+        foo_plus_adapts_to = AdaptsTo(IFooPlus)
 
 
-class SampleListAdapter(Adapter):
-    adapts(Sample, IList)
+    class SampleListAdapter(Adapter):
+        adapts(Sample, IList)
 
-    def get_list(self):
-        obj = self.adaptee
-        return [getattr(obj, name)
-                for name in obj.trait_names(sample=True)]
+        def get_list(self):
+            obj = self.adaptee
+            return [getattr(obj, name)
+                    for name in obj.trait_names(sample=True)]
 
 
-class ListAverageAdapter(Adapter):
+    class ListAverageAdapter(Adapter):
 
-    adapts(IList, IAverage)
+        adapts(IList, IAverage)
 
-    def get_average(self):
-        value = self.adaptee.get_list()
-        if len(value) == 0:
-            return 0.0
+        def get_average(self):
+            value = self.adaptee.get_list()
+            if len(value) == 0:
+                return 0.0
 
-        average = 0.0
-        for item in value:
-            average += item
-        return (average / len(value))
+            average = 0.0
+            for item in value:
+                average += item
+            return (average / len(value))
 
 
-class SampleFooAdapter(HasTraits):
+    class SampleFooAdapter(HasTraits):
 
-    adapts(Sample, IFoo)
+        adapts(Sample, IFoo)
 
-    object = Instance(Sample)
+        object = Instance(Sample)
 
-    def __init__(self, object):
-        self.object = object
+        def __init__(self, object):
+            self.object = object
 
-    def get_foo(self):
-        object = self.object
-        return (object.s1 + object.s2 + object.s3)
+        def get_foo(self):
+            object = self.object
+            return (object.s1 + object.s2 + object.s3)
 
 
-class FooPlusAdapter(object):
+    class FooPlusAdapter(object):
 
-    def __init__(self, obj):
-        self.obj = obj
+        def __init__(self, obj):
+            self.obj = obj
 
-    def get_foo(self):
-        return self.obj.get_foo()
+        def get_foo(self):
+            return self.obj.get_foo()
 
-    def get_foo_plus(self):
-        return (self.obj.get_foo() + 1)
+        def get_foo_plus(self):
+            return (self.obj.get_foo() + 1)
 
-adapts(FooPlusAdapter, IFoo, IFooPlus)
+    adapts(FooPlusAdapter, IFoo, IFooPlus)
 
 
+@unittest.skipUnless(sys.version_info < (3,),
+                     "The 'adapts' and 'implements' class advisors "
+                     "are not supported in Python 3.")
 class InterfacesTest(unittest.TestCase):
 
     #### 'TestCase' protocol ##################################################

traits/tests/test_protocols_usage.py

@@ -31,13 +31,6 @@
 # eliminate dependencies of Traits on other modules, we create another
 # minimal File class here to test the adapter implementation.
 
-if sys.version_info[0] >= 3:
-    import nose
-    raise nose.SkipTest("""
-        Currently, under Python 3, class advisors do not work anymore.
-        This is due to the new way of specifying metaclasses.
-    """)
-
 
 # Test class
 class File(HasTraits):
@@ -70,6 +63,9 @@ class Person(HasTraits):
     age = Int
 
 
+@unittest.skipUnless(sys.version_info < (3,),
+                     "The 'adapts' and 'implements' class advisors "
+                     "are not supported in Python 3.")
 class ProtocolsUsageTestCase(unittest.TestCase):
     """ Tests for protocols usage. """
     def test_adapts(self):