Merge lp:~jelmer/brz/symbol-versioning into lp:brz

[Jelmer Vernooij]

Fix names of deprecated symbols on Python 3.

Fix names of deprecated symbols on Python 3.

[Martin Packman (gz)]

See suggestion about more code to delete. There's no great option for static methods on Python 2 anyway as the test notes, without getting needlessly fancy.

review: Approve

=== modified file 'breezy/symbol_versioning.py'
--- breezy/symbol_versioning.py	2017-05-22 00:56:52 +0000
+++ breezy/symbol_versioning.py	2018-09-02 21:16:14 +0000
@@ -38,6 +38,7 @@
 
 import breezy
 
+from .sixish import PY3
 
 DEPRECATED_PARAMETER = "A deprecated parameter marker."
 
@@ -75,16 +76,19 @@
         have a single %s operator in it. a_callable will be turned into a nice
         python symbol and then substituted into deprecation_version.
     """
-    # We also want to handle old-style classes, in particular exception, and
-    # they don't have an im_class attribute.
-    if getattr(a_callable, 'im_class', None) is None:
-        symbol = "%s.%s" % (a_callable.__module__,
-                            a_callable.__name__)
+    if PY3:
+        func = getattr(a_callable, '__func__', a_callable)
+        symbol ='%s.%s' % (a_callable.__module__,
+                           a_callable.__qualname__)
     else:
-        symbol = "%s.%s.%s" % (a_callable.__self__.__class__.__module__,
-                               a_callable.__self__.__class__.__name__,
-                               a_callable.__name__
-                               )
+        if getattr(a_callable, '__self__', None) is None:
+            symbol = "%s.%s" % (a_callable.__module__,
+                                a_callable.__name__)
+        else:
+            symbol = "%s.%s.%s" % (a_callable.__self__.__class__.__module__,
+                                   a_callable.__self__.__class__.__name__,
+                                   a_callable.__name__
+                                   )
     return deprecation_version % symbol
 
 

=== modified file 'breezy/tests/test_symbol_versioning.py'
--- breezy/tests/test_symbol_versioning.py	2018-07-26 01:01:49 +0000
+++ breezy/tests/test_symbol_versioning.py	2018-09-02 21:16:14 +0000
@@ -19,6 +19,7 @@
 import warnings
 
 from breezy import symbol_versioning
+from breezy.sixish import PY3
 from breezy.symbol_versioning import (
     deprecated_function,
     deprecated_in,
@@ -69,13 +70,19 @@
         return 1
 
     def test_deprecated_static(self):
-        # XXX: The results are not quite right because the class name is not
-        # shown - however it is enough to give people a good indication of
-        # where the problem is.
-        expected_warning = (
-            "breezy.tests.test_symbol_versioning."
-            "deprecated_static "
-            "was deprecated in version 0.7.0.", DeprecationWarning, 2)
+        if PY3:
+            expected_warning = (
+                "breezy.tests.test_symbol_versioning.TestDeprecationWarnings."
+                "deprecated_static "
+                "was deprecated in version 0.7.0.", DeprecationWarning, 2)
+        else:
+            # XXX: The results are not quite right because the class name is not
+            # shown on Python 2- however it is enough to give people a good indication of
+            # where the problem is.
+            expected_warning = (
+                "breezy.tests.test_symbol_versioning."
+                "deprecated_static "
+                "was deprecated in version 0.7.0.", DeprecationWarning, 2)
         expected_docstring = (
             'Deprecated static.\n'
             '\n'
@@ -209,14 +216,10 @@
         err_message = symbol_versioning.deprecation_string(
             self.test_deprecation_string,
             deprecated_in((0, 11, 0)))
-        self.assertIn(err_message,
-                ('breezy.tests.test_symbol_versioning.'
-                 'TestDeprecationWarnings.test_deprecation_string was deprecated in '
-                 'version 0.11.0.',
+        self.assertEqual(err_message,
                  'breezy.tests.test_symbol_versioning.TestDeprecationWarnings.'
                  'test_deprecation_string was deprecated in '
                  'version 0.11.0.')
-            )
 
         self.assertEqual('breezy.symbol_versioning.deprecated_function was '
             'deprecated in version 0.11.0.',

=== modified file 'python3.passing'
--- python3.passing	2018-09-01 21:51:32 +0000
+++ python3.passing	2018-09-02 21:16:14 +0000
@@ -29817,6 +29817,7 @@
 breezy.tests.test_symbol_versioning.TestDeprecationWarnings.test_deprecated_method
 breezy.tests.test_symbol_versioning.TestDeprecationWarnings.test_deprecated_passed
 breezy.tests.test_symbol_versioning.TestDeprecationWarnings.test_deprecated_static
+breezy.tests.test_symbol_versioning.TestDeprecationWarnings.test_deprecation_string
 breezy.tests.test_symbol_versioning.TestSuppressAndActivate.test_activate_deprecation_no_error
 breezy.tests.test_symbol_versioning.TestSuppressAndActivate.test_activate_deprecation_with_DW_error
 breezy.tests.test_symbol_versioning.TestSuppressAndActivate.test_activate_deprecation_with_error