openstack/python-swiftclient
Code Issues Proposed changes

Clean up some warnings

Browse Source 
Change-Id: Iae149533d04c7b173c4ef88fb775f5fe13c16466
This commit is contained in:
Tim Burke 2020-06-17 21:05:03 -07:00
parent b63d9a3e96
commit 22d1f3a39a
2 changed files with 29 additions and 26 deletions
swiftclient
utils.py
test/unit
test_utils.py

7
swiftclient/utils.py

@ -14,7 +14,10 @@
# limitations under the License. # limitations under the License.
"""Miscellaneous utility functions for use with Swift.""" """Miscellaneous utility functions for use with Swift."""
from calendar import timegm from calendar import timegm
import collections try:
from collections.abc import Mapping
except ImportError:
from collections import Mapping
import gzip import gzip
import hashlib import hashlib
import hmac import hmac
@ -218,7 +221,7 @@ def parse_api_response(headers, body):
def split_request_headers(options, prefix=''): def split_request_headers(options, prefix=''):
headers = {} headers = {}
if isinstance(options, collections.Mapping): if isinstance(options, Mapping):
options = options.items() options = options.items()
for item in options: for item in options:
if isinstance(item, six.string_types): if isinstance(item, six.string_types):

48
test/unit/test_utils.py

@ -521,15 +521,15 @@ class TestLengthWrapper(unittest.TestCase):
with tempfile.NamedTemporaryFile(mode='wb') as f: with tempfile.NamedTemporaryFile(mode='wb') as f:
f.write(b'a' * 100) f.write(b'a' * 100)
f.flush() f.flush()
contents = open(f.name, 'rb') with open(f.name, 'rb') as contents:
data = u.LengthWrapper(contents, 42, True) data = u.LengthWrapper(contents, 42, True)
s = b'a' * 42 s = b'a' * 42
read_data = b''.join(iter(data.read, '')) read_data = b''.join(iter(data.read, ''))
self.assertEqual(42, len(data)) self.assertEqual(42, len(data))
self.assertEqual(42, len(read_data)) self.assertEqual(42, len(read_data))
self.assertEqual(s, read_data) self.assertEqual(s, read_data)
self.assertEqual(md5(s).hexdigest(), data.get_md5sum()) self.assertEqual(md5(s).hexdigest(), data.get_md5sum())
def test_segmented_file(self): def test_segmented_file(self):
with tempfile.NamedTemporaryFile(mode='wb') as f: with tempfile.NamedTemporaryFile(mode='wb') as f:
@ -539,24 +539,24 @@ class TestLengthWrapper(unittest.TestCase):
f.write((c * segment_length).encode()) f.write((c * segment_length).encode())
f.flush() f.flush()
for i, c in enumerate(segments): for i, c in enumerate(segments):
contents = open(f.name, 'rb') with open(f.name, 'rb') as contents:
contents.seek(i * segment_length) contents.seek(i * segment_length)
data = u.LengthWrapper(contents, segment_length, True) data = u.LengthWrapper(contents, segment_length, True)
read_data = b''.join(iter(data.read, '')) read_data = b''.join(iter(data.read, ''))
s = (c * segment_length).encode() s = (c * segment_length).encode()
self.assertEqual(segment_length, len(data)) self.assertEqual(segment_length, len(data))
self.assertEqual(segment_length, len(read_data)) self.assertEqual(segment_length, len(read_data))
self.assertEqual(s, read_data) self.assertEqual(s, read_data)
self.assertEqual(md5(s).hexdigest(), data.get_md5sum()) self.assertEqual(md5(s).hexdigest(), data.get_md5sum())
data.reset() data.reset()
self.assertEqual(md5().hexdigest(), data.get_md5sum()) self.assertEqual(md5().hexdigest(), data.get_md5sum())
read_data = b''.join(iter(data.read, '')) read_data = b''.join(iter(data.read, ''))
self.assertEqual(segment_length, len(data)) self.assertEqual(segment_length, len(data))
self.assertEqual(segment_length, len(read_data)) self.assertEqual(segment_length, len(read_data))
self.assertEqual(s, read_data) self.assertEqual(s, read_data)
self.assertEqual(md5(s).hexdigest(), data.get_md5sum()) self.assertEqual(md5(s).hexdigest(), data.get_md5sum())
class TestGroupers(unittest.TestCase): class TestGroupers(unittest.TestCase):