[Checkins] SVN: zc.icp/trunk/ - Fixed tests to run on Python 2.4 up to 2.7.

[Michael Howitz]

Log message for revision 121022:
  - Fixed tests to run on Python 2.4 up to 2.7.
  - Moved change log into separate file
  

Changed:
  A   zc.icp/trunk/CHANGES.txt
  A   zc.icp/trunk/README.txt
  D   zc.icp/trunk/bootstrap.py
  U   zc.icp/trunk/setup.py
  U   zc.icp/trunk/src/zc/icp/README.txt
  U   zc.icp/trunk/src/zc/icp/tests.py

-=-
Copied: zc.icp/trunk/CHANGES.txt (from rev 121021, zc.icp/trunk/src/zc/icp/README.txt)
===================================================================
--- zc.icp/trunk/CHANGES.txt	                        (rev 0)
+++ zc.icp/trunk/CHANGES.txt	2011-03-18 08:18:50 UTC (rev 121022)
@@ -0,0 +1,14 @@
+Change history
+==============
+
+1.1.0 (unreleased)
+------------------
+
+- Fixed tests to run on Python 2.4 up to 2.7.
+
+
+1.0.0 (2008-02-07)
+------------------
+
+Initial release.
+

Copied: zc.icp/trunk/README.txt (from rev 121021, zc.icp/trunk/src/zc/icp/README.txt)
===================================================================
--- zc.icp/trunk/README.txt	                        (rev 0)
+++ zc.icp/trunk/README.txt	2011-03-18 08:18:50 UTC (rev 121022)
@@ -0,0 +1,13 @@
+====================================
+Internet Cache Protocol (ICP) Server
+====================================
+
+In multi-machine (or multi-process) web server installations some set of web
+servers will likely be more able to quickly service an HTTP request than
+others.  HTTP accelerators (reverse proxies) like Squid_ can use ICP_ queries
+to find the most appropriate server(s) to handle a particular request.  This
+package provides a small UDP server that can respond to ICP queries based on
+pluggable policies.
+
+.. [ICP] http://www.faqs.org/rfcs/rfc2186.html
+.. [Squid] http://www.squid-cache.org/

Deleted: zc.icp/trunk/bootstrap.py
===================================================================
--- zc.icp/trunk/bootstrap.py	2011-03-18 07:51:34 UTC (rev 121021)
+++ zc.icp/trunk/bootstrap.py	2011-03-18 08:18:50 UTC (rev 121022)
@@ -1 +0,0 @@
-link bootstrap/bootstrap.py
\ No newline at end of file

Modified: zc.icp/trunk/setup.py
===================================================================
--- zc.icp/trunk/setup.py	2011-03-18 07:51:34 UTC (rev 121021)
+++ zc.icp/trunk/setup.py	2011-03-18 08:18:50 UTC (rev 121022)
@@ -5,7 +5,12 @@
     return open(os.path.join(os.path.dirname(__file__), *rname.split('/')
                              )).read()
 
-long_description = read('src/zc/icp/README.txt')
+long_description = '\n\n'.join([
+    read('README.txt'),
+    '.. contents::',
+    read('CHANGES.txt'),
+    read('src/zc/icp/README.txt'),
+    ])
 
 setup(
     name='zc.icp',

Modified: zc.icp/trunk/src/zc/icp/README.txt
===================================================================
--- zc.icp/trunk/src/zc/icp/README.txt	2011-03-18 07:51:34 UTC (rev 121021)
+++ zc.icp/trunk/src/zc/icp/README.txt	2011-03-18 08:18:50 UTC (rev 121022)
@@ -1,27 +1,3 @@
-====================================
-Internet Cache Protocol (ICP) Server
-====================================
-
-In multi-machine (or multi-process) web server installations some set of web
-servers will likely be more able to quickly service an HTTP request than
-others.  HTTP accelerators (reverse proxies) like Squid_ can use ICP_ queries
-to find the most appropriate server(s) to handle a particular request.  This
-package provides a small UDP server that can respond to ICP queries based on
-pluggable policies.
-
-.. [ICP] http://www.faqs.org/rfcs/rfc2186.html
-.. [Squid] http://www.squid-cache.org/
-
-
-Change history
-==============
-
-1.0.0 (2008-02-07)
-------------------
-
-Initial release.
-
-
 When ICP is Useful
 ==================
 

Modified: zc.icp/trunk/src/zc/icp/tests.py
===================================================================
--- zc.icp/trunk/src/zc/icp/tests.py	2011-03-18 07:51:34 UTC (rev 121021)
+++ zc.icp/trunk/src/zc/icp/tests.py	2011-03-18 08:18:50 UTC (rev 121022)
@@ -15,10 +15,16 @@
 
 import unittest
 import zope.testing.doctest
+import zope.testing.renormalizing
+import re
 
 def test_suite():
     return zope.testing.doctest.DocFileSuite(
         "README.txt",
         "datagram.txt",
-         optionflags=zope.testing.doctest.NORMALIZE_WHITESPACE|
+        checker=zope.testing.renormalizing.RENormalizing([
+            (re.compile(r'0L, '), '0, '),
+            (re.compile(r'9L, '), '9, '),
+            ]),
+        optionflags=zope.testing.doctest.NORMALIZE_WHITESPACE|
                      zope.testing.doctest.ELLIPSIS)