summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-06-21 09:32:50 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-06-21 09:32:50 +0100
commitb81a9de65a5e4ab39411b673730a95074d0ac153 (patch)
tree7c3a6c4bf4202f206eec54ca1bdf254459c21cf4
parent0a75a30e7223e92319a1901cc49281bf5ec5e496 (diff)
downloadpython-setuptools-bitbucket-b81a9de65a5e4ab39411b673730a95074d0ac153.tar.gz
Fixed some bugs, tests now also all pass on 2.7 and 3.2.
-rw-r--r--setuptools/compat.py2
-rw-r--r--tests/api_tests.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 72581866..7427c17f 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -6,7 +6,7 @@ if sys.version_info[0] < 3:
basestring = basestring
import __builtin__ as builtins
import ConfigParser
- from cStringIO import StringIO
+ from StringIO import StringIO
BytesIO = StringIO
execfile = execfile
func_code = lambda o: o.func_code
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index c2e63b24..65443e09 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -219,7 +219,7 @@ distribution is added to a working set. The callback is immediately invoked
once for each existing distribution in the working set, and then is called
again for new distributions added thereafter::
- >>> def added(dist): print("Added", dist)
+ >>> def added(dist): print("Added %s" % dist)
>>> ws.subscribe(added)
Added Bar 0.9
>>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12")