[Epydoc-commits] SF.net SVN: epydoc: [1154] trunk/epydoc/src/epydoc
Brought to you by:
edloper
From: <ed...@us...> - 2006-04-04 01:50:04
|
Revision: 1154 Author: edloper Date: 2006-04-03 18:49:57 -0700 (Mon, 03 Apr 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1154&view=rev Log Message: ----------- - Renamed DottedName.Invalid -> DottedName.InvalidDottedName Modified Paths: -------------- trunk/epydoc/src/epydoc/apidoc.py trunk/epydoc/src/epydoc/docbuilder.py trunk/epydoc/src/epydoc/docintrospecter.py trunk/epydoc/src/epydoc/docstringparser.py Modified: trunk/epydoc/src/epydoc/apidoc.py =================================================================== --- trunk/epydoc/src/epydoc/apidoc.py 2006-04-04 01:35:13 UTC (rev 1153) +++ trunk/epydoc/src/epydoc/apidoc.py 2006-04-04 01:49:57 UTC (rev 1154) @@ -74,7 +74,7 @@ $""" % re.escape(UNREACHABLE)) - class Invalid(ValueError): + class InvalidDottedName(ValueError): """ An exception raised by the DottedName constructor when one of its arguments is not a valid dotted name. @@ -92,7 +92,7 @@ it is a valid identifier. """ if len(pieces) == 0: - raise DottedName.Invalid('Empty DottedName') + raise DottedName.InvalidDottedName('Empty DottedName') self._identifiers = [] for piece in pieces: if isinstance(piece, DottedName): @@ -101,11 +101,13 @@ for subpiece in piece.split('.'): if not self._IDENTIFIER_RE.match(subpiece): log.debug('Bad identifier %r' % (piece,)) - raise DottedName.Invalid('Bad identifier %r' % (piece,)) + raise DottedName.InvalidDottedName( + 'Bad identifier %r' % (piece,)) self._identifiers.append(subpiece) else: log.debug('Bad identifier %r' % (piece,)) - raise DottedName.Invalid('Bad identifier %r' % (piece,)) + raise DottedName.InvalidDottedName( + 'Bad identifier %r' % (piece,)) self._identifiers = tuple(self._identifiers) def __repr__(self): Modified: trunk/epydoc/src/epydoc/docbuilder.py =================================================================== --- trunk/epydoc/src/epydoc/docbuilder.py 2006-04-04 01:35:13 UTC (rev 1153) +++ trunk/epydoc/src/epydoc/docbuilder.py 2006-04-04 01:49:57 UTC (rev 1154) @@ -1058,7 +1058,7 @@ try: name = DottedName(DottedName.UNREACHABLE, val_doc.pyval.__name__) - except DottedName.Invalid: + except DottedName.InvalidDottedName: name = DottedName(DottedName.UNREACHABLE) else: name = DottedName(DottedName.UNREACHABLE) Modified: trunk/epydoc/src/epydoc/docintrospecter.py =================================================================== --- trunk/epydoc/src/epydoc/docintrospecter.py 2006-04-04 01:35:13 UTC (rev 1153) +++ trunk/epydoc/src/epydoc/docintrospecter.py 2006-04-04 01:49:57 UTC (rev 1154) @@ -180,7 +180,7 @@ val_doc = _valuedoc_cache.get(pyid) if val_doc is None: try: canonical_name = get_canonical_name(value) - except DottedName.Invalid: canonical_name = UNKNOWN + except DottedName.InvalidDottedName: canonical_name = UNKNOWN val_doc = ValueDoc(pyval=value, canonical_name = canonical_name, docs_extracted_by='introspecter') _valuedoc_cache[pyid] = val_doc Modified: trunk/epydoc/src/epydoc/docstringparser.py =================================================================== --- trunk/epydoc/src/epydoc/docstringparser.py 2006-04-04 01:35:13 UTC (rev 1153) +++ trunk/epydoc/src/epydoc/docstringparser.py 2006-04-04 01:49:57 UTC (rev 1154) @@ -465,7 +465,7 @@ C{tag} in C{api_doc.exception_descrs}.""" _check(api_doc, tag, arg, context=RoutineDoc, expect_arg='single') try: name = DottedName(arg) - except DottedName.Invalid: name = arg + except DottedName.InvalidDottedName: name = arg api_doc.exception_descrs.append( (name, descr) ) def process_sort_field(api_doc, docindex, tag, arg, descr): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |