Merge lp:~jelmer/brz/remaining-test into lp:brz

[Jelmer Vernooij]

Fix remaining deprecated function name test.

Fix remaining deprecated function name test.

[Martin Packman (gz)]

This is still more complex that it needs to be for how it's used, but fixed counts as fixed for now. :)

review: Approve

=== modified file 'breezy/symbol_versioning.py'
--- breezy/symbol_versioning.py	2018-09-02 21:15:23 +0000
+++ breezy/symbol_versioning.py	2018-09-12 20:34:43 +0000
@@ -76,19 +76,16 @@
         have a single %s operator in it. a_callable will be turned into a nice
         python symbol and then substituted into deprecation_version.
     """
-    if PY3:
-        func = getattr(a_callable, '__func__', a_callable)
-        symbol ='%s.%s' % (a_callable.__module__,
-                           a_callable.__qualname__)
+    if getattr(a_callable, '__self__', None) is not None:
+        symbol = "%s.%s.%s" % (a_callable.__self__.__class__.__module__,
+                               a_callable.__self__.__class__.__name__,
+                               a_callable.__name__)
+    elif getattr(a_callable, '__qualname__', None) is not None and not '<' in a_callable.__qualname__:
+        symbol = "%s.%s" % (a_callable.__module__,
+                            a_callable.__qualname__)
     else:
-        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__
-                                   )
+        symbol = "%s.%s" % (a_callable.__module__,
+                            a_callable.__name__)
     return deprecation_version % symbol
 
 
 
=== modified file 'python3.passing'
--- python3.passing	2018-09-11 07:31:44 +0000
+++ python3.passing	2018-09-12 20:34:43 +0000
@@ -1,6 +1,5 @@
 # This is the list of tests that are known to pass with Python3.
 # "make check-nodocs3" verifies that these pass.
-breezy.git.tests.test_workingtree.GitWorkingTreeTests.test_is_ignored_directory
 breezy.git.tests.test_blackbox.ShallowTests.test_log_shallow
 breezy.git.tests.test_blackbox.ShallowTests.test_version_info_custom_without_revno
 breezy.git.tests.test_blackbox.ShallowTests.test_version_info_custom_with_revno
@@ -29012,6 +29011,7 @@
 breezy.tests.test_selftest.TestConvenienceMakers.test_make_tree_for_local_vfs_backed_transport
 breezy.tests.test_selftest.TestCounterHooks.test_no_hook
 breezy.tests.test_selftest.TestCounterHooks.test_run_hook_once
+breezy.tests.test_selftest.TestDeprecations.test_applyDeprecated_not_deprecated
 breezy.tests.test_selftest.TestDeprecations.test_callDeprecated
 breezy.tests.test_selftest.TestDocTestSuiteIsolation.test_deleted_variable
 breezy.tests.test_selftest.TestDocTestSuiteIsolation.test_injected_variable