Fix URL normalizing out the 'Adding find links...' output from setuptools 0.7.

Use that normalizer everywhere.

src/zc/buildout/testing.py

@@ -525,8 +525,9 @@ normalize_exception_type_for_python_2_and_3 = (
 
 not_found = (re.compile(r'Not found: [^\n]+/(\w|\.)+/\r?\n'), '')
 
+# Setuptools now pulls in dependencies when installed.
 adding_find_link = (re.compile(r"Adding find link '[^']+'"
-                               r" from setuptools 0.7/\r?\n"), '')
+                               r" from setuptools .*\r?\n"), '')
 
 ignore_not_upgrading = (
     re.compile(

src/zc/buildout/tests.py

@@ -3271,6 +3271,7 @@ def test_suite():
                zc.buildout.testing.normalize_script,
                zc.buildout.testing.normalize_egg_py,
                zc.buildout.testing.not_found,
+               zc.buildout.testing.adding_find_link,
                # (re.compile(r"Installing 'zc.buildout >=\S+"), ''),
                # (re.compile(r"Getting distribution for 'zc.buildout >=\S+"),
                #  ''),
@@ -3305,6 +3306,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
                 zc.buildout.testing.not_found,
+                zc.buildout.testing.adding_find_link,
                 (re.compile('zc.buildout.buildout.MissingOption'),
                  'MissingOption'),
                 (re.compile(r'\S+buildout.py'), 'buildout.py'),
@@ -3326,6 +3328,7 @@ def test_suite():
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
                 zc.buildout.testing.not_found,
+                zc.buildout.testing.adding_find_link,
                 normalize_bang,
                 normalize_S,
                 # (re.compile(r"Installing 'zc.buildout >=\S+"), ''),
@@ -3351,6 +3354,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_egg_py,
                 zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
+                zc.buildout.testing.adding_find_link,
                 zc.buildout.testing.not_found,
                 normalize_bang,
                 normalize_S,
@@ -3375,6 +3379,7 @@ def test_suite():
             checker=renormalizing.RENormalizing([
               zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
               zc.buildout.testing.not_found,
+              zc.buildout.testing.adding_find_link,
               (re.compile(' at -?0x[^>]+'), '<MEM ADDRESS>'),
               (re.compile('http://localhost:[0-9]{4,5}/'),
                'http://localhost/'),
@@ -3395,6 +3400,7 @@ def test_suite():
                 zc.buildout.testing.normalize___pycache__,
                 zc.buildout.testing.not_found,
                 zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
+                zc.buildout.testing.adding_find_link,
                 normalize_bang,
                 (re.compile(r'^(\w+\.)*(Missing\w+: )'), '\2'),
                 (re.compile("buildout: Running \S*setup.py"),
@@ -3434,6 +3440,7 @@ def test_suite():
                zc.buildout.testing.normalize_script,
                zc.buildout.testing.normalize_egg_py,
                zc.buildout.testing.not_found,
+               zc.buildout.testing.adding_find_link,
                (re.compile('__buildout_signature__ = recipes-\S+'),
                 '__buildout_signature__ = recipes-SSSSSSSSSSS'),
                (re.compile('[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
@@ -3470,6 +3477,7 @@ def test_suite():
                zc.buildout.testing.normalize_script,
                zc.buildout.testing.not_found,
                normalize_bang,
+               zc.buildout.testing.adding_find_link,
                (re.compile('Downloading.*setuptools.*egg\n'), ''),
                ]),
             ))