diff options
| author | mstenner <mstenner> | 2004-08-21 19:58:20 +0000 |
|---|---|---|
| committer | mstenner <mstenner> | 2004-08-21 19:58:20 +0000 |
| commit | eb223f550c2bf98d888211d05f642b4feadb9056 (patch) | |
| tree | 507e290306fab37ac0c28fb55af3e6d2fd73d74f | |
| parent | 1f40089d4348a5534d861d3d7db3edf05f20c46c (diff) | |
| download | urlgrabber-eb223f550c2bf98d888211d05f642b4feadb9056.tar.gz | |
Fixed a typo in the new 'release' target. Reformatted the doc in __init__.py
to be under 80 columns in PKG-INFO.
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | urlgrabber/__init__.py | 25 |
2 files changed, 15 insertions, 14 deletions
@@ -22,7 +22,7 @@ default: ChangeLog: FORCE maint/cvs2cl.pl -S -U maint/usermap --utc --no-times -release: pre-release-test +release: FORCE pre-release-test cvs commit -m "release $(VERSION)" $(MAKE) ChangeLog cvs commit -m "updated ChangeLog" @@ -30,7 +30,7 @@ release: pre-release-test $(RM) export release mkdir export release - cd export; cvs -d `echo ../CVS/Root` export -t $(CVS_TAG) $(CVS_MODULE) + cd export; cvs -d `cat ../CVS/Root` export -r $(CVS_TAG) $(CVS_MODULE) cd export/$(CVS_MODULE); $(PYTHON) setup.py sdist --force-manifest cd export/$(CVS_MODULE); $(PYTHON) setup.py bdist_rpm mv export/$(CVS_MODULE)/dist/* release/ diff --git a/urlgrabber/__init__.py b/urlgrabber/__init__.py index f8f8486..e69200d 100644 --- a/urlgrabber/__init__.py +++ b/urlgrabber/__init__.py @@ -14,33 +14,34 @@ # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko -# $Id: __init__.py,v 1.5 2004/08/21 19:45:38 mstenner Exp $ +# $Id: __init__.py,v 1.6 2004/08/21 19:58:20 mstenner Exp $ """A high-level cross-protocol url-grabber. Using urlgrabber, data can be fetched in three basic ways: urlgrab(url) copy the file to the local filesystem - urlopen(url) open the remote file and return a file object (like urllib2.urlopen) + urlopen(url) open the remote file and return a file object + (like urllib2.urlopen) urlread(url) return the contents of the file as a string -When using these functions (or methods), urlgrabber supports the following -features: +When using these functions (or methods), urlgrabber supports the +following features: * identical behavior for http://, ftp://, and file:// urls - * http keepalive - faster downloads of many files by using only a single - connection + * http keepalive - faster downloads of many files by using + only a single connection * byte ranges - fetch only a portion of the file * reget - for a urlgrab, resume a partial download - * progress meters - the ability to report download progress automatically, - even when using urlopen! + * progress meters - the ability to report download progress + automatically, even when using urlopen! * throttling - restrict bandwidth usage - * retries - automatically retry a download if it fails. The number of retries - and failure types are configurable. + * retries - automatically retry a download if it fails. The + number of retries and failure types are configurable. * authenticated server access for http and ftp * proxy support - support for authenticated http and ftp proxies - * mirror groups - treat a list of mirrors as a single source, automatically - switching mirrors if there is a failure. + * mirror groups - treat a list of mirrors as a single source, + automatically switching mirrors if there is a failure. """ __version__ = '2.9.0' |