floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37733] Removed two rather useless methods that just delegated to methods on the 

underlying object, in favour of calling the underlying object's methods
directly (py.io.OutErrCapture.writeorg*).

--HG--
branch : trunk
This commit is contained in:
guido 2007-02-01 15:13:59 +01:00
parent 9f491f2058
commit 646d4f93e1
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
py/apigen/apigen.py
View File

@ -32,25 +32,25 @@ def build(pkgdir, dsa, capture):
apb = htmlgen.ApiPageBuilder(targetdir, l, dsa, pkgdir, namespace_tree) apb = htmlgen.ApiPageBuilder(targetdir, l, dsa, pkgdir, namespace_tree)
spb = htmlgen.SourcePageBuilder(targetdir, l, pkgdir) spb = htmlgen.SourcePageBuilder(targetdir, l, pkgdir)
capture.writeorgerr('preparing namespace pages\n') capture.err.writeorg('preparing namespace pages\n')
ns_data = apb.prepare_namespace_pages() ns_data = apb.prepare_namespace_pages()
capture.writeorgerr('preparing class pages\n') capture.err.writeorg('preparing class pages\n')
class_names = dsa.get_class_names() class_names = dsa.get_class_names()
class_data = apb.prepare_class_pages(class_names) class_data = apb.prepare_class_pages(class_names)
capture.writeorgerr('preparing function pages\n') capture.err.writeorg('preparing function pages\n')
function_names = dsa.get_function_names() function_names = dsa.get_function_names()
func_data = apb.prepare_function_pages(function_names) func_data = apb.prepare_function_pages(function_names)
capture.writeorgerr('preparing source pages\n') capture.err.writeorg('preparing source pages\n')
source_data = spb.prepare_pages(pkgdir) source_data = spb.prepare_pages(pkgdir)
capture.writeorgerr('building namespace pages\n') capture.err.writeorg('building namespace pages\n')
apb.build_namespace_pages(ns_data, proj) apb.build_namespace_pages(ns_data, proj)
capture.writeorgerr('building class pages\n') capture.err.writeorg('building class pages\n')
apb.build_class_pages(class_data, proj) apb.build_class_pages(class_data, proj)
apb.build_method_pages(method_data, proj) apb.build_method_pages(method_data, proj)
capture.writeorgerr('building function pages\n') capture.err.writeorg('building function pages\n')
apb.build_function_pages(func_data, proj) apb.build_function_pages(func_data, proj)
capture.writeorgerr('building source pages\n') capture.err.writeorg('building source pages\n')
spb.build_pages(source_data, proj, pkgdir) spb.build_pages(source_data, proj, pkgdir)
capture.writeorgerr('done building documentation\n') capture.err.writeorg('done building documentation\n')

14
py/io/capture.py
View File

@ -86,20 +86,6 @@ class OutErrCapture:
err = errfile.read() err = errfile.read()
return out, err return out, err
def writeorgout(self, str):
""" write something to the original stdout
"""
if not hasattr(self, 'out'):
raise IOError('stdout not patched')
self.out.writeorg(str)
def writeorgerr(self, str):
""" write something to the original stderr
"""
if not hasattr(self, 'err'):
raise IOError('stderr not patched')
self.err.writeorg(str)
def callcapture(func, *args, **kwargs): def callcapture(func, *args, **kwargs):
""" call the given function with args/kwargs """ call the given function with args/kwargs
and return a (res, out, err) tuple where and return a (res, out, err) tuple where