consolidate py/code files into code.py, simplify SafeRepr code and docs.

--HG--
branch : trunk

py/test/plugin/pytest_doctest.py

@@ -14,7 +14,7 @@ as well.
 """
 
 import py
-from py.__.code.excinfo import Repr, ReprFileLocation
+from py.__.code.code import TerminalRepr, ReprFileLocation
 
 def pytest_addoption(parser):
     group = parser.addgroup("doctest options")
@@ -30,7 +30,7 @@ def pytest_collect_file(path, parent):
     if path.check(fnmatch="test_*.txt"):
         return DoctestTextfile(path, parent)
 
-class ReprFailDoctest(Repr):
+class ReprFailDoctest(TerminalRepr):
     def __init__(self, reprlocation, lines):
         self.reprlocation = reprlocation
         self.lines = lines

py/test/plugin/test_pytest_runner.py

@@ -1,6 +1,6 @@
 import py
 from py.__.test.plugin import pytest_runner as runner
-from py.__.code.excinfo import ReprExceptionInfo
+from py.__.code.code import ReprExceptionInfo
 
 class TestSetupState:
     def test_setup(self, testdir):