diff options
| author | Daniel G. Taylor <danielgtaylor@gmail.com> | 2014-08-04 15:42:30 -0700 |
|---|---|---|
| committer | Daniel G. Taylor <danielgtaylor@gmail.com> | 2014-08-04 15:42:30 -0700 |
| commit | ff3d8159af3c816303785e023a4182aacb6aabf5 (patch) | |
| tree | 3f9ccb173904eecef829d07f9acbddc6e4b444e5 /tests/integration/s3/mock_storage_service.py | |
| parent | 60603b6514268a76d9f84a8f381fd645271492a8 (diff) | |
| parent | 8aea0d3381d22d7dc0a58c488db6f5d429083c9c (diff) | |
| download | boto-ff3d8159af3c816303785e023a4182aacb6aabf5.tar.gz | |
Merge branch 'release-2.32.1'2.32.1
Conflicts:
docs/source/index.rst
Diffstat (limited to 'tests/integration/s3/mock_storage_service.py')
| -rw-r--r-- | tests/integration/s3/mock_storage_service.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/integration/s3/mock_storage_service.py b/tests/integration/s3/mock_storage_service.py index d7c59930..8b5ff28d 100644 --- a/tests/integration/s3/mock_storage_service.py +++ b/tests/integration/s3/mock_storage_service.py @@ -30,6 +30,7 @@ import copy import boto import base64 import re +from hashlib import md5 from boto.utils import compute_md5 from boto.utils import find_matching_headers @@ -37,11 +38,6 @@ from boto.utils import merge_headers_by_name from boto.s3.prefix import Prefix from boto.compat import six -try: - from hashlib import md5 -except ImportError: - from md5 import md5 - NOT_IMPL = None |