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

2 files changed, 22 insertions, 22 deletions

diff --git a/library/python/testing/import_test/import_test.py b/library/python/testing/import_test/import_test.py
index f821aa3cda..3e3b7234ef 100644
--- a/library/python/testing/import_test/import_test.py
+++ b/library/python/testing/import_test/import_test.py
@@ -51,12 +51,12 @@ def check_imports(no_check=(), extra=(), skip_func=None, py_main=None):
             print('SKIP', module, '''without "if __name__ == '__main__'" check''')
             continue
 
-        def print_backtrace_marked(e): 
-            tb_exc = traceback.format_exception(*e) 
-            for item in tb_exc: 
-                for l in item.splitlines(): 
-                    print('FAIL:', l, file=sys.stderr) 
- 
+        def print_backtrace_marked(e):
+            tb_exc = traceback.format_exception(*e)
+            for item in tb_exc:
+                for l in item.splitlines():
+                    print('FAIL:', l, file=sys.stderr)
+
         try:
             print('TRY', module)
             # XXX waiting for py3 to use print(..., flush=True)
@@ -75,17 +75,17 @@ def check_imports(no_check=(), extra=(), skip_func=None, py_main=None):
             print('OK ', module, '{:.3f}s'.format(delay))
 
         except Exception as e:
-            print('FAIL:', module, e, file=sys.stderr) 
-            print_backtrace_marked(sys.exc_info()) 
+            print('FAIL:', module, e, file=sys.stderr)
+            print_backtrace_marked(sys.exc_info())
+            failed.append('{}: {}'.format(module, e))
+
+        except:
+            e = sys.exc_info()
+            print('FAIL:', module, e, file=sys.stderr)
+            print_backtrace_marked(e)
             failed.append('{}: {}'.format(module, e))
+            raise
 
-        except: 
-            e = sys.exc_info() 
-            print('FAIL:', module, e, file=sys.stderr) 
-            print_backtrace_marked(e) 
-            failed.append('{}: {}'.format(module, e)) 
-            raise 
- 
     print("Slowest imports:")
     for m, t in sorted(import_times.items(), key=lambda x: x[1], reverse=True)[:30]:
         print('  ', '{:.3f}s'.format(t), m)
diff --git a/library/python/testing/yatest_common/yatest/common/canonical.py b/library/python/testing/yatest_common/yatest/common/canonical.py
index 4fa3defa77..b6a136d3e9 100644
--- a/library/python/testing/yatest_common/yatest/common/canonical.py
+++ b/library/python/testing/yatest_common/yatest/common/canonical.py
@@ -37,13 +37,13 @@ def canonical_file(path, diff_tool=None, local=False, universal_lines=False, dif
     safe_path = os.path.join(tempdir, os.path.basename(abs_path))
     # if the created file is in output_path, we copy it, so that it will be available when the tests finishes
     _copy(path, safe_path, universal_lines=universal_lines)
-    if diff_tool: 
-        if not isinstance(diff_tool, six.string_types): 
-            try:  # check if iterable 
-                if not isinstance(diff_tool[0], six.string_types): 
-                    raise Exception("Invalid custom diff-tool: not cmd") 
-            except: 
-                raise Exception("Invalid custom diff-tool: not binary path") 
+    if diff_tool:
+        if not isinstance(diff_tool, six.string_types):
+            try:  # check if iterable
+                if not isinstance(diff_tool[0], six.string_types):
+                    raise Exception("Invalid custom diff-tool: not cmd")
+            except:
+                raise Exception("Invalid custom diff-tool: not binary path")
     return runtime._get_ya_plugin_instance().file(safe_path, diff_tool=diff_tool, local=local, diff_file_name=diff_file_name, diff_tool_timeout=diff_tool_timeout)