[tor-commits] [torbrowser/maint-2.2] Remove pyget, as wget is now easily installed via mingw

[erinn@xxxxxxxxxxxxxx]

commit 87c9e6cb042fa210ac5d1d1be53bd6f0cf63b31d
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Thu Feb 9 05:21:56 2012 +0100

    Remove pyget, as wget is now easily installed via mingw
---
 build-scripts/INSTALL    |   19 +------------
 build-scripts/pyget.py   |   67 ----------------------------------------------
 build-scripts/windows.mk |    1 -
 3 files changed, 1 insertions(+), 86 deletions(-)

diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL
index d54ced1..d85a051 100644
--- a/build-scripts/INSTALL
+++ b/build-scripts/INSTALL
@@ -94,22 +94,6 @@ The suggested version is "7-Zip 4.57":
 
     http://downloads.sourceforge.net/sevenzip/7z457.exe
 
-Installing Python
-=================
-
-Either Python or wget is required to download Firefox extensions. Python is the
-suggested method.  To use Python, you'll need to download Python and install
-it. The suggested method is a pre-built Windows build.
-Download and install the following msi installer:
-
-    http://python.org/ftp/python/2.5.2/python-2.5.2.msi
-
-Download and verify the signature:
-
-    http://www.python.org/download/releases/2.5.2/python-2.5.2.msi.asc
-
-When prompted for a directory, install it into: C:\Python25\
-
 Installing MinGW
 (MinGW - Minimalist GNU for Windows)
 ====================================
@@ -556,8 +540,7 @@ Customization
 
 The locations of Qt, MinGW32, the Vidalia/Tor build directory, 7zip,
 FirefoxPortable can be altered in Makefile. The WGET variable should
-be either set to the location of a wget binary, or a command line for
-executing pyget.py under the installed Python interpreter.
+be set to the location of a wget binary.
 
 Building the Tor Browser Bundle
 ===============================
diff --git a/build-scripts/pyget.py b/build-scripts/pyget.py
deleted file mode 100644
index 3c0925b..0000000
--- a/build-scripts/pyget.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/python
-
-###
-### Simple HTTP download utility for platforms without wget
-###
-### Copyright 2008 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-### See LICENSE for licensing information
-###
-### $Id$
-###
-
-import sys
-import os
-import urllib
-import urlparse
-from optparse import OptionParser
-
-## Destination filename when no sensible default can be guessed
-DEFAULT_DEST = "index.html"
-
-## Create a URL opener which throws an exception on error
-class DebugURLopener(urllib.FancyURLopener):
-    def http_error_default(self, url, fp, errcode, errmsg, headers):
-        _ = fp.read()
-        fp.close()
-        raise IOError, ('http error', errcode, errmsg, headers)
-
-## Set this as the default URL opener
-urllib._urlopener = DebugURLopener()
-
-def main():
-    ## Parse command line
-    usage = "Usage: %prog [options] URL\n\nDownload URL to file."
-    parser = OptionParser(usage)
-    parser.set_defaults(verbose=True)
-    parser.add_option("-O", "--output-document", dest="dest",
-                      help="write document to DEST")
-    parser.add_option("-q", "--quiet", action="store_false", dest="verbose",
-                      help="don't show debugging information")
-
-    (options, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.error("Missing URL")
-
-    ## Get URL
-    url = args[0]
-
-    ## Get destination filename
-    if options.dest:
-        dest = options.dest
-    else:
-        url_components = urlparse.urlsplit(url)
-        dest = os.path.basename(url_components.path).strip()
-        if dest == "":
-            dest = DEFAULT_DEST
-
-    ## Download URL
-    if options.verbose:
-        print "Downloading %s to %s..."%(url, dest)
-
-    urllib.urlretrieve(url, dest)
-
-    if options.verbose:
-        print "Download was successful."
-
-if __name__ == "__main__":
-    main()
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 7d13eb3..9f382f5 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -49,7 +49,6 @@ PWD:=$(shell pwd)
 PYTHON=$(MOZBUILD_DIR)/python/python.exe
 PYMAKE=$(PYMAKE_DIR)/make.py
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-PYGET=$(PYTHON) $(PWD)/pyget.py
 WGET=wget
 VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py
 WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits