From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 17 Mar 2011 06:23:24 +0000 (+0800)
Subject: merge from 2.5 branch.
X-Git-Tag: v2.6.7~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfd1579e54a431333cdcaaa2df82c13f135caff9;p=thirdparty%2FPython%2Fcpython.git

merge from 2.5 branch.
---

dfd1579e54a431333cdcaaa2df82c13f135caff9
diff --cc Lib/SimpleHTTPServer.py
index 0110da018184,286731d35495..3e0334da3b3f
--- a/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@@ -14,7 -14,9 +14,8 @@@ import o
  import posixpath
  import BaseHTTPServer
  import urllib
 -import urlparse
  import cgi
+ import sys
  import shutil
  import mimetypes
  try: