Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.

1 files changed, 98 insertions, 98 deletions

diff --git a/contrib/tools/python3/src/Lib/unittest/suite.py b/contrib/tools/python3/src/Lib/unittest/suite.py
index 6df95fbc1b..6f45b6fe5f 100644
--- a/contrib/tools/python3/src/Lib/unittest/suite.py
+++ b/contrib/tools/python3/src/Lib/unittest/suite.py
@@ -149,7 +149,7 @@ class TestSuite(BaseTestSuite):
         if getattr(currentClass, "__unittest_skip__", False):
             return
 
-        failed = False 
+        failed = False
         try:
             currentClass._classSetupFailed = False
         except TypeError:
@@ -158,30 +158,30 @@ class TestSuite(BaseTestSuite):
             pass
 
         setUpClass = getattr(currentClass, 'setUpClass', None)
-        doClassCleanups = getattr(currentClass, 'doClassCleanups', None) 
+        doClassCleanups = getattr(currentClass, 'doClassCleanups', None)
         if setUpClass is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                try: 
-                    setUpClass() 
-                except Exception as e: 
-                    if isinstance(result, _DebugResult): 
-                        raise 
-                    failed = True 
-                    try: 
-                        currentClass._classSetupFailed = True 
-                    except TypeError: 
-                        pass 
-                    className = util.strclass(currentClass) 
-                    self._createClassOrModuleLevelException(result, e, 
-                                                            'setUpClass', 
-                                                            className) 
-                if failed and doClassCleanups is not None: 
-                    doClassCleanups() 
-                    for exc_info in currentClass.tearDown_exceptions: 
-                        self._createClassOrModuleLevelException( 
-                                result, exc_info[1], 'setUpClass', className, 
-                                info=exc_info) 
+                try:
+                    setUpClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    failed = True
+                    try:
+                        currentClass._classSetupFailed = True
+                    except TypeError:
+                        pass
+                    className = util.strclass(currentClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'setUpClass',
+                                                            className)
+                if failed and doClassCleanups is not None:
+                    doClassCleanups()
+                    for exc_info in currentClass.tearDown_exceptions:
+                        self._createClassOrModuleLevelException(
+                                result, exc_info[1], 'setUpClass', className,
+                                info=exc_info)
             finally:
                 _call_if_exists(result, '_restoreStdout')
 
@@ -211,41 +211,41 @@ class TestSuite(BaseTestSuite):
         if setUpModule is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                try: 
-                    setUpModule() 
-                except Exception as e: 
-                    if isinstance(result, _DebugResult): 
-                        raise 
-                    result._moduleSetUpFailed = True 
-                    self._createClassOrModuleLevelException(result, e, 
-                                                            'setUpModule', 
-                                                            currentModule) 
-                if result._moduleSetUpFailed: 
-                    try: 
-                        case.doModuleCleanups() 
-                    except Exception as e: 
-                        self._createClassOrModuleLevelException(result, e, 
-                                                                'setUpModule', 
-                                                                currentModule) 
+                try:
+                    setUpModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    result._moduleSetUpFailed = True
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'setUpModule',
+                                                            currentModule)
+                if result._moduleSetUpFailed:
+                    try:
+                        case.doModuleCleanups()
+                    except Exception as e:
+                        self._createClassOrModuleLevelException(result, e,
+                                                                'setUpModule',
+                                                                currentModule)
             finally:
                 _call_if_exists(result, '_restoreStdout')
 
-    def _createClassOrModuleLevelException(self, result, exc, method_name, 
-                                           parent, info=None): 
-        errorName = f'{method_name} ({parent})' 
-        self._addClassOrModuleLevelException(result, exc, errorName, info) 
- 
-    def _addClassOrModuleLevelException(self, result, exception, errorName, 
-                                        info=None): 
+    def _createClassOrModuleLevelException(self, result, exc, method_name,
+                                           parent, info=None):
+        errorName = f'{method_name} ({parent})'
+        self._addClassOrModuleLevelException(result, exc, errorName, info)
+
+    def _addClassOrModuleLevelException(self, result, exception, errorName,
+                                        info=None):
         error = _ErrorHolder(errorName)
         addSkip = getattr(result, 'addSkip', None)
         if addSkip is not None and isinstance(exception, case.SkipTest):
             addSkip(error, str(exception))
         else:
-            if not info: 
-                result.addError(error, sys.exc_info()) 
-            else: 
-                result.addError(error, info) 
+            if not info:
+                result.addError(error, sys.exc_info())
+            else:
+                result.addError(error, info)
 
     def _handleModuleTearDown(self, result):
         previousModule = self._get_previous_module(result)
@@ -259,33 +259,33 @@ class TestSuite(BaseTestSuite):
         except KeyError:
             return
 
-        _call_if_exists(result, '_setupStdout') 
-        try: 
-            tearDownModule = getattr(module, 'tearDownModule', None) 
-            if tearDownModule is not None: 
-                try: 
-                    tearDownModule() 
-                except Exception as e: 
-                    if isinstance(result, _DebugResult): 
-                        raise 
-                    self._createClassOrModuleLevelException(result, e, 
-                                                            'tearDownModule', 
-                                                            previousModule) 
+        _call_if_exists(result, '_setupStdout')
+        try:
+            tearDownModule = getattr(module, 'tearDownModule', None)
+            if tearDownModule is not None:
+                try:
+                    tearDownModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownModule',
+                                                            previousModule)
             try:
-                case.doModuleCleanups() 
+                case.doModuleCleanups()
             except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
-                self._createClassOrModuleLevelException(result, e, 
-                                                        'tearDownModule', 
-                                                        previousModule) 
-        finally: 
-            _call_if_exists(result, '_restoreStdout') 
+                self._createClassOrModuleLevelException(result, e,
+                                                        'tearDownModule',
+                                                        previousModule)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
     def _tearDownPreviousClass(self, test, result):
         previousClass = getattr(result, '_previousTestClass', None)
         currentClass = test.__class__
-        if currentClass == previousClass or previousClass is None: 
+        if currentClass == previousClass or previousClass is None:
             return
         if getattr(previousClass, '_classSetupFailed', False):
             return
@@ -295,36 +295,36 @@ class TestSuite(BaseTestSuite):
             return
 
         tearDownClass = getattr(previousClass, 'tearDownClass', None)
-        doClassCleanups = getattr(previousClass, 'doClassCleanups', None) 
-        if tearDownClass is None and doClassCleanups is None: 
-            return 
-
-        _call_if_exists(result, '_setupStdout') 
-        try: 
-            if tearDownClass is not None: 
-                try: 
-                    tearDownClass() 
-                except Exception as e: 
-                    if isinstance(result, _DebugResult): 
-                        raise 
-                    className = util.strclass(previousClass) 
-                    self._createClassOrModuleLevelException(result, e, 
-                                                            'tearDownClass', 
-                                                            className) 
-            if doClassCleanups is not None: 
-                doClassCleanups() 
-                for exc_info in previousClass.tearDown_exceptions: 
-                    if isinstance(result, _DebugResult): 
-                        raise exc_info[1] 
-                    className = util.strclass(previousClass) 
-                    self._createClassOrModuleLevelException(result, exc_info[1], 
-                                                            'tearDownClass', 
-                                                            className, 
-                                                            info=exc_info) 
-        finally: 
-            _call_if_exists(result, '_restoreStdout') 
-
- 
+        doClassCleanups = getattr(previousClass, 'doClassCleanups', None)
+        if tearDownClass is None and doClassCleanups is None:
+            return
+
+        _call_if_exists(result, '_setupStdout')
+        try:
+            if tearDownClass is not None:
+                try:
+                    tearDownClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownClass',
+                                                            className)
+            if doClassCleanups is not None:
+                doClassCleanups()
+                for exc_info in previousClass.tearDown_exceptions:
+                    if isinstance(result, _DebugResult):
+                        raise exc_info[1]
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, exc_info[1],
+                                                            'tearDownClass',
+                                                            className,
+                                                            info=exc_info)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
+
+
 class _ErrorHolder(object):
     """
     Placeholder for a TestCase inside a result. As far as a TestResult