Bump ez_setup.py for setuptools 1.1.1

Setuptools 1.1.1 includes an important python 2.4 fix.

Author: behackett

ez_setup.py

@@ -29,7 +29,7 @@
 except ImportError:
  USER_SITE = None
 
-DEFAULT_VERSION = "1.1"
+DEFAULT_VERSION = "1.1.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
@@ -254,14 +254,18 @@ def get_best_downloader():
  return dl
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
- to_dir=os.curdir, delay=15):
+ to_dir=os.curdir, delay=15,
+ downloader_factory=get_best_downloader):
  """Download setuptools from a specified location and return its filename
 
  `version` should be a valid setuptools version number that is available
  as an egg for download under the `download_base` URL (which should end
  with a '/'). `to_dir` is the directory where the egg will be downloaded.
  `delay` is the number of seconds to pause before an actual download
  attempt.
+
+ ``downloader_factory`` should be a function taking no arguments and
+ returning a function for downloading a URL to a target.
  """
  # making sure we use the absolute path
  to_dir = os.path.abspath(to_dir)
@@ -270,7 +274,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
  saveto = os.path.join(to_dir, tgz_name)
  if not os.path.exists(saveto): # Avoid repeated downloads
  log.warn("Downloading %s", url)
- downloader = get_best_downloader()
+ downloader = downloader_factory()
  downloader(url, saveto)
  return os.path.realpath(saveto)
 
@@ -346,14 +350,20 @@ def _parse_args():
  '--download-base', dest='download_base', metavar="URL",
  default=DEFAULT_URL,
  help='alternative URL from where to download the setuptools package')
+ parser.add_option(
+ '--insecure', dest='downloader_factory', action='store_const',
+ const=lambda: download_file_insecure, default=get_best_downloader,
+ help='Use internal, non-validating downloader'
+ )
  options, args = parser.parse_args()
  # positional arguments are ignored
  return options
 
 def main(version=DEFAULT_VERSION):
  """Install or upgrade setuptools and EasyInstall"""
  options = _parse_args()
- tarball = download_setuptools(download_base=options.download_base)
+ tarball = download_setuptools(download_base=options.download_base,
+ downloader_factory=options.downloader_factory)
  return _install(tarball, _build_install_args(options))
 
 if __name__ == '__main__':