summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg_resources.py4
-rwxr-xr-xsetup.py2
2 files changed, 3 insertions, 3 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:
diff --git a/setup.py b/setup.py
index d2d2b008..7302f710 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
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"
],
},