Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5869 Modified Files: pkg_resources.py setup.py Log Message: Misc. bugs reported by Ian Bicking and Ashley Walsh. Index: pkg_resources.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- pkg_resources.py 25 Jul 2005 03:12:50 -0000 1.54 +++ pkg_resources.py 31 Jul 2005 16:31:17 -0000 1.55 @@ -227,7 +227,7 @@ """Return a current distribution object for a Requirement or string""" if isinstance(dist,basestring): dist = Requirement.parse(dist) if isinstance(dist,Requirement): dist = get_provider(dist) - if not isintance(dist,Distribution): + if not isinstance(dist,Distribution): raise TypeError("Expected string, Requirement, or Distribution", dist) return dist @@ -1443,7 +1443,7 @@ path, parent = sys.path, None if '.' in packageName: - parent = '.'.join(package.split('.')[:-1]) + parent = '.'.join(packageName.split('.')[:-1]) declare_namespace(parent) __import__(parent) try: Index: setup.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setup.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- setup.py 24 Jul 2005 22:47:05 -0000 1.33 +++ setup.py 31 Jul 2005 16:31:18 -0000 1.34 @@ -44,7 +44,7 @@ entry_points = { "distutils.commands" : [ "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals() - for cmd in SETUP_COMMANDS if cmd!="build_py" or sys.version>="2.4" + for cmd in SETUP_COMMANDS if cmd!="build_py" or sys.version<"2.4" ], },