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

1 files changed, 40 insertions, 40 deletions

diff --git a/library/python/strings/ut/test_strings.py b/library/python/strings/ut/test_strings.py
index 88fd41cd89..dd0c694ee1 100644
--- a/library/python/strings/ut/test_strings.py
+++ b/library/python/strings/ut/test_strings.py
@@ -3,7 +3,7 @@
 import pytest
 import six
 
-import library.python.strings 
+import library.python.strings
 
 
 class Convertible(object):
@@ -32,8 +32,8 @@ class NonConvertible(ConvertibleToUnicodeOnly, ConvertibleToStrOnly):
 
 
 def test_to_basestring():
-    assert library.python.strings.to_basestring('str') == 'str' 
-    assert library.python.strings.to_basestring(u'юникод') == u'юникод' 
+    assert library.python.strings.to_basestring('str') == 'str'
+    assert library.python.strings.to_basestring(u'юникод') == u'юникод'
     if six.PY2:  # __str__ should return str not bytes in Python3
         assert library.python.strings.to_basestring(Convertible()) == Convertible.text
         assert library.python.strings.to_basestring(ConvertibleToUnicodeOnly()) == Convertible.text
@@ -42,10 +42,10 @@ def test_to_basestring():
 
 
 def test_to_unicode():
-    assert library.python.strings.to_unicode(u'юникод') == u'юникод' 
-    assert library.python.strings.to_unicode('str') == u'str' 
-    assert library.python.strings.to_unicode(u'строка'.encode('utf-8')) == u'строка' 
-    assert library.python.strings.to_unicode(u'строка'.encode('cp1251'), 'cp1251') == u'строка' 
+    assert library.python.strings.to_unicode(u'юникод') == u'юникод'
+    assert library.python.strings.to_unicode('str') == u'str'
+    assert library.python.strings.to_unicode(u'строка'.encode('utf-8')) == u'строка'
+    assert library.python.strings.to_unicode(u'строка'.encode('cp1251'), 'cp1251') == u'строка'
     if six.PY2:  # __str__ should return str not bytes in Python3
         assert library.python.strings.to_unicode(Convertible()) == Convertible.text
         assert library.python.strings.to_unicode(ConvertibleToUnicodeOnly()) == Convertible.text
@@ -56,15 +56,15 @@ def test_to_unicode():
 
 
 def test_to_unicode_errors_replace():
-    assert library.python.strings.to_unicode(u'abcабв'.encode('utf-8'), 'ascii') 
-    assert library.python.strings.to_unicode(u'абв'.encode('utf-8'), 'ascii') 
+    assert library.python.strings.to_unicode(u'abcабв'.encode('utf-8'), 'ascii')
+    assert library.python.strings.to_unicode(u'абв'.encode('utf-8'), 'ascii')
 
 
 def test_to_str():
     assert library.python.strings.to_str('str') == 'str' if six.PY2 else b'str'
     assert library.python.strings.to_str(u'unicode') == 'unicode' if six.PY2 else b'unicode'
-    assert library.python.strings.to_str(u'юникод') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод', 'cp1251') == u'юникод'.encode('cp1251') 
+    assert library.python.strings.to_str(u'юникод') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод', 'cp1251') == u'юникод'.encode('cp1251')
     if six.PY2:
         assert library.python.strings.to_str(Convertible()) == Convertible.text_utf8
         with pytest.raises(UnicodeEncodeError):
@@ -75,44 +75,44 @@ def test_to_str():
 
 
 def test_to_str_errors_replace():
-    assert library.python.strings.to_str(u'abcабв', 'ascii') 
-    assert library.python.strings.to_str(u'абв', 'ascii') 
+    assert library.python.strings.to_str(u'abcабв', 'ascii')
+    assert library.python.strings.to_str(u'абв', 'ascii')
 
 
 def test_to_str_transcode():
     assert library.python.strings.to_str('str', from_enc='ascii') == 'str' if six.PY2 else b'str'
     assert library.python.strings.to_str('str', from_enc='utf-8') == 'str' if six.PY2 else b'str'
 
-    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), from_enc='utf-8') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='utf-8', from_enc='utf-8') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='cp1251', from_enc='utf-8') == u'юникод'.encode('cp1251') 
+    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), from_enc='utf-8') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='utf-8', from_enc='utf-8') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='cp1251', from_enc='utf-8') == u'юникод'.encode('cp1251')
 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), from_enc='cp1251') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='cp1251', from_enc='cp1251') == u'юникод'.encode('cp1251') 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='utf-8', from_enc='cp1251') == u'юникод'.encode('utf-8') 
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), from_enc='cp1251') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='cp1251', from_enc='cp1251') == u'юникод'.encode('cp1251')
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='utf-8', from_enc='cp1251') == u'юникод'.encode('utf-8')
 
-    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), from_enc='koi8-r') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), to_enc='koi8-r', from_enc='koi8-r') == u'юникод'.encode('koi8-r') 
-    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), to_enc='cp1251', from_enc='koi8-r') == u'юникод'.encode('cp1251') 
+    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), from_enc='koi8-r') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), to_enc='koi8-r', from_enc='koi8-r') == u'юникод'.encode('koi8-r')
+    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), to_enc='cp1251', from_enc='koi8-r') == u'юникод'.encode('cp1251')
 
 
 def test_to_str_transcode_wrong():
-    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), from_enc='cp1251') 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), from_enc='utf-8') 
+    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), from_enc='cp1251')
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), from_enc='utf-8')
 
 
 def test_to_str_transcode_disabled():
     # No transcoding enabled, set from_enc to enable
-    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='utf-8') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='cp1251') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='utf-8') == u'юникод'.encode('cp1251') 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='cp1251') == u'юникод'.encode('cp1251') 
-    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='koi8-r') == u'юникод'.encode('cp1251') 
-    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), to_enc='cp1251') == u'юникод'.encode('koi8-r') 
+    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='utf-8') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод'.encode('utf-8'), to_enc='cp1251') == u'юникод'.encode('utf-8')
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='utf-8') == u'юникод'.encode('cp1251')
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='cp1251') == u'юникод'.encode('cp1251')
+    assert library.python.strings.to_str(u'юникод'.encode('cp1251'), to_enc='koi8-r') == u'юникод'.encode('cp1251')
+    assert library.python.strings.to_str(u'юникод'.encode('koi8-r'), to_enc='cp1251') == u'юникод'.encode('koi8-r')
 
 
 def test_stringize_deep():
-    assert library.python.strings.stringize_deep({ 
+    assert library.python.strings.stringize_deep({
         'key 1': 'value 1',
         u'ключ 2': u'значение 2',
         'list': [u'ключ 2', 'key 1', (u'к', 2)]
@@ -124,7 +124,7 @@ def test_stringize_deep():
 
 
 def test_stringize_deep_doesnt_transcode():
-    assert library.python.strings.stringize_deep({ 
+    assert library.python.strings.stringize_deep({
         u'ключ 1'.encode('utf-8'): u'значение 1'.encode('utf-8'),
         u'ключ 2'.encode('cp1251'): u'значение 2'.encode('cp1251'),
     }) == {
@@ -134,7 +134,7 @@ def test_stringize_deep_doesnt_transcode():
 
 
 def test_stringize_deep_nested():
-    assert library.python.strings.stringize_deep({ 
+    assert library.python.strings.stringize_deep({
         'key 1': 'value 1',
         u'ключ 2': {
             'subkey 1': 'value 1',
@@ -151,8 +151,8 @@ def test_stringize_deep_nested():
 
 def test_stringize_deep_plain():
     assert library.python.strings.stringize_deep('str') == 'str' if six.PY2 else b'str'
-    assert library.python.strings.stringize_deep(u'юникод') == u'юникод'.encode('utf-8') 
-    assert library.python.strings.stringize_deep(u'юникод'.encode('utf-8')) == u'юникод'.encode('utf-8') 
+    assert library.python.strings.stringize_deep(u'юникод') == u'юникод'.encode('utf-8')
+    assert library.python.strings.stringize_deep(u'юникод'.encode('utf-8')) == u'юникод'.encode('utf-8')
 
 
 def test_stringize_deep_nonstr():
@@ -163,7 +163,7 @@ def test_stringize_deep_nonstr():
 
 
 def test_unicodize_deep():
-    assert library.python.strings.unicodize_deep({ 
+    assert library.python.strings.unicodize_deep({
         'key 1': 'value 1',
         u'ключ 2': u'значение 2',
         u'ключ 3'.encode('utf-8'): u'значение 3'.encode('utf-8'),
@@ -175,7 +175,7 @@ def test_unicodize_deep():
 
 
 def test_unicodize_deep_nested():
-    assert library.python.strings.unicodize_deep({ 
+    assert library.python.strings.unicodize_deep({
         'key 1': 'value 1',
         u'ключ 2': {
             'subkey 1': 'value 1',
@@ -193,9 +193,9 @@ def test_unicodize_deep_nested():
 
 
 def test_unicodize_deep_plain():
-    assert library.python.strings.unicodize_deep('str') == u'str' 
-    assert library.python.strings.unicodize_deep(u'юникод') == u'юникод' 
-    assert library.python.strings.unicodize_deep(u'юникод'.encode('utf-8')) == u'юникод' 
+    assert library.python.strings.unicodize_deep('str') == u'str'
+    assert library.python.strings.unicodize_deep(u'юникод') == u'юникод'
+    assert library.python.strings.unicodize_deep(u'юникод'.encode('utf-8')) == u'юникод'
 
 
 def test_unicodize_deep_nonstr():