Use botocore vendoring of six

awscli/argparser.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 import argparse
 import sys
-import six
+from awscli.compat import six
 from difflib import get_close_matches
 
 

awscli/argprocess.py

@@ -13,7 +13,7 @@
 """Module for processing CLI args."""
 import os
 import logging
-import six
+from awscli.compat import six
 
 from botocore import xform_name
 from botocore.compat import OrderedDict, json

awscli/compat.py

@@ -11,7 +11,19 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import sys
-import six
+
+from botocore.compat import six
+#import botocore.compat
+
+# If you ever want to import from the vendored six. Add it here and then
+# import from awscli.compat. Also try to keep it in alphabetical order.
+# This may get large.
+advance_iterator = six.advance_iterator
+PY3 = six.PY3
+queue = six.moves.queue
+shlex_quote = six.moves.shlex_quote
+StringIO = six.StringIO
+urlopen = six.moves.urllib.request.urlopen
 
 if six.PY3:
     import locale

awscli/customizations/codedeploy.py

@@ -19,7 +19,7 @@
 import contextlib
 from datetime import datetime
 
-import six
+from awscli.compat import six
 
 from awscli.argprocess import unpack_cli_arg
 from awscli.arguments import CustomArgument

awscli/customizations/ec2bundleinstance.py

@@ -17,7 +17,7 @@
 import base64
 import datetime
 
-import six
+from awscli.compat import six
 
 from awscli.arguments import CustomArgument
 

awscli/customizations/ec2decryptpassword.py

@@ -14,7 +14,7 @@
 import os
 import base64
 import rsa
-import six
+from awscli.compat import six
 
 from botocore import model
 

awscli/customizations/opsworks.py

@@ -21,9 +21,8 @@
 import sys
 import tempfile
 import textwrap
-from six.moves import shlex_quote
-from six.moves.urllib.request import urlopen
 
+from awscli.compat import shlex_quote, urlopen
 from awscli.customizations.commands import BasicCommand
 from awscli.errorhandler import ClientError
 

awscli/customizations/s3/comparator.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import logging
-from six import advance_iterator
+from awscli.compat import advance_iterator
 
 
 LOG = logging.getLogger(__name__)

awscli/customizations/s3/executor.py

@@ -11,13 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import logging
-from six.moves import queue
 import sys
 import threading
 
 from awscli.customizations.s3.utils import uni_print, bytes_print, \
     IORequest, IOCloseRequest, StablePriorityQueue
 from awscli.customizations.s3.tasks import OrderableTask
+from awscli.compat import queue
 
 
 LOGGER = logging.getLogger(__name__)

awscli/customizations/s3/filegenerator.py

@@ -14,16 +14,15 @@
 import sys
 import stat
 
-import six
-from six.moves import queue
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 
 from awscli.customizations.s3.utils import find_bucket_key, get_file_stat
 from awscli.customizations.s3.utils import BucketLister, create_warning, \
     find_dest_path_comp_key
 from awscli.errorhandler import ClientError
-
+from awscli.compat import six
+from awscli.compat import queue
 
 _open = open
 

awscli/customizations/s3/s3handler.py

@@ -14,8 +14,6 @@
 import logging
 import math
 import os
-import six
-from six.moves import queue
 import sys
 
 from awscli.customizations.s3.constants import MULTI_THRESHOLD, CHUNKSIZE, \
@@ -24,6 +22,9 @@
     operate, find_bucket_key, relative_path, PrintTask, create_warning
 from awscli.customizations.s3.executor import Executor
 from awscli.customizations.s3 import tasks
+from awscli.compat import six
+from awscli.compat import queue
+
 
 LOGGER = logging.getLogger(__name__)
 

awscli/customizations/s3/subcommands.py

@@ -11,13 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import os
-import six
-from six.moves import queue
 import sys
 
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 
+from awscli.compat import six
+from awscli.compat import queue
 from awscli.customizations.commands import BasicCommand
 from awscli.customizations.s3.comparator import Comparator
 from awscli.customizations.s3.fileinfobuilder import FileInfoBuilder

awscli/customizations/s3/utils.py

@@ -20,14 +20,15 @@
 from collections import namedtuple, deque
 from functools import partial
 
-from six import PY3
-from six.moves import queue
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 from botocore.compat import unquote_str
 
 from awscli.customizations.s3.constants import MAX_PARTS
 from awscli.customizations.s3.constants import MAX_SINGLE_UPLOAD_SIZE
+from awscli.compat import six
+from awscli.compat import PY3
+from awscli.compat import queue
 
 
 class AppendFilter(argparse.Action):

awscli/paramfile.py

@@ -16,7 +16,7 @@
 import os
 
 from botocore.vendored import requests
-import six
+from awscli.compat import six
 
 from awscli.compat import compat_open
 

awscli/table.py

@@ -15,7 +15,7 @@
 import struct
 
 import colorama
-import six
+from awscli.compat import six
 
 
 def determine_terminal_width(default_width=80):

awscli/testutils.py

@@ -42,7 +42,7 @@
     # *uses* this module that isn't suppose to, that's s
     # different story.
     mock = None
-import six
+from awscli.compat import six
 from botocore.hooks import HierarchicalEmitter
 from botocore.session import Session
 import botocore.loaders

awscli/text.py

@@ -10,7 +10,7 @@
 # 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 six
