@@ -14,15 +14,12 @@ import base64

 from . import Config

 from logging import debug

-from .Utils import encode_to_s3, time_to_epoch, deunicodise, decode_from_s3, check_bucket_name_dns_support

+from .Utils import (encode_to_s3, time_to_epoch, deunicodise, decode_from_s3,

+                    check_bucket_name_dns_support, s3_quote)

 from .SortedDict import SortedDict

 import datetime

-try:

-    # python 3 support

-    from urllib import quote

-except ImportError:

-    from urllib.parse import quote

+

 from hashlib import sha1, sha256

@@ -250,29 +247,6 @@ def sign_request_v4(method='GET', host='', canonical_uri='/', params=None,

     return new_headers

 __all__.append("sign_request_v4")

-def s3_quote(param, quote_backslashes=True, unicode_output=False):

-    """

-    URI encode every byte. UriEncode() must enforce the following rules:

-    - URI encode every byte except the unreserved characters: 'A'-'Z', 'a'-'z', '0'-'9', '-', '.', '_', and '~'.

-    - The space character is a reserved character and must be encoded as "%20" (and not as "+").

-    - Each URI encoded byte is formed by a '%' and the two-digit hexadecimal value of the byte.

-    - Letters in the hexadecimal value must be uppercase, for example "%1A".

-    - Encode the forward slash character, '/', everywhere except in the object key name.

-    For example, if the object key name is photos/Jan/sample.jpg, the forward slash in the key name is not encoded.

-    """

-    if quote_backslashes:

-        safe_chars = "~"

-    else:

-        safe_chars = "~/"

-    param = encode_to_s3(param)

-    param = quote(param, safe=safe_chars)

-    if unicode_output:

-        param = decode_from_s3(param)

-    else:

-        param = encode_to_s3(param)

-    return param

-__all__.append("s3_quote")

-

 def checksum_sha256_file(filename, offset=0, size=None):

     try:

         hash = sha256()

@@ -33,7 +33,11 @@ try:

 except ImportError:

     from md5 import md5

-from .Utils import *

+from .Utils import (getListFromXml, getTextFromXml, getRootTagName,

+                    convertHeaderTupleListToDict, hash_file_md5, unicodise,

+                    deunicodise, decode_from_s3, encode_to_s3, s3_quote,

+                    check_bucket_name, check_bucket_name_dns_support,

+                    getHostnameFromBucket, calculateChecksum)

 from .SortedDict import SortedDict

 from .AccessLog import AccessLog

 from .ACL import ACL, GranteeLogDelivery

@@ -44,7 +48,7 @@ from .MultiPart import MultiPartUpload

 from .S3Uri import S3Uri

 from .ConnMan import ConnMan

 from .Crypto import (sign_request_v2, sign_request_v4, checksum_sha256_file,

-                     checksum_sha256_buffer, s3_quote, format_param_str)

+                     checksum_sha256_buffer, format_param_str)

 try:

     from ctypes import ArgumentError

@@ -386,6 +386,29 @@ def encode_to_s3(string, errors = "replace"):

         raise UnicodeEncodeError("Conversion from unicode failed: %r" % string)

 __all__.append("encode_to_s3")

+def s3_quote(param, quote_backslashes=True, unicode_output=False):

+    """

+    URI encode every byte. UriEncode() must enforce the following rules:

+    - URI encode every byte except the unreserved characters: 'A'-'Z', 'a'-'z', '0'-'9', '-', '.', '_', and '~'.

+    - The space character is a reserved character and must be encoded as "%20" (and not as "+").

+    - Each URI encoded byte is formed by a '%' and the two-digit hexadecimal value of the byte.

+    - Letters in the hexadecimal value must be uppercase, for example "%1A".

+    - Encode the forward slash character, '/', everywhere except in the object key name.

+    For example, if the object key name is photos/Jan/sample.jpg, the forward slash in the key name is not encoded.

+    """

+    if quote_backslashes:

+        safe_chars = "~"

+    else:

+        safe_chars = "~/"

+    param = encode_to_s3(param)

+    param = quote(param, safe=safe_chars)

+    if unicode_output:

+        param = decode_from_s3(param)

+    else:

+        param = encode_to_s3(param)

+    return param

+__all__.append("s3_quote")

+

 ## Low level methods

 def urlencode_string(string, urlencoding_mode = None, unicode_output=False):

     string = encode_to_s3(string)