Remove _get_wrapped_func (#35621)

dreiss · facebook-github-bot · commit 313bea84ef12 · 2020-05-14T10:07:53.000-07:00
Summary: Pull Request resolved: #35621 Python 2 has reached end-of-life and is no longer supported by PyTorch. `func.__wrapped__` can be used directly in Python 3. Test Plan: CI Differential Revision: D20842875 Pulled By: dreiss fbshipit-source-id: 26f71df12db6d5118c8f278b27d747d647d07900
diff --git a/test/distributed/test_c10d.py b/test/distributed/test_c10d.py
@@ -2949,10 +2949,10 @@ def setUp(self):
         # Need to skip return code checking for these tests since the child
         # processes don't exit cleanly.
         self.skip_return_code_checks = [
-            self._get_wrapped_func(self.test_nccl_errors_blocking_abort),
-            self._get_wrapped_func(self.test_nccl_errors_blocking_sigkill),
-            self._get_wrapped_func(self.test_nccl_errors_blocking_sigterm),
-            self._get_wrapped_func(self.test_nccl_errors_blocking_nonzero_exit),
+            self.test_nccl_errors_blocking_abort.__wrapped__,
+            self.test_nccl_errors_blocking_sigkill.__wrapped__,
+            self.test_nccl_errors_blocking_sigterm.__wrapped__,
+            self.test_nccl_errors_blocking_nonzero_exit.__wrapped__,
         ]
         self._fork_processes()
 
@@ -2971,15 +2971,6 @@ def op_timeout_sec(self):
     def world_size(self):
         return 3
 
-    def _get_wrapped_func(self, func):
-        # Get the original function which was wrapped in the decorator.
-        if hasattr(func, '__wrapped__'):
-            # py3 way.
-            return func.__wrapped__
-        else:
-            # py2 way.
-            return func.func_closure[0].cell_contents
-
     def _run_all_reduce(self, pg):
         pg.allreduce(torch.rand(10).cuda(self.rank))
 