+from awscli.compat import six
 
 
 def format_text(data, stream):

awscli/utils.py

@@ -13,7 +13,7 @@
 import csv
 import datetime
 
-import six
+from awscli.compat import six
 
 
 def split_on_commas(value):

requirements.txt

@@ -1,4 +1,3 @@
-six>=1.8.0,<2.0.0
 tox==1.4
 docutils>=0.10
 Sphinx==1.1.3

setup.py

@@ -8,7 +8,6 @@
 
 requires = ['botocore>=0.78.0,<0.79.0',
             'bcdoc>=0.12.0,<0.13.0',
-            'six>=1.8.0,<2.0.0',
             'colorama==0.2.5',
             'docutils>=0.10',
             'rsa==3.1.2']

tests/integration/customizations/s3/test_plugin.py

@@ -26,7 +26,7 @@
 import socket
 
 import botocore.session
-import six
+from awscli.compat import six
 
 from awscli.testutils import unittest, FileCreator, get_stdout_encoding
 from awscli.testutils import aws as _aws

tests/integration/customizations/s3/test_s3handler.py

@@ -20,11 +20,11 @@
 import os
 import datetime
 import random
-from six import StringIO
 import sys
 from awscli.testutils import unittest
 
 from awscli import EnvironmentVariables
+from awscli.compat import StringIO
 from awscli.customizations.s3.s3handler import S3Handler
 from awscli.customizations.s3.fileinfo import FileInfo
 import botocore.session

tests/unit/customizations/configservice/test_getstatus.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import mock
-import six
+from awscli.compat import six
 
 from awscli.testutils import unittest
 from awscli.customizations.configservice.getstatus import GetStatusCommand

tests/unit/customizations/datapipeline/test_commands.py

@@ -14,7 +14,7 @@
 import copy
 import mock
 
-import six
+from awscli.compat import six
 from awscli.testutils import BaseAWSHelpOutputTest, BaseAWSCommandParamsTest, \
         unittest
 

tests/unit/customizations/s3/__init__.py

@@ -15,7 +15,7 @@
 from awscli.testutils import unittest
 import string
 
-import six
+from awscli.compat import six
 from mock import patch, Mock
 
 

tests/unit/customizations/s3/fake_session.py

@@ -13,6 +13,7 @@
 import hashlib
 from operator import itemgetter
 from botocore.vendored import requests
+from awscli.compat import six
 from six import text_type
 from six import StringIO
 from io import BytesIO

tests/unit/customizations/s3/test_cp_command.py

@@ -15,7 +15,7 @@
 import re
 
 import mock
-import six
+from awscli.compat import six
 
 
 class TestCPCommand(BaseAWSCommandParamsTest):

tests/unit/customizations/s3/test_executor.py

@@ -13,7 +13,7 @@
 import os
 import tempfile
 import shutil
-import six
+from awscli.compat import six
 from six.moves import queue
 import sys
 

tests/unit/customizations/s3/test_filegenerator.py

@@ -18,7 +18,7 @@
 import shutil
 import socket
 
-import six
+from awscli.compat import six
 import mock
 
 from awscli.customizations.s3.filegenerator import FileGenerator, \

tests/unit/customizations/s3/test_fileinfo.py

@@ -16,7 +16,7 @@
 from datetime import datetime
 from hashlib import md5
 
-import six
+from awscli.compat import six
 import mock
 
 from awscli.testutils import unittest

tests/unit/customizations/s3/test_mv_command.py

@@ -15,7 +15,7 @@
 import re
 
 import mock
-import six
+from awscli.compat import six
 
 
 class TestMvCommand(BaseAWSCommandParamsTest):

tests/unit/customizations/s3/test_subcommands.py

@@ -12,7 +12,6 @@
 # language governing permissions and limitations under the License.
 import argparse
 import os
-from six import StringIO
 import sys
 
 import mock
@@ -28,6 +27,7 @@
 from tests.unit.customizations.s3 import make_loc_files, clean_loc_files, \
     make_s3_files, s3_cleanup, S3HandlerBaseTest
 from tests.unit.customizations.s3.fake_session import FakeSession
+from awscli.compat import StringIO
 
 
 class FakeArgs(object):

tests/unit/customizations/test_cloudtrail.py

@@ -14,7 +14,7 @@
 import botocore.session
 import json
 import os
-import six
+from awscli.compat import six
 
 from awscli.customizations.cloudtrail import CloudTrailSubscribe
 from awscli.customizations.service import Service

tests/unit/customizations/test_codedeploy.py

@@ -14,6 +14,7 @@
 import argparse
 
 from mock import Mock, ANY, patch, MagicMock
+from awscli.compat import six
 from six import StringIO
 
 from awscli.customizations.codedeploy import S3Client

tests/unit/customizations/test_configure.py

@@ -17,6 +17,7 @@
 from awscli.testutils import unittest
 
 import mock
+from awscli.compat import six
 from six import StringIO
 from botocore.exceptions import ProfileNotFound
 

tests/unit/customizations/test_generatecliskeleton.py

@@ -10,7 +10,7 @@
 # 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 six
+from awscli.compat import six
 import mock
 
 from botocore.model import DenormalizedStructureBuilder

tests/unit/customizations/test_globalargs.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 from awscli.testutils import unittest
-import six
+from awscli.compat import six
 import mock
 
 from awscli.customizations import globalargs