[pypy-svn] r57783 - in pypy/branch/pypy-pytrunk/pypy: doc tool

[hpk at codespeak.net]

Author: hpk
Date: Tue Sep  2 22:47:48 2008
New Revision: 57783

Modified:
   pypy/branch/pypy-pytrunk/pypy/doc/conftest.py
   pypy/branch/pypy-pytrunk/pypy/tool/ansi_mandelbrot.py
   pypy/branch/pypy-pytrunk/pypy/tool/ansi_print.py
Log:
fix a few deprecated usages, don't depend on docutils being installed.


Modified: pypy/branch/pypy-pytrunk/pypy/doc/conftest.py
==============================================================================
--- pypy/branch/pypy-pytrunk/pypy/doc/conftest.py	(original)
+++ pypy/branch/pypy-pytrunk/pypy/doc/conftest.py	Tue Sep  2 22:47:48 2008
@@ -1,6 +1,5 @@
 import py
 from py.__.doc.conftest import Directory, DoctestText, DocfileTests
-from py.__.rest.directive import register_linkrole
 
 thisdir = py.magic.autopath().dirpath()
 
@@ -42,6 +41,7 @@
 
 try:
     from docutils.parsers.rst import directives, states, roles
+    from py.__.rest.directive import register_linkrole
 except ImportError:
     pass
 else:

Modified: pypy/branch/pypy-pytrunk/pypy/tool/ansi_mandelbrot.py
==============================================================================
--- pypy/branch/pypy-pytrunk/pypy/tool/ansi_mandelbrot.py	(original)
+++ pypy/branch/pypy-pytrunk/pypy/tool/ansi_mandelbrot.py	Tue Sep  2 22:47:48 2008
@@ -1,6 +1,6 @@
 import sys
 
-from py.__.misc.terminal_helper import ansi_print, get_terminal_width
+from py.__.io.terminalwriter import ansi_print, get_terminal_width
 
 """
 Black       0;30     Dark Gray     1;30

Modified: pypy/branch/pypy-pytrunk/pypy/tool/ansi_print.py
==============================================================================
--- pypy/branch/pypy-pytrunk/pypy/tool/ansi_print.py	(original)
+++ pypy/branch/pypy-pytrunk/pypy/tool/ansi_print.py	Tue Sep  2 22:47:48 2008
@@ -4,7 +4,7 @@
 
 import sys
 
-from py.__.misc.terminal_helper import ansi_print
+from py.__.io.terminalwriter import ansi_print
 from pypy.tool.ansi_mandelbrot import Driver
 
 class AnsiLog: