From: Greg Stein <gstein@lyra.org>
Date: Sat, 20 Nov 1999 11:39:00 +0000 (+0000)
Subject: only put __path__ into package modules.
X-Git-Tag: v1.6a1~716
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d3165a5a13296f430e27fe59551281036c80904;p=thirdparty%2FPython%2Fcpython.git

only put __path__ into package modules.
---

diff --git a/Lib/imputil.py b/Lib/imputil.py
index 04344e0203d7..dd8c95cef968 100644
--- a/Lib/imputil.py
+++ b/Lib/imputil.py
@@ -436,7 +436,7 @@ def _fs_import(dir, modname):
 
   pathname = _os_path_join(dir, modname)
   if _os_path_isdir(pathname):
-    values = { '__pkgdir__' : pathname }
+    values = { '__pkgdir__' : pathname, '__path__' : [ pathname ] }
     ispkg = 1
     pathname = _os_path_join(pathname, '__init__')
   else:
@@ -609,7 +609,6 @@ class SysPathImporter(Importer):
     for dir in sys.path:
       result = _fs_import(dir, modname)
       if result:
-        result[2]['__path__'] = [ dir ]		# backwards compat
         return result
 
     # not found