merge 3.3

This commit is contained in:
Benjamin Peterson 2013-09-29 14:59:19 -04:00
commit eea020f1ae

View file

@ -25,18 +25,11 @@
--upgrade Upgrade the environment directory to use this version --upgrade Upgrade the environment directory to use this version
of Python, assuming Python has been upgraded in-place. of Python, assuming Python has been upgraded in-place.
""" """
import base64
import io
import logging import logging
import os import os
import os.path
import shutil import shutil
import sys import sys
import sysconfig import sysconfig
try:
import threading
except ImportError:
threading = None
import types import types
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)