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

5 files changed, 127 insertions, 127 deletions

diff --git a/contrib/python/future/http/__init__.py b/contrib/python/future/http/__init__.py
index dba271f0f8..e4f853e53c 100644
--- a/contrib/python/future/http/__init__.py
+++ b/contrib/python/future/http/__init__.py
@@ -1,9 +1,9 @@
-from __future__ import absolute_import 
-import sys 
- 
-if sys.version_info[0] < 3: 
-    pass 
-else: 
-    raise ImportError('This package should not be accessible on Python 3. ' 
-                      'Either you are trying to run from the python-future src folder ' 
-                      'or your installation of python-future is corrupted.') 
+from __future__ import absolute_import
+import sys
+
+if sys.version_info[0] < 3:
+    pass
+else:
+    raise ImportError('This package should not be accessible on Python 3. '
+                      'Either you are trying to run from the python-future src folder '
+                      'or your installation of python-future is corrupted.')
diff --git a/contrib/python/future/http/client.py b/contrib/python/future/http/client.py
index 6153229d5e..a6a31006bd 100644
--- a/contrib/python/future/http/client.py
+++ b/contrib/python/future/http/client.py
@@ -1,90 +1,90 @@
-from __future__ import absolute_import 
-import sys 
- 
-assert sys.version_info[0] < 3 
- 
-from httplib import * 
-from httplib import HTTPMessage 
- 
-# These constants aren't included in __all__ in httplib.py: 
- 
-from httplib import (HTTP_PORT, 
-                     HTTPS_PORT, 
- 
-                     CONTINUE, 
-                     SWITCHING_PROTOCOLS, 
-                     PROCESSING, 
- 
-                     OK, 
-                     CREATED, 
-                     ACCEPTED, 
-                     NON_AUTHORITATIVE_INFORMATION, 
-                     NO_CONTENT, 
-                     RESET_CONTENT, 
-                     PARTIAL_CONTENT, 
-                     MULTI_STATUS, 
-                     IM_USED, 
- 
-                     MULTIPLE_CHOICES, 
-                     MOVED_PERMANENTLY, 
-                     FOUND, 
-                     SEE_OTHER, 
-                     NOT_MODIFIED, 
-                     USE_PROXY, 
-                     TEMPORARY_REDIRECT, 
- 
-                     BAD_REQUEST, 
-                     UNAUTHORIZED, 
-                     PAYMENT_REQUIRED, 
-                     FORBIDDEN, 
-                     NOT_FOUND, 
-                     METHOD_NOT_ALLOWED, 
-                     NOT_ACCEPTABLE, 
-                     PROXY_AUTHENTICATION_REQUIRED, 
-                     REQUEST_TIMEOUT, 
-                     CONFLICT, 
-                     GONE, 
-                     LENGTH_REQUIRED, 
-                     PRECONDITION_FAILED, 
-                     REQUEST_ENTITY_TOO_LARGE, 
-                     REQUEST_URI_TOO_LONG, 
-                     UNSUPPORTED_MEDIA_TYPE, 
-                     REQUESTED_RANGE_NOT_SATISFIABLE, 
-                     EXPECTATION_FAILED, 
-                     UNPROCESSABLE_ENTITY, 
-                     LOCKED, 
-                     FAILED_DEPENDENCY, 
-                     UPGRADE_REQUIRED, 
- 
-                     INTERNAL_SERVER_ERROR, 
-                     NOT_IMPLEMENTED, 
-                     BAD_GATEWAY, 
-                     SERVICE_UNAVAILABLE, 
-                     GATEWAY_TIMEOUT, 
-                     HTTP_VERSION_NOT_SUPPORTED, 
-                     INSUFFICIENT_STORAGE, 
-                     NOT_EXTENDED, 
- 
-                     MAXAMOUNT, 
-                    ) 
- 
-# These are not available on Python 2.6.x: 
-try: 
-    from httplib import LineTooLong, LineAndFileWrapper 
-except ImportError: 
-    pass 
- 
-# These may not be available on all versions of Python 2.6.x or 2.7.x 
-try: 
-    from httplib import ( 
+from __future__ import absolute_import
+import sys
+
+assert sys.version_info[0] < 3
+
+from httplib import *
+from httplib import HTTPMessage
+
+# These constants aren't included in __all__ in httplib.py:
+
+from httplib import (HTTP_PORT,
+                     HTTPS_PORT,
+
+                     CONTINUE,
+                     SWITCHING_PROTOCOLS,
+                     PROCESSING,
+
+                     OK,
+                     CREATED,
+                     ACCEPTED,
+                     NON_AUTHORITATIVE_INFORMATION,
+                     NO_CONTENT,
+                     RESET_CONTENT,
+                     PARTIAL_CONTENT,
+                     MULTI_STATUS,
+                     IM_USED,
+
+                     MULTIPLE_CHOICES,
+                     MOVED_PERMANENTLY,
+                     FOUND,
+                     SEE_OTHER,
+                     NOT_MODIFIED,
+                     USE_PROXY,
+                     TEMPORARY_REDIRECT,
+
+                     BAD_REQUEST,
+                     UNAUTHORIZED,
+                     PAYMENT_REQUIRED,
+                     FORBIDDEN,
+                     NOT_FOUND,
+                     METHOD_NOT_ALLOWED,
+                     NOT_ACCEPTABLE,
+                     PROXY_AUTHENTICATION_REQUIRED,
+                     REQUEST_TIMEOUT,
+                     CONFLICT,
+                     GONE,
+                     LENGTH_REQUIRED,
+                     PRECONDITION_FAILED,
+                     REQUEST_ENTITY_TOO_LARGE,
+                     REQUEST_URI_TOO_LONG,
+                     UNSUPPORTED_MEDIA_TYPE,
+                     REQUESTED_RANGE_NOT_SATISFIABLE,
+                     EXPECTATION_FAILED,
+                     UNPROCESSABLE_ENTITY,
+                     LOCKED,
+                     FAILED_DEPENDENCY,
+                     UPGRADE_REQUIRED,
+
+                     INTERNAL_SERVER_ERROR,
+                     NOT_IMPLEMENTED,
+                     BAD_GATEWAY,
+                     SERVICE_UNAVAILABLE,
+                     GATEWAY_TIMEOUT,
+                     HTTP_VERSION_NOT_SUPPORTED,
+                     INSUFFICIENT_STORAGE,
+                     NOT_EXTENDED,
+
+                     MAXAMOUNT,
+                    )
+
+# These are not available on Python 2.6.x:
+try:
+    from httplib import LineTooLong, LineAndFileWrapper
+except ImportError:
+    pass
+
+# These may not be available on all versions of Python 2.6.x or 2.7.x
+try:
+    from httplib import (
                          _CS_IDLE,
                          _CS_REQ_STARTED,
                          _CS_REQ_SENT,
-                         _MAXLINE, 
-                         _MAXHEADERS, 
-                         _is_legal_header_name, 
-                         _is_illegal_header_value, 
-                         _METHODS_EXPECTING_BODY 
-                        ) 
-except ImportError: 
-    pass 
+                         _MAXLINE,
+                         _MAXHEADERS,
+                         _is_legal_header_name,
+                         _is_illegal_header_value,
+                         _METHODS_EXPECTING_BODY
+                        )
+except ImportError:
+    pass
diff --git a/contrib/python/future/http/cookiejar.py b/contrib/python/future/http/cookiejar.py
index b53fa56663..d847b2bf2d 100644
--- a/contrib/python/future/http/cookiejar.py
+++ b/contrib/python/future/http/cookiejar.py
@@ -1,6 +1,6 @@
-from __future__ import absolute_import 
-import sys 
- 
-assert sys.version_info[0] < 3 
- 
-from cookielib import * 
+from __future__ import absolute_import
+import sys
+
+assert sys.version_info[0] < 3
+
+from cookielib import *
diff --git a/contrib/python/future/http/cookies.py b/contrib/python/future/http/cookies.py
index d2bba70b34..eb2a82388b 100644
--- a/contrib/python/future/http/cookies.py
+++ b/contrib/python/future/http/cookies.py
@@ -1,7 +1,7 @@
-from __future__ import absolute_import 
-import sys 
- 
-assert sys.version_info[0] < 3 
- 
-from Cookie import * 
-from Cookie import Morsel    # left out of __all__ on Py2.7! 
+from __future__ import absolute_import
+import sys
+
+assert sys.version_info[0] < 3
+
+from Cookie import *
+from Cookie import Morsel    # left out of __all__ on Py2.7!
diff --git a/contrib/python/future/http/server.py b/contrib/python/future/http/server.py
index 755155c3d7..2971055782 100644
--- a/contrib/python/future/http/server.py
+++ b/contrib/python/future/http/server.py
@@ -1,18 +1,18 @@
-from __future__ import absolute_import 
-import sys 
- 
-assert sys.version_info[0] < 3 
- 
-from BaseHTTPServer import * 
-from CGIHTTPServer import * 
-from SimpleHTTPServer import * 
-try: 
-    from CGIHTTPServer import _url_collapse_path     # needed for a test 
-except ImportError: 
-    try: 
-        # Python 2.7.0 to 2.7.3 
-        from CGIHTTPServer import ( 
-            _url_collapse_path_split as _url_collapse_path) 
-    except ImportError: 
-        # Doesn't exist on Python 2.6.x. Ignore it. 
-        pass 
+from __future__ import absolute_import
+import sys
+
+assert sys.version_info[0] < 3
+
+from BaseHTTPServer import *
+from CGIHTTPServer import *
+from SimpleHTTPServer import *
+try:
+    from CGIHTTPServer import _url_collapse_path     # needed for a test
+except ImportError:
+    try:
+        # Python 2.7.0 to 2.7.3
+        from CGIHTTPServer import (
+            _url_collapse_path_split as _url_collapse_path)
+    except ImportError:
+        # Doesn't exist on Python 2.6.x. Ignore it.
+        pass