--- pkg_resources.py.orig	2005-06-14 07:15:53.000000000 -0400
+++ pkg_resources.py	2005-06-14 07:52:28.000000000 -0400
@@ -573,7 +573,7 @@
 
 
     def resource_listdir(self,resource_name):
-        return self._listdir(self._fn(self.egg_info,resource_name))
+        return self._listdir(self._fn(self.module_path, resource_name))
 
     def metadata_listdir(self,name):
         if self.egg_info:
@@ -703,7 +703,7 @@
     def __init__(self, module):
         DefaultProvider.__init__(self,module)
         self.zipinfo = zipimport._zip_directory_cache[self.loader.archive]
-        self.zip_pre = self.loader.archive+os.sep
+        self.zip_pre = self.module_path + os.sep
 
     def _short_name(self, path):
         if path.startswith(self.zip_pre):
@@ -738,7 +738,7 @@
 
     def _extract_resource(self, manager, resource_name):
         if self.resource_isdir(resource_name):
-            return self._extract_dir(resource_name)
+            return self._extract_directory(manager, resource_name)
 
         parts = resource_name.split('/')
         zip_path = os.path.join(self.module_path, *parts)