[Epydoc-commits] SF.net SVN: epydoc: [1713] trunk/epydoc/src/epydoc/cli.py

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

Revision: 1713
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1713&view=rev
Author:   edloper
Date:     2008-02-01 22:28:09 -0800 (Fri, 01 Feb 2008)

Log Message:
-----------
- Removed restriction that --text can only take one name
- Fixed bug that caused --text and --check to fail
- Put blank lines around generated text docs

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

Modified: trunk/epydoc/src/epydoc/cli.py
===================================================================
--- trunk/epydoc/src/epydoc/cli.py	2008-02-02 02:38:41 UTC (rev 1712)
+++ trunk/epydoc/src/epydoc/cli.py	2008-02-02 06:28:09 UTC (rev 1713)
@@ -495,8 +495,6 @@
     if not options.parse and not options.introspect:
         optparser.error("Invalid option combination: --parse-only "
                         "and --introspect-only.")
-    if 'text' in options.actions and len(names) > 1:
-        optparser.error("--text option takes only one name.")
 
     # Check the list of requested graph types to make sure they're
     # acceptable.
@@ -730,6 +728,7 @@
 
     # check the output targets.
     for action in options.actions:
+        if action not in TARGET_ACTIONS: continue
         target = options.target[action]
         if os.path.exists(target):
             if action not in ['html', 'latex'] and os.path.isdir(target):
@@ -1026,13 +1025,13 @@
     log.start_progress('Writing output')
     from epydoc.docwriter.plaintext import PlaintextWriter
     plaintext_writer = PlaintextWriter()
-    s = ''
+    s = '\n'
     for apidoc in docindex.root:
-        s += plaintext_writer.write(apidoc, **options.__dict__)
+        s += plaintext_writer.write(apidoc, **options.__dict__)+'\n'
     log.end_progress()
     if isinstance(s, unicode):
         s = s.encode('ascii', 'backslashreplace')
-    print s
+    sys.stdout.write(s)
 
 def check_docs(docindex, options):
     from epydoc.checker import DocChecker
@@ -1117,6 +1116,7 @@
 ######################################################################
 #{ Logging
 ######################################################################
+# [xx] this should maybe move to util.py or log.py
     
 class TerminalController:
     """


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