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

1 files changed, 83 insertions, 83 deletions

diff --git a/contrib/python/six/six.py b/contrib/python/six/six.py
index 4cba03c75f..bb1958ae94 100644
--- a/contrib/python/six/six.py
+++ b/contrib/python/six/six.py
@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Utilities for writing code that runs on Python 2 and 3"""
-
+"""Utilities for writing code that runs on Python 2 and 3""" 
+ 
 from __future__ import absolute_import
 
 import functools
@@ -257,7 +257,7 @@ _moved_attributes = [
     MovedAttribute("map", "itertools", "builtins", "imap", "map"),
     MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
     MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("getoutput", "commands", "subprocess"),
+    MovedAttribute("getoutput", "commands", "subprocess"), 
     MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
     MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
     MovedAttribute("reduce", "__builtin__", "functools"),
@@ -281,8 +281,8 @@ _moved_attributes = [
     MovedModule("html_entities", "htmlentitydefs", "html.entities"),
     MovedModule("html_parser", "HTMLParser", "html.parser"),
     MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), 
+    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"), 
     MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
     MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
     MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
@@ -357,12 +357,12 @@ _urllib_parse_moved_attributes = [
     MovedAttribute("quote_plus", "urllib", "urllib.parse"),
     MovedAttribute("unquote", "urllib", "urllib.parse"),
     MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"),
+    MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"), 
     MovedAttribute("urlencode", "urllib", "urllib.parse"),
     MovedAttribute("splitquery", "urllib", "urllib.parse"),
     MovedAttribute("splittag", "urllib", "urllib.parse"),
     MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("splitvalue", "urllib", "urllib.parse"),
+    MovedAttribute("splitvalue", "urllib", "urllib.parse"), 
     MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
     MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
     MovedAttribute("uses_params", "urlparse", "urllib.parse"),
@@ -438,8 +438,8 @@ _urllib_request_moved_attributes = [
     MovedAttribute("URLopener", "urllib", "urllib.request"),
     MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
     MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-    MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
-    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
+    MovedAttribute("parse_http_list", "urllib2", "urllib.request"), 
+    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), 
 ]
 for attr in _urllib_request_moved_attributes:
     setattr(Module_six_moves_urllib_request, attr.name, attr)
@@ -711,15 +711,15 @@ if PY3:
     exec_ = getattr(moves.builtins, "exec")
 
     def reraise(tp, value, tb=None):
-        try:
-            if value is None:
-                value = tp()
-            if value.__traceback__ is not tb:
-                raise value.with_traceback(tb)
-            raise value
-        finally:
-            value = None
-            tb = None
+        try: 
+            if value is None: 
+                value = tp() 
+            if value.__traceback__ is not tb: 
+                raise value.with_traceback(tb) 
+            raise value 
+        finally: 
+            value = None 
+            tb = None 
 
 else:
     def exec_(_code_, _globs_=None, _locs_=None):
@@ -735,19 +735,19 @@ else:
         exec("""exec _code_ in _globs_, _locs_""")
 
     exec_("""def reraise(tp, value, tb=None):
-    try:
-        raise tp, value, tb
-    finally:
-        tb = None
+    try: 
+        raise tp, value, tb 
+    finally: 
+        tb = None 
 """)
 
 
 if sys.version_info[:2] > (3,):
     exec_("""def raise_from(value, from_value):
