Restoring authorship annotation for Dmitry Kopylov <kopylovd@gmail.com>. Commit 1 of 2.

1 files changed, 122 insertions, 122 deletions

diff --git a/contrib/python/six/six.py b/contrib/python/six/six.py
index 4cba03c75f..a35fd4e78d 100644
--- a/contrib/python/six/six.py
+++ b/contrib/python/six/six.py
@@ -23,7 +23,7 @@
 from __future__ import absolute_import
 
 import functools
-import itertools
+import itertools 
 import operator
 import sys
 import types
@@ -35,7 +35,7 @@ __version__ = "1.16.0"
 # Useful for very coarse version differentiation.
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
+PY34 = sys.version_info[0:2] >= (3, 4) 
 
 if PY3:
     string_types = str,
@@ -58,7 +58,7 @@ else:
     else:
         # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
         class X(object):
-
+ 
             def __len__(self):
                 return 1 << 31
         try:
@@ -95,13 +95,13 @@ class _LazyDescr(object):
 
     def __get__(self, obj, tp):
         result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
-        try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
+        setattr(obj, self.name, result)  # Invokes __set__. 
+        try: 
+            # This is a bit ugly, but it avoids running this again by 
+            # removing this descriptor. 
+            delattr(obj.__class__, self.name) 
+        except AttributeError: 
+            pass 
         return result
 
 
@@ -167,14 +167,14 @@ class MovedAttribute(_LazyDescr):
 
 
 class _SixMetaPathImporter(object):
-
+ 
     """
     A meta path importer to import six.moves and its submodules.
 
     This class implements a PEP302 finder and loader. It should be compatible
     with Python 2.5 and all existing versions of Python3
     """
-
+ 
     def __init__(self, six_module_name):
         self.name = six_module_name
         self.known_modules = {}
@@ -243,7 +243,7 @@ _importer = _SixMetaPathImporter(__name__)
 
 
 class _MovedItems(_LazyModule):
-
+ 
     """Lazy loading of moved objects"""
     __path__ = []  # mark as package
 
@@ -255,11 +255,11 @@ _moved_attributes = [
     MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
     MovedAttribute("intern", "__builtin__", "sys"),
     MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
+    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), 
+    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), 
     MovedAttribute("getoutput", "commands", "subprocess"),
     MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
+    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), 
     MovedAttribute("reduce", "__builtin__", "functools"),
     MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
     MovedAttribute("StringIO", "StringIO", "io"),
@@ -319,12 +319,12 @@ _moved_attributes = [
     MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
     MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
 ]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
+# Add windows specific modules. 
+if sys.platform == "win32": 
+    _moved_attributes += [ 
+        MovedModule("winreg", "_winreg"), 
+    ] 
+ 
 for attr in _moved_attributes:
     setattr(_MovedItems, attr.name, attr)
     if isinstance(attr, MovedModule):
@@ -338,7 +338,7 @@ _importer._add_module(moves, "moves")
 
 
 class Module_six_moves_urllib_parse(_LazyModule):
-
+ 
     """Lazy loading of moved objects in six.moves.urllib_parse"""
 
 
@@ -380,7 +380,7 @@ _importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_pa
 
 
 class Module_six_moves_urllib_error(_LazyModule):
-
+ 
     """Lazy loading of moved objects in six.moves.urllib_error"""
 
 
@@ -400,7 +400,7 @@ _importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.er
 
 
 class Module_six_moves_urllib_request(_LazyModule):
-
+ 
     """Lazy loading of moved objects in six.moves.urllib_request"""
 
 
@@ -452,7 +452,7 @@ _importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.
 
 
 class Module_six_moves_urllib_response(_LazyModule):
-
+ 
     """Lazy loading of moved objects in six.moves.urllib_response"""
 
 
@@ -473,7 +473,7 @@ _importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib
 
 
 class Module_six_moves_urllib_robotparser(_LazyModule):
-
+ 
     """Lazy loading of moved objects in six.moves.urllib_robotparser"""
 
 
