[Checkins] SVN: zope.ucol/trunk/icu/ Updated to accept a url as an alternative to specifying a version.

[Jim Fulton]

Log message for revision 73023:
  Updated to accept a url as an alternative to specifying a version.
  

Changed:
  U   zope.ucol/trunk/icu/README.txt
  U   zope.ucol/trunk/icu/setup.py
  U   zope.ucol/trunk/icu/src/zc/recipe/icu/__init__.py

-=-
Modified: zope.ucol/trunk/icu/README.txt
===================================================================
--- zope.ucol/trunk/icu/README.txt	2007-03-06 21:07:34 UTC (rev 73022)
+++ zope.ucol/trunk/icu/README.txt	2007-03-06 23:42:42 UTC (rev 73023)
@@ -5,10 +5,13 @@
 Unicode (ICU) library into a `buildout
 <http://www.python.org/pypi/zc.buildout>`_.
 
-The recipe takes a single option, version::
+The recipe takes either a URL or a version. To download from the IBM
+site, ise a version, and the URL will be computed for you::
 
    [icu]
    recipe = zc.recipe.icu
    version = 3.2
 
+Or you can specify a URL, for example to point to aa cached copy.
 
+

Modified: zope.ucol/trunk/icu/setup.py
===================================================================
--- zope.ucol/trunk/icu/setup.py	2007-03-06 21:07:34 UTC (rev 73022)
+++ zope.ucol/trunk/icu/setup.py	2007-03-06 23:42:42 UTC (rev 73023)
@@ -7,7 +7,7 @@
 name = "zc.recipe.icu"
 setup(
     name = name,
-    version = "1.0.0b1",
+    version = "1.0.0b2",
     author = "Jim Fulton",
     author_email = "jim at zope.com",
     description = ("ZC Buildout recipe for installing the ICU library"

Modified: zope.ucol/trunk/icu/src/zc/recipe/icu/__init__.py
===================================================================
--- zope.ucol/trunk/icu/src/zc/recipe/icu/__init__.py	2007-03-06 21:07:34 UTC (rev 73022)
+++ zope.ucol/trunk/icu/src/zc/recipe/icu/__init__.py	2007-03-06 23:42:42 UTC (rev 73023)
@@ -32,11 +32,14 @@
         here = os.getcwd()
         tmp = tempfile.mkdtemp()
         try:
-            f = urllib2.urlopen(
-                'ftp://ftp.software.ibm.com/software/globalization/icu/'
-                '%(version)s/icu-%(version)s.tgz'
-                % dict(version=options['version'])
-                )
+            url = (options.get('url') or 
+                   ('ftp://ftp.software.ibm.com/software/globalization/icu/'
+                    '%(version)s/icu-%(version)s.tgz'
+                    % dict(version=options['version'])
+                    )
+                   )
+            
+            f = urllib2.urlopen(url)
             open(os.path.join(tmp, 'arch'), 'w').write(f.read())
             f.close()
             setuptools.archive_util.unpack_archive(