Python3: make relative imports explicit

.travis.yml

@@ -31,6 +31,6 @@ before_script:
     - sleep 4 # give minio some time to start
 # command to run tests
 ## Tests stopped at test 23 because minio doesn't support "quote_plus" used in signatures.
-script: ./run-tests-minio.py -c .travis.s3cfg -p baseauto 1..23
+script: python ./run-tests-minio.py -c .travis.s3cfg -p baseauto 1..23
 after_script:
     - killall minio

S3/ACL.py

@@ -6,9 +6,9 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
-from Utils import getTreeFromXml, deunicodise
+from .Utils import getTreeFromXml, deunicodise
 
 try:
     import xml.etree.ElementTree as ET

S3/AccessLog.py

@@ -6,12 +6,12 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
-import S3Uri
-from Exceptions import ParameterError
-from Utils import getTreeFromXml
-from ACL import GranteeAnonRead
+from . import S3Uri
+from .Exceptions import ParameterError
+from .Utils import getTreeFromXml
+from .ACL import GranteeAnonRead
 
 try:
     import xml.etree.ElementTree as ET

S3/CloudFront.py

@@ -6,6 +6,8 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
+from __future__ import absolute_import
+
 import sys
 import time
 import random
@@ -17,13 +19,13 @@
 except ImportError:
     import elementtree.ElementTree as ET
 
-from S3 import S3
-from Config import Config
-from Exceptions import *
-from Utils import getTreeFromXml, appendXmlTextNode, getDictFromTree, dateS3toPython, getBucketFromHostname, getHostnameFromBucket, deunicodise
-from Crypto import sign_string_v2
-from S3Uri import S3Uri, S3UriS3
-from ConnMan import ConnMan
+from .S3 import S3
+from .Config import Config
+from .Exceptions import *
+from .Utils import getTreeFromXml, appendXmlTextNode, getDictFromTree, dateS3toPython, getBucketFromHostname, getHostnameFromBucket, deunicodise
+from .Crypto import sign_string_v2
+from .S3Uri import S3Uri, S3UriS3
+from .ConnMan import ConnMan
 
 cloudfront_api_version = "2010-11-01"
 cloudfront_resource = "/%(api_ver)s/distribution" % { 'api_ver' : cloudfront_api_version }

S3/ConnMan.py

@@ -6,16 +6,18 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
+from __future__ import absolute_import
+
 import sys
-from custom_httplib27 import httplib
+from .custom_httplib27 import httplib
 import ssl
 from threading import Semaphore
 from logging import debug
 from urlparse import urlparse
 
-from Config import Config
-from Exceptions import ParameterError
-from Utils import getBucketFromHostname
+from .Config import Config
+from .Exceptions import ParameterError
+from .Utils import getBucketFromHostname
 
 if not 'CertificateError ' in ssl.__dict__:
     class CertificateError(Exception):

S3/Crypto.py

@@ -6,21 +6,23 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
+from __future__ import absolute_import
+
 import sys
 import hmac
 import base64
 
-import Config
+from . import Config
 from logging import debug
-from Utils import encode_to_s3, time_to_epoch, deunicodise
+from .Utils import encode_to_s3, time_to_epoch, deunicodise
 
 import datetime
 import urllib
 
 # hashlib backported to python 2.4 / 2.5 is not compatible with hmac!
 if sys.version_info[0] == 2 and sys.version_info[1] < 6:
     import sha as sha1
-    from Crypto.Hash import SHA256 as sha256
+    from .Crypto.Hash import SHA256 as sha256
 else:
     from hashlib import sha1, sha256
 

S3/Exceptions.py

@@ -6,9 +6,11 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
-from Utils import getTreeFromXml, unicodise, deunicodise
+from __future__ import absolute_import
+
+from .Utils import getTreeFromXml, unicodise, deunicodise
 from logging import debug, error
-import ExitCodes
+from . import ExitCodes
 
 try:
     from xml.etree.ElementTree import ParseError as XmlParseError

S3/FileDict.py

@@ -6,10 +6,12 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
+from __future__ import absolute_import
+
 import logging
-from SortedDict import SortedDict
-import Utils
-import Config
+from .SortedDict import SortedDict
+from . import Utils
+from . import Config
 
 zero_length_md5 = "d41d8cd98f00b204e9800998ecf8427e"
 cfg = Config.Config()

S3/FileLists.py

@@ -6,13 +6,15 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
-from S3 import S3
-from Config import Config
-from S3Uri import S3Uri
-from FileDict import FileDict
-from Utils import *
-from Exceptions import ParameterError
-from HashCache import HashCache
+from __future__ import absolute_import
+
+from .S3 import S3
+from .Config import Config
+from .S3Uri import S3Uri
+from .FileDict import FileDict
+from .Utils import *
+from .Exceptions import ParameterError
+from .HashCache import HashCache
 
 from logging import debug, info, warning
 

S3/HashCache.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+
 import cPickle as pickle
-from Utils import deunicodise
+from .Utils import deunicodise
 
 class HashCache(object):
     def __init__(self):

S3/MultiPart.py

@@ -4,11 +4,13 @@
 ## Author: Jerome Leclanche <jerome.leclanche@gmail.com>
 ## License: GPL Version 2
 
+from __future__ import absolute_import
+
 import os
 import sys
 from stat import ST_SIZE
 from logging import debug, info, warning, error
-from Utils import getTextFromXml, getTreeFromXml, formatSize, unicodise, deunicodise, calculateChecksum, parseNodes, encode_to_s3
+from .Utils import getTextFromXml, getTreeFromXml, formatSize, unicodise, deunicodise, calculateChecksum, parseNodes, encode_to_s3
 
 class MultiPartUpload(object):
 

S3/S3.py

@@ -6,6 +6,8 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
+from __future__ import absolute_import
+
 import sys
 import os
 import time
@@ -24,17 +26,17 @@
 except ImportError:
     from md5 import md5
 
-from Utils import *
-from SortedDict import SortedDict
-from AccessLog import AccessLog
-from ACL import ACL, GranteeLogDelivery
-from BidirMap import BidirMap
-from Config import Config
-from Exceptions import *
-from MultiPart import MultiPartUpload
-from S3Uri import S3Uri
-from ConnMan import ConnMan, CertificateError
-from Crypto import sign_string_v2, sign_string_v4, checksum_sha256_file, checksum_sha256_buffer
+from .Utils import *
+from .SortedDict import SortedDict
+from .AccessLog import AccessLog
+from .ACL import ACL, GranteeLogDelivery
+from .BidirMap import BidirMap
+from .Config import Config
+from .Exceptions import *
+from .MultiPart import MultiPartUpload
+from .S3Uri import S3Uri
+from .ConnMan import ConnMan, CertificateError
+from .Crypto import sign_string_v2, sign_string_v4, checksum_sha256_file, checksum_sha256_buffer
 
 try:
     from ctypes import ArgumentError

S3/S3Uri.py

@@ -6,13 +6,13 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import os
 import re
 import sys
-from Utils import unicodise, deunicodise, check_bucket_name_dns_support
-import Config
+from .Utils import unicodise, deunicodise, check_bucket_name_dns_support
+from . import Config
 
 class S3Uri(object):
     type = None

S3/SortedDict.py

@@ -6,9 +6,9 @@
 ## License: GPL Version 2
 ## Copyright: TGRMN Software and contributors
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
-from BidirMap import BidirMap
+from .BidirMap import BidirMap
 
 class SortedDictIterator(object):
     def __init__(self, sorted_dict, keys):