[Checkins] SVN: zc.buildout/branches/python-3-2/src/zc/buildout/ avoid representations of (unicode) text appearing in doctests

[Thomas Lotze]

Log message for revision 121329:
  avoid representations of (unicode) text appearing in doctests

Changed:
  U   zc.buildout/branches/python-3-2/src/zc/buildout/dependencylinks.txt
  U   zc.buildout/branches/python-3-2/src/zc/buildout/download.txt
  U   zc.buildout/branches/python-3-2/src/zc/buildout/downloadcache.txt
  U   zc.buildout/branches/python-3-2/src/zc/buildout/easy_install.txt
  U   zc.buildout/branches/python-3-2/src/zc/buildout/tests.py

-=-
Modified: zc.buildout/branches/python-3-2/src/zc/buildout/dependencylinks.txt
===================================================================
--- zc.buildout/branches/python-3-2/src/zc/buildout/dependencylinks.txt	2011-04-07 12:26:04 UTC (rev 121328)
+++ zc.buildout/branches/python-3-2/src/zc/buildout/dependencylinks.txt	2011-04-07 13:10:20 UTC (rev 121329)
@@ -21,9 +21,8 @@
 Turn on logging on this server so that we can see when eggs are pulled
 from it.
 
-    >>> get(link_server2 + 'enable_server_logging')
+    >>> _ = get(link_server2 + 'enable_server_logging')
     GET 200 /enable_server_logging
-    ''
 
 Let's create a develop egg in our buildout that specifies
 dependency_links which point to the new server.

Modified: zc.buildout/branches/python-3-2/src/zc/buildout/download.txt
===================================================================
--- zc.buildout/branches/python-3-2/src/zc/buildout/download.txt	2011-04-07 12:26:04 UTC (rev 121328)
+++ zc.buildout/branches/python-3-2/src/zc/buildout/download.txt	2011-04-07 13:10:20 UTC (rev 121329)
@@ -424,8 +424,8 @@
 using the cache:
 
 >>> write(server_data, 'foo.txt', 'The wrong text.')
->>> get(server_url+'foo.txt')
-'The wrong text.'
+>>> print(get(server_url+'foo.txt'))
+The wrong text.
 
 >>> offline_download = Download(cache=cache, offline=True, fallback=True)
 >>> path, is_temp = offline_download(server_url+'foo.txt')

Modified: zc.buildout/branches/python-3-2/src/zc/buildout/downloadcache.txt
===================================================================
--- zc.buildout/branches/python-3-2/src/zc/buildout/downloadcache.txt	2011-04-07 12:26:04 UTC (rev 121328)
+++ zc.buildout/branches/python-3-2/src/zc/buildout/downloadcache.txt	2011-04-07 13:10:20 UTC (rev 121329)
@@ -49,9 +49,8 @@
 
 We'll enable logging on the link server so we can see what's going on:
 
-    >>> get(link_server+'enable_server_logging')
+    >>> _ = get(link_server+'enable_server_logging')
     GET 200 /enable_server_logging
-    ''
 
 We also specified a download cache.
 

Modified: zc.buildout/branches/python-3-2/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/python-3-2/src/zc/buildout/easy_install.txt	2011-04-07 12:26:04 UTC (rev 121328)
+++ zc.buildout/branches/python-3-2/src/zc/buildout/easy_install.txt	2011-04-07 13:10:20 UTC (rev 121329)
@@ -487,9 +487,8 @@
 Turn on logging on this server so that we can see when eggs are pulled
 from it.
 
-    >>> get(link_server2 + 'enable_server_logging')
+    >>> _ = get(link_server2 + 'enable_server_logging')
     GET 200 /enable_server_logging
-    ''
 
 Now we can create an egg that specifies that its dependencies are
 found on this server.
@@ -1844,9 +1843,8 @@
 We'd like to see what is being fetched from the server, so we'll
 enable server logging:
 
-    >>> get(link_server+'enable_server_logging')
+    >>> _ = get(link_server+'enable_server_logging')
     GET 200 /enable_server_logging
-    ''
 
 Now, if we install demo, and extdemo:
 

Modified: zc.buildout/branches/python-3-2/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/python-3-2/src/zc/buildout/tests.py	2011-04-07 12:26:04 UTC (rev 121328)
+++ zc.buildout/branches/python-3-2/src/zc/buildout/tests.py	2011-04-07 13:10:20 UTC (rev 121329)
@@ -599,8 +599,8 @@
 
 Now, finally, let's test _get_version:
 
-    >>> zc.buildout.easy_install._get_version(join('bin', 'demo'))
-    '2.5'
+    >>> print(zc.buildout.easy_install._get_version(join('bin', 'demo')))
+    2.5
 
     """