[Epydoc-commits] SF.net SVN: epydoc: [1647] trunk/epydoc/src/epydoc/docintrospecter.py

[<ed...@us...>]

Revision: 1647
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1647&view=rev
Author:   edloper
Date:     2007-09-25 15:06:15 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
- When checking if a module's vars are imported or not, use the version
  of the module name with any primes stripped out (primes are added if
  a submodule is shadowed by its package's vars).

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docintrospecter.py

Modified: trunk/epydoc/src/epydoc/docintrospecter.py
===================================================================
--- trunk/epydoc/src/epydoc/docintrospecter.py	2007-09-25 21:37:57 UTC (rev 1646)
+++ trunk/epydoc/src/epydoc/docintrospecter.py	2007-09-25 22:06:15 UTC (rev 1647)
@@ -232,6 +232,7 @@
     dotted_name = module_doc.canonical_name
     if dotted_name is UNKNOWN:
         dotted_name = DottedName(module.__name__)
+    name_without_primes = DottedName(str(dotted_name).replace("'", ""))
         
     # Record the module's parent package, if it has one.
     if len(dotted_name) > 1:
@@ -267,7 +268,7 @@
         # value if it's defined in this module.
         container = get_containing_module(child)
         if ((container is not None and
-             container == module_doc.canonical_name) or
+             container == name_without_primes) or
             (public_names is not None and
              child_name in public_names)):
             # Local variable.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.