[Epydoc-commits] SF.net SVN: epydoc: [1629] trunk/epydoc/src/epydoc

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

Revision: 1629
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1629&view=rev
Author:   edloper
Date:     2007-09-23 17:49:36 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
- Changed all sites that expected DottedName to raise an exception to
  use the strict=True option, to make sure it does.

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

Modified: trunk/epydoc/src/epydoc/docbuilder.py
===================================================================
--- trunk/epydoc/src/epydoc/docbuilder.py	2007-09-24 00:48:48 UTC (rev 1628)
+++ trunk/epydoc/src/epydoc/docbuilder.py	2007-09-24 00:49:36 UTC (rev 1629)
@@ -1213,7 +1213,7 @@
           hasattr(val_doc.pyval, '__name__')):
         try:
             name = DottedName(DottedName.UNREACHABLE,
-                              val_doc.pyval.__name__)
+                              val_doc.pyval.__name__, strict=True)
         except DottedName.InvalidDottedName:
             name = DottedName(DottedName.UNREACHABLE)
     else:

Modified: trunk/epydoc/src/epydoc/docintrospecter.py
===================================================================
--- trunk/epydoc/src/epydoc/docintrospecter.py	2007-09-24 00:48:48 UTC (rev 1628)
+++ trunk/epydoc/src/epydoc/docintrospecter.py	2007-09-24 00:49:36 UTC (rev 1629)
@@ -157,7 +157,7 @@
     pyid = id(value)
     val_doc = _valuedoc_cache.get(pyid)
     if val_doc is None:
-        try: canonical_name = get_canonical_name(value)
+        try: canonical_name = get_canonical_name(value, strict=True)
         except DottedName.InvalidDottedName: canonical_name = UNKNOWN
         val_doc = ValueDoc(pyval=value, canonical_name = canonical_name,
                            docs_extracted_by='introspecter')
@@ -592,7 +592,7 @@
                     name)
         return None
 
-def get_canonical_name(value):
+def get_canonical_name(value, strict=False):
     """
     @return: the canonical name for C{value}, or C{UNKNOWN} if no
     canonical name can be found.  Currently, C{get_canonical_name}
@@ -606,30 +606,31 @@
 
     # Get the name via introspection.
     if isinstance(value, ModuleType):
-        dotted_name = DottedName(value.__name__)
+        dotted_name = DottedName(value.__name__, strict=strict)
         
     elif isclass(value):
         if value.__module__ == '__builtin__':
-            dotted_name = DottedName(value.__name__)
+            dotted_name = DottedName(value.__name__, strict=strict)
         else:
-            dotted_name = DottedName(value.__module__, value.__name__)
+            dotted_name = DottedName(value.__module__, value.__name__,
+                                     strict=strict)
             
     elif (inspect.ismethod(value) and value.im_self is not None and
           value.im_class is ClassType and
           not value.__name__.startswith('<')): # class method.
         class_name = get_canonical_name(value.im_self)
         if class_name is UNKNOWN: return UNKNOWN
-        dotted_name = DottedName(class_name, value.__name__)
+        dotted_name = DottedName(class_name, value.__name__, strict=strict)
     elif (inspect.ismethod(value) and
           not value.__name__.startswith('<')):
         class_name = get_canonical_name(value.im_class)
         if class_name is UNKNOWN: return UNKNOWN
-        dotted_name = DottedName(class_name, value.__name__)
+        dotted_name = DottedName(class_name, value.__name__, strict=strict)
     elif (isinstance(value, FunctionType) and
           not value.__name__.startswith('<')):
         module_name = _find_function_module(value)
         if module_name is None: return UNKNOWN
-        dotted_name = DottedName(module_name, value.__name__)
+        dotted_name = DottedName(module_name, value.__name__, strict=strict)
     else:
         return UNKNOWN
 

Modified: trunk/epydoc/src/epydoc/docstringparser.py
===================================================================
--- trunk/epydoc/src/epydoc/docstringparser.py	2007-09-24 00:48:48 UTC (rev 1628)
+++ trunk/epydoc/src/epydoc/docstringparser.py	2007-09-24 00:49:36 UTC (rev 1629)
@@ -693,7 +693,7 @@
     """Record the fact that C{api_doc} can raise the exception named
     C{tag} in C{api_doc.exception_descrs}."""
     _check(api_doc, tag, arg, context=RoutineDoc, expect_arg='single')
-    try: name = DottedName(arg)
+    try: name = DottedName(arg, strict=True)
     except DottedName.InvalidDottedName: name = arg
     api_doc.exception_descrs.append( (name, descr) )
 


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