Vendorise six.py

Because pyinstaller adds an old version to the path:

http://www.pyinstaller.org/ticket/773
This commit is contained in:
Ben Firshman 2014-02-28 19:16:32 +00:00
commit 75c430635b
6 changed files with 409 additions and 5 deletions

View file

@ -17,7 +17,7 @@ import fileinput
import json
import os
import six
from fig.packages import six
from ..utils import utils

View file

@ -19,7 +19,7 @@ import struct
import requests
import requests.exceptions
import six
from fig.packages import six
from .auth import auth
from .unixconn import unixconn

View file

@ -11,7 +11,7 @@
# 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 fig.packages import six
if six.PY3:
import http.client as httplib

View file

@ -17,7 +17,7 @@ import tarfile
import tempfile
import requests
import six
from fig.packages import six
def mkbuildcontext(dockerfile):