[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/8494c47e7006
changeset:   85866:8494c47e7006
parent:      85856:a16b83ff7fb1
parent:      85865:6a69fbe6e088
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 29 14:49:26 2013 -0400
summary:
  merge 3.3

files:
  Lib/venv/__init__.py |  7 -------
  1 files changed, 0 insertions(+), 7 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython