You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/04/06 02:33:07 UTC
[1/4] libcloud git commit: add test to show LIBCLOUD-910 failure
Repository: libcloud
Updated Branches:
refs/heads/trunk fce25cd6a -> f6aaee21b
add test to show LIBCLOUD-910 failure
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4e5ddfbf
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4e5ddfbf
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4e5ddfbf
Branch: refs/heads/trunk
Commit: 4e5ddfbf2ab6c3bbaf7b2092ce3094dff54d5b59
Parents: c62d7c9
Author: Anthony Shaw <an...@apache.org>
Authored: Thu Apr 6 11:16:32 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Thu Apr 6 11:16:32 2017 +1000
----------------------------------------------------------------------
libcloud/test/test_logging_connection.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/4e5ddfbf/libcloud/test/test_logging_connection.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_logging_connection.py b/libcloud/test/test_logging_connection.py
index e7088a4..ed1fc5a 100644
--- a/libcloud/test/test_logging_connection.py
+++ b/libcloud/test/test_logging_connection.py
@@ -15,11 +15,13 @@
import sys
from io import StringIO
+import zlib
import requests_mock
import libcloud
from libcloud.test import unittest
from libcloud.common.base import Connection
+from libcloud.utils.py3 import b
from libcloud.httplib_ssl import LibcloudConnection
from libcloud.utils.loggingconnection import LoggingConnection
@@ -49,5 +51,20 @@ class TestLoggingConnection(unittest.TestCase):
self.assertIn('-i -X GET', log)
self.assertIn('data', log)
+ def test_debug_log_class_handles_request_with_compression(self):
+ with StringIO() as fh:
+ libcloud.enable_debug(fh)
+ conn = Connection(url='http://test.com/')
+ conn.connect()
+ self.assertEqual(conn.connection.host, 'http://test.com')
+ with requests_mock.mock() as m:
+ m.get('http://test.com/test', content=zlib.compress(b'test'),
+ headers={'content-encoding': 'zlib'})
+ conn.request('/test')
+ log = fh.getvalue()
+ self.assertTrue(isinstance(conn.connection, LoggingConnection))
+ self.assertIn('-i -X GET', log)
+ self.assertIn('data', log)
+
if __name__ == '__main__':
sys.exit(unittest.main())
[4/4] libcloud git commit: Merge branch 'trunk' into libcloud_910
Posted by an...@apache.org.
Merge branch 'trunk' into libcloud_910
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f6aaee21
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f6aaee21
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f6aaee21
Branch: refs/heads/trunk
Commit: f6aaee21b5adc1e4bfef412062962966d2439f32
Parents: 1fd49ed fce25cd
Author: Anthony Shaw <an...@apache.org>
Authored: Thu Apr 6 12:07:42 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Thu Apr 6 12:07:42 2017 +1000
----------------------------------------------------------------------
CHANGES.rst | 4 ++++
libcloud/common/linode.py | 25 ++-----------------------
2 files changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[2/4] libcloud git commit: add fix by removing inline decoding in the
library
Posted by an...@apache.org.
add fix by removing inline decoding in the library
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a4830d2d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a4830d2d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a4830d2d
Branch: refs/heads/trunk
Commit: a4830d2d34ea1d08e0c715ec9ea50733e4a8a78a
Parents: 4e5ddfb
Author: Anthony Shaw <an...@apache.org>
Authored: Thu Apr 6 11:35:50 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Thu Apr 6 11:35:50 2017 +1000
----------------------------------------------------------------------
libcloud/test/test_logging_connection.py | 4 ++--
libcloud/utils/loggingconnection.py | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a4830d2d/libcloud/test/test_logging_connection.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_logging_connection.py b/libcloud/test/test_logging_connection.py
index ed1fc5a..c1dbee6 100644
--- a/libcloud/test/test_logging_connection.py
+++ b/libcloud/test/test_logging_connection.py
@@ -52,19 +52,19 @@ class TestLoggingConnection(unittest.TestCase):
self.assertIn('data', log)
def test_debug_log_class_handles_request_with_compression(self):
+ request = zlib.compress(b'data')
with StringIO() as fh:
libcloud.enable_debug(fh)
conn = Connection(url='http://test.com/')
conn.connect()
self.assertEqual(conn.connection.host, 'http://test.com')
with requests_mock.mock() as m:
- m.get('http://test.com/test', content=zlib.compress(b'test'),
+ m.get('http://test.com/test', content=request,
headers={'content-encoding': 'zlib'})
conn.request('/test')
log = fh.getvalue()
self.assertTrue(isinstance(conn.connection, LoggingConnection))
self.assertIn('-i -X GET', log)
- self.assertIn('data', log)
if __name__ == '__main__':
sys.exit(unittest.main())
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a4830d2d/libcloud/utils/loggingconnection.py
----------------------------------------------------------------------
diff --git a/libcloud/utils/loggingconnection.py b/libcloud/utils/loggingconnection.py
index 1e3ff41..7756b13 100644
--- a/libcloud/utils/loggingconnection.py
+++ b/libcloud/utils/loggingconnection.py
@@ -62,14 +62,8 @@ class LoggingConnection(LibcloudConnection):
headers = lowercase_keys(dict(r.getheaders()))
- encoding = headers.get('content-encoding', None)
content_type = headers.get('content-type', None)
- if encoding in ['zlib', 'deflate']:
- body = decompress_data('zlib', body)
- elif encoding in ['gzip', 'x-gzip']:
- body = decompress_data('gzip', body)
-
pretty_print = os.environ.get('LIBCLOUD_DEBUG_PRETTY_PRINT_RESPONSE',
False)
[3/4] libcloud git commit: cleanup old decompression code
Posted by an...@apache.org.
cleanup old decompression code
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1fd49ed6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1fd49ed6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1fd49ed6
Branch: refs/heads/trunk
Commit: 1fd49ed6caa64ebe261bfdc93eaf1fd2209578ad
Parents: a4830d2
Author: Anthony Shaw <an...@apache.org>
Authored: Thu Apr 6 11:41:49 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Thu Apr 6 11:41:49 2017 +1000
----------------------------------------------------------------------
libcloud/common/base.py | 26 -----------------
libcloud/test/test_logging_connection.py | 1 -
libcloud/utils/compression.py | 42 ---------------------------
libcloud/utils/loggingconnection.py | 1 -
4 files changed, 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/1fd49ed6/libcloud/common/base.py
----------------------------------------------------------------------
diff --git a/libcloud/common/base.py b/libcloud/common/base.py
index 0d458fc..ca510e7 100644
--- a/libcloud/common/base.py
+++ b/libcloud/common/base.py
@@ -42,8 +42,6 @@ from libcloud.utils.py3 import urlparse
from libcloud.utils.py3 import urlencode
from libcloud.utils.misc import lowercase_keys, retry
-from libcloud.utils.compression import decompress_data
-
from libcloud.common.exceptions import exception_from_message
from libcloud.common.types import LibcloudError, MalformedResponseError
from libcloud.httplib_ssl import LibcloudConnection, HttpLibResponseProxy
@@ -200,30 +198,6 @@ class Response(object):
return self.status in [requests.codes.ok, requests.codes.created,
httplib.OK, httplib.CREATED, httplib.ACCEPTED]
- def _decompress_response(self, body, headers):
- """
- Decompress a response body if it is using deflate or gzip encoding.
-
- :param body: Response body.
- :type body: ``str``
-
- :param headers: Response headers.
- :type headers: ``dict``
-
- :return: Decompressed response
- :rtype: ``str``
- """
- encoding = headers.get('content-encoding', None)
-
- if encoding in ['zlib', 'deflate']:
- body = decompress_data('zlib', body)
- elif encoding in ['gzip', 'x-gzip']:
- body = decompress_data('gzip', body)
- else:
- body = body.strip()
-
- return body
-
class JsonResponse(Response):
"""
http://git-wip-us.apache.org/repos/asf/libcloud/blob/1fd49ed6/libcloud/test/test_logging_connection.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_logging_connection.py b/libcloud/test/test_logging_connection.py
index c1dbee6..85c6547 100644
--- a/libcloud/test/test_logging_connection.py
+++ b/libcloud/test/test_logging_connection.py
@@ -21,7 +21,6 @@ import requests_mock
import libcloud
from libcloud.test import unittest
from libcloud.common.base import Connection
-from libcloud.utils.py3 import b
from libcloud.httplib_ssl import LibcloudConnection
from libcloud.utils.loggingconnection import LoggingConnection
http://git-wip-us.apache.org/repos/asf/libcloud/blob/1fd49ed6/libcloud/utils/compression.py
----------------------------------------------------------------------
diff --git a/libcloud/utils/compression.py b/libcloud/utils/compression.py
deleted file mode 100644
index 9840538..0000000
--- a/libcloud/utils/compression.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import zlib
-import gzip
-
-from libcloud.utils.py3 import PY3
-from libcloud.utils.py3 import StringIO
-
-
-__all__ = [
- 'decompress_data'
-]
-
-
-def decompress_data(compression_type, data):
- if compression_type == 'zlib':
- return zlib.decompress(data)
- elif compression_type == 'gzip':
- # TODO: Should export BytesIO as StringIO in libcloud.utils.py3
- if PY3:
- from io import BytesIO
- cls = BytesIO
- else:
- cls = StringIO
-
- return gzip.GzipFile(fileobj=cls(data)).read()
- else:
- raise Exception('Invalid or onsupported compression type: %s' %
- (compression_type))
http://git-wip-us.apache.org/repos/asf/libcloud/blob/1fd49ed6/libcloud/utils/loggingconnection.py
----------------------------------------------------------------------
diff --git a/libcloud/utils/loggingconnection.py b/libcloud/utils/loggingconnection.py
index 7756b13..265f645 100644
--- a/libcloud/utils/loggingconnection.py
+++ b/libcloud/utils/loggingconnection.py
@@ -30,7 +30,6 @@ from libcloud.common.base import (LibcloudConnection,
from libcloud.utils.py3 import _real_unicode as u
from libcloud.utils.misc import lowercase_keys
-from libcloud.utils.compression import decompress_data
class LoggingConnection(LibcloudConnection):