summaryrefslogtreecommitdiff
path: root/pkg_resources.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-07-31 16:31:18 +0000
committerPJ Eby <distutils-sig@python.org>2005-07-31 16:31:18 +0000
commit1bb64d070e9be1b67322417c0a11e199bce6fe99 (patch)
tree3668d807668146495591016fe0f88f7e89e438eb /pkg_resources.py
parent54bb8e4003534a9af54028ef719eda5ba6088bac (diff)
downloadpython-setuptools-git-1bb64d070e9be1b67322417c0a11e199bce6fe99.tar.gz
Misc. bugs reported by Ian Bicking and Ashley Walsh.
--HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041168
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 8cff9a8a..fc6a15e9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -227,7 +227,7 @@ def get_distribution(dist):
"""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 @@ def declare_namespace(packageName):
path, parent = sys.path, None
if '.' in packageName:
- parent = '.'.join(package.split('.')[:-1])
+ parent = '.'.join(packageName.split('.')[:-1])
declare_namespace(parent)
__import__(parent)
try: