r47000 - fixes

hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Tue, 15 Mar 2016 21:21:19 -0600 (MDT)
Newsgroups gmane.comp.python.twisted.commits
Message-ID <[email protected]>
Author: hawkowl
Date: Tue Mar 15 21:21:12 2016
New Revision: 47000

Modified:
   branches/deprecated-property-8124/twisted/python/deprecate.py
   branches/deprecated-property-8124/twisted/python/test/test_deprecate.py

Log:
fixes

Modified: branches/deprecated-property-8124/twisted/python/deprecate.py
==============================================================================
--- branches/deprecated-property-8124/twisted/python/deprecate.py	(original)
+++ branches/deprecated-property-8124/twisted/python/deprecate.py	Tue Mar 15 21:21:12 2016
@@ -34,7 +34,6 @@
 
     class OtherwiseUndeprecatedClass(object):
 
-        @property
         @deprecatedProperty(Version('Twisted', 16, 0, 0))
         def badProperty(self):
             '''

Modified: branches/deprecated-property-8124/twisted/python/test/test_deprecate.py
==============================================================================
--- branches/deprecated-property-8124/twisted/python/test/test_deprecate.py	(original)
+++ branches/deprecated-property-8124/twisted/python/test/test_deprecate.py	Tue Mar 15 21:21:12 2016
@@ -722,6 +722,7 @@
         self._someProtectedValue = value
 
 
+
 class DeprecatedDecoratorTests(SynchronousTestCase):
     """
     Tests for deprecated decorators.
@@ -797,7 +798,7 @@
         self.assertEqual(message, warnings[0]['message'])
 
 
-    def test_classMethod(self):
+    def test_class(self):
         """
         When L{deprecated} is used on a class, instantiations raise a
         L{DeprecationWarning} and class's docstring is updated to inform the
@@ -818,7 +819,7 @@
             'twisted.python.test.test_deprecate.DeprecatedClass '
             'was deprecated in Twisted 1.2.3'
             )
-        warnings = self.flushWarnings([self.test_classMethod])
+        warnings = self.flushWarnings([self.test_class])
         self.assertEqual(1, len(warnings))
         self.assertEqual(DeprecationWarning, warnings[0]['category'])
         self.assertEqual(message, warnings[0]['message'])