@@ -491,7 +491,7 @@ _importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.url
 
 
 class Module_six_moves_urllib(types.ModuleType):
-
+ 
     """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
     __path__ = []  # mark as package
     parse = _importer._get_module("moves.urllib_parse")
@@ -562,9 +562,9 @@ if PY3:
 
     create_bound_method = types.MethodType
 
-    def create_unbound_method(func, cls):
-        return func
-
+    def create_unbound_method(func, cls): 
+        return func 
+ 
     Iterator = object
 else:
     def get_unbound_function(unbound):
@@ -573,9 +573,9 @@ else:
     def create_bound_method(func, obj):
         return types.MethodType(func, obj, obj.__class__)
 
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
+    def create_unbound_method(func, cls): 
+        return types.MethodType(func, None, cls) 
+ 
     class Iterator(object):
 
         def next(self):
@@ -606,31 +606,31 @@ if PY3:
 
     def iterlists(d, **kw):
         return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
+ 
+    viewkeys = operator.methodcaller("keys") 
+ 
+    viewvalues = operator.methodcaller("values") 
+ 
+    viewitems = operator.methodcaller("items") 
 else:
     def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
+        return d.iterkeys(**kw) 
 
     def itervalues(d, **kw):
-        return d.itervalues(**kw)
+        return d.itervalues(**kw) 
 
     def iteritems(d, **kw):
-        return d.iteritems(**kw)
+        return d.iteritems(**kw) 
 
     def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
+        return d.iterlists(**kw) 
+
+    viewkeys = operator.methodcaller("viewkeys") 
+ 
+    viewvalues = operator.methodcaller("viewvalues") 
+ 
+    viewitems = operator.methodcaller("viewitems") 
+ 
 _add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
 _add_doc(itervalues, "Return an iterator over the values of a dictionary.")
 _add_doc(iteritems,
@@ -642,13 +642,13 @@ _add_doc(iterlists,
 if PY3:
     def b(s):
         return s.encode("latin-1")
-
+ 
     def u(s):
         return s
     unichr = chr
-    import struct
-    int2byte = struct.Struct(">B").pack
-    del struct
+    import struct 
+    int2byte = struct.Struct(">B").pack 
+    del struct 
     byte2int = operator.itemgetter(0)
     indexbytes = operator.getitem
     iterbytes = iter
@@ -656,53 +656,53 @@ if PY3:
     StringIO = io.StringIO
     BytesIO = io.BytesIO
     del io
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
+    _assertCountEqual = "assertCountEqual" 
+    if sys.version_info[1] <= 1: 
+        _assertRaisesRegex = "assertRaisesRegexp" 
+        _assertRegex = "assertRegexpMatches" 
         _assertNotRegex = "assertNotRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
+    else: 
+        _assertRaisesRegex = "assertRaisesRegex" 
+        _assertRegex = "assertRegex" 
         _assertNotRegex = "assertNotRegex"
 else:
     def b(s):
         return s
     # Workaround for standalone backslash
-
+ 
     def u(s):
         return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
     unichr = unichr
     int2byte = chr
-
+ 
     def byte2int(bs):
         return ord(bs[0])
-
+ 
     def indexbytes(buf, i):
         return ord(buf[i])
-    iterbytes = functools.partial(itertools.imap, ord)
+    iterbytes = functools.partial(itertools.imap, ord) 
     import StringIO
     StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
+    _assertCountEqual = "assertItemsEqual" 
+    _assertRaisesRegex = "assertRaisesRegexp" 
+    _assertRegex = "assertRegexpMatches" 
     _assertNotRegex = "assertNotRegexpMatches"
 _add_doc(b, """Byte literal""")
 _add_doc(u, """Text literal""")
 
 
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
+def assertCountEqual(self, *args, **kwargs): 
+    return getattr(self, _assertCountEqual)(*args, **kwargs) 
+ 
+ 
+def assertRaisesRegex(self, *args, **kwargs): 
+    return getattr(self, _assertRaisesRegex)(*args, **kwargs) 
+ 
+ 
+def assertRegex(self, *args, **kwargs): 
+    return getattr(self, _assertRegex)(*args, **kwargs) 
+ 
+ 
 def assertNotRegex(self, *args, **kwargs):
     return getattr(self, _assertNotRegex)(*args, **kwargs)
 
@@ -743,17 +743,17 @@ else:
 
 
 if sys.version_info[:2] > (3,):
-    exec_("""def raise_from(value, from_value):
+    exec_("""def raise_from(value, from_value): 
     try:
         raise value from from_value
     finally:
         value = None
-""")
-else:
-    def raise_from(value, from_value):
-        raise value
-
-
+""") 
+else: 
+    def raise_from(value, from_value): 
+        raise value 
+ 
+ 
 print_ = getattr(moves.builtins, "print", None)
 if print_ is None:
     def print_(*args, **kwargs):
@@ -761,14 +761,14 @@ if print_ is None:
         fp = kwargs.pop("file", sys.stdout)
         if fp is None:
             return
-
+ 
         def write(data):
             if not isinstance(data, basestring):
                 data = str(data)
             # If the file has an encoding, encode unicode with it.
             if (isinstance(fp, file) and
-                    isinstance(data, unicode) and
-                    fp.encoding is not None):
+                    isinstance(data, unicode) and 
+                    fp.encoding is not None): 
                 errors = getattr(fp, "errors", None)
                 if errors is None:
                     errors = "strict"
@@ -809,16 +809,16 @@ if print_ is None:
                 write(sep)
             write(arg)
         write(end)
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
-
+if sys.version_info[:2] < (3, 3): 
+    _print = print_ 
+
+    def print_(*args, **kwargs): 
+        fp = kwargs.get("file", sys.stdout) 
+        flush = kwargs.pop("flush", False) 
+        _print(*args, **kwargs) 
+        if flush and fp is not None: 
+            fp.flush() 
+ 
 _add_doc(reraise, """Reraise an exception.""")
 
 if sys.version_info[0:2] < (3, 4):
@@ -852,14 +852,14 @@ if sys.version_info[0:2] < (3, 4):
 else:
     wraps = functools.wraps
 
-
+ 
 def with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
     # 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):
-
+ 
         def __new__(cls, name, this_bases, d):
             if sys.version_info[:2] >= (3, 7):
                 # This version introduced PEP 560 that requires a bit
@@ -894,7 +894,7 @@ def add_metaclass(metaclass):
         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.
 
@@ -955,24 +955,24 @@ def ensure_text(s, encoding='utf-8', errors='strict'):
         raise TypeError("not expecting type '%s'" % type(s))
 
 
-def python_2_unicode_compatible(klass):
-    """
+def python_2_unicode_compatible(klass): 
+    """ 
     A class decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if '__str__' not in klass.__dict__:
-            raise ValueError("@python_2_unicode_compatible cannot be applied "
-                             "to %s because it doesn't define __str__()." %
-                             klass.__name__)
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
+    Under Python 3 it does nothing. 
+ 
+    To support Python 2 and 3 with a single code base, define a __str__ method 
+    returning text and apply this decorator to the class. 
+    """ 
+    if PY2: 
+        if '__str__' not in klass.__dict__: 
+            raise ValueError("@python_2_unicode_compatible cannot be applied " 
+                             "to %s because it doesn't define __str__()." % 
+                             klass.__name__) 
+        klass.__unicode__ = klass.__str__ 
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8') 
+    return klass 
+ 
+ 
 # Complete the moves implementation.
 # This code is at the end of this module to speed up module loading.
 # Turn this module into a package.
@@ -990,7 +990,7 @@ if sys.meta_path:
         # the six meta path importer, since the other six instance will have
         # inserted an importer with different class.
         if (type(importer).__name__ == "_SixMetaPathImporter" and
-                importer.name == __name__):
+                importer.name == __name__): 
             del sys.meta_path[i]
             break
     del i, importer