[Python-checkins] python/nondist/sandbox/setuptools pkg_resources.py, 1.29, 1.30

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4382

Modified Files:
	pkg_resources.py 
Log Message:
Fix a bug in resource_isdir(), introduced in 0.4a2.  Add str/repr of
Distribution objects.


Index: pkg_resources.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pkg_resources.py	12 Jun 2005 21:47:33 -0000	1.29
+++ pkg_resources.py	14 Jun 2005 01:25:48 -0000	1.30
@@ -565,15 +565,15 @@
     def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))
 
-    def resource_isdir(self,name):
+    def resource_isdir(self,resource_name):
         return self._isdir(self._fn(self.module_path, resource_name))
 
     def metadata_isdir(self,name):
         return self.egg_info and self._isdir(self._fn(self.egg_info,name))
 
 
-    def resource_listdir(self,name):
-        return self._listdir(self._fn(self.egg_info,name))
+    def resource_listdir(self,resource_name):
+        return self._listdir(self._fn(self.egg_info,resource_name))
 
     def metadata_listdir(self,name):
         if self.egg_info:
@@ -1237,7 +1237,7 @@
     ):
         if name:
             self.name = safe_name(name)
-        if version:
+        if version is not None:
             self._version = safe_version(version)
         self.py_version = py_version
         self.platform = platform
@@ -1363,12 +1363,12 @@
 
         return filename
 
+    def __repr__(self):
+        return "%s (%s)" % (self,self.path)
 
-
-
-
-
-
+    def __str__(self):
+        version = getattr(self,'version',None) or "[unknown version]"
+        return "%s %s" % (self.name,version)