-    try:
-        raise value from from_value
-    finally:
-        value = None
+    try: 
+        raise value from from_value 
+    finally: 
+        value = None 
 """)
 else:
     def raise_from(value, from_value):
@@ -858,7 +858,7 @@ def with_metaclass(meta, *bases):
     # This requires a bit of explanation: the basic idea is to make a dummy
     # metaclass for one level of class instantiation that replaces itself with
     # the actual metaclass.
-    class metaclass(type):
+    class metaclass(type): 
 
         def __new__(cls, name, this_bases, d):
             if sys.version_info[:2] >= (3, 7):
@@ -870,10 +870,10 @@ def with_metaclass(meta, *bases):
             else:
                 resolved_bases = bases
             return meta(name, resolved_bases, d)
-
-        @classmethod
-        def __prepare__(cls, name, this_bases):
-            return meta.__prepare__(name, bases)
+ 
+        @classmethod 
+        def __prepare__(cls, name, this_bases): 
+            return meta.__prepare__(name, bases) 
     return type.__new__(metaclass, 'temporary_class', (), {})
 
 
@@ -889,72 +889,72 @@ def add_metaclass(metaclass):
                 orig_vars.pop(slots_var)
         orig_vars.pop('__dict__', None)
         orig_vars.pop('__weakref__', None)
-        if hasattr(cls, '__qualname__'):
-            orig_vars['__qualname__'] = cls.__qualname__
+        if hasattr(cls, '__qualname__'): 
+            orig_vars['__qualname__'] = cls.__qualname__ 
         return metaclass(cls.__name__, cls.__bases__, orig_vars)
     return wrapper
 
 
-def ensure_binary(s, encoding='utf-8', errors='strict'):
-    """Coerce **s** to six.binary_type.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> encoded to `bytes`
-      - `bytes` -> `bytes`
-    """
+def ensure_binary(s, encoding='utf-8', errors='strict'): 
+    """Coerce **s** to six.binary_type. 
+ 
+    For Python 2: 
+      - `unicode` -> encoded to `str` 
+      - `str` -> `str` 
+ 
+    For Python 3: 
+      - `str` -> encoded to `bytes` 
+      - `bytes` -> `bytes` 
+    """ 
     if isinstance(s, binary_type):
         return s
-    if isinstance(s, text_type):
-        return s.encode(encoding, errors)
+    if isinstance(s, text_type): 
+        return s.encode(encoding, errors) 
     raise TypeError("not expecting type '%s'" % type(s))
-
-
-def ensure_str(s, encoding='utf-8', errors='strict'):
-    """Coerce *s* to `str`.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
+ 
+ 
+def ensure_str(s, encoding='utf-8', errors='strict'): 
+    """Coerce *s* to `str`. 
+ 
+    For Python 2: 
+      - `unicode` -> encoded to `str` 
+      - `str` -> `str` 
+ 
+    For Python 3: 
+      - `str` -> `str` 
+      - `bytes` -> decoded to `str` 
+    """ 
     # Optimization: Fast return for the common case.
     if type(s) is str:
         return s
-    if PY2 and isinstance(s, text_type):
+    if PY2 and isinstance(s, text_type): 
         return s.encode(encoding, errors)
-    elif PY3 and isinstance(s, binary_type):
+    elif PY3 and isinstance(s, binary_type): 
         return s.decode(encoding, errors)
     elif not isinstance(s, (text_type, binary_type)):
         raise TypeError("not expecting type '%s'" % type(s))
-    return s
-
-
-def ensure_text(s, encoding='utf-8', errors='strict'):
-    """Coerce *s* to six.text_type.
-
-    For Python 2:
-      - `unicode` -> `unicode`
-      - `str` -> `unicode`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    if isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif isinstance(s, text_type):
-        return s
-    else:
-        raise TypeError("not expecting type '%s'" % type(s))
-
-
+    return s 
+ 
+ 
+def ensure_text(s, encoding='utf-8', errors='strict'): 
+    """Coerce *s* to six.text_type. 
+ 
+    For Python 2: 
+      - `unicode` -> `unicode` 
+      - `str` -> `unicode` 
+ 
+    For Python 3: 
+      - `str` -> `str` 
+      - `bytes` -> decoded to `str` 
+    """ 
+    if isinstance(s, binary_type): 
+        return s.decode(encoding, errors) 
+    elif isinstance(s, text_type): 
+        return s 
+    else: 
+        raise TypeError("not expecting type '%s'" % type(s)) 
+ 
+ 
 def python_2_unicode_compatible(klass):
     """
     A class decorator that defines __unicode__ and __str__ methods under Python 2.