simplify actioninfo interface; fix actioninfos passed as tuple via _info

6 files changed, 17 insertions, 25 deletions

diff --git a/TODO.txt b/TODO.txt
index 1253b9b16..baed9e03f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -6,12 +6,16 @@ Must-Have
 
 - Introspection:
 
-  * Narrative docs.
+  * Why do translation directories report weird actioninfo?
+
+  * Review narrative docs.
 
   * ``default root factory`` category?
 
   * ``default view mapper`` category?
 
+  * get rid of "tweens" category (can't sort properly?)
+
   * implement ptweens and proutes based on introspection instead of current
     state of affairs.
 
diff --git a/pyramid/config/util.py b/pyramid/config/util.py
index 81c5d8176..3a2f911dc 100644
--- a/pyramid/config/util.py
+++ b/pyramid/config/util.py
@@ -26,20 +26,15 @@ DEFAULT_PHASH = md5().hexdigest()
 @implementer(IActionInfo)
 class ActionInfo(object):
     def __init__(self, file, line, function, src):
-        line = line or 0
-        src = src or ''
-        srclines = src.split('\n')
-        src = '\n'.join('    %s' % x for x in srclines)
-        self._src = src
         self.file = file
         self.line = line
-        self.column = None
-        self.eline = None
-        self.ecolumn = None
         self.function = function
+        self.src = src
 
     def __str__(self):
-        return 'Line %s of file %s:\n%s' % (self.line, self.file, self._src)
+        srclines = self.src.split('\n')
+        src = '\n'.join('    %s' % x for x in srclines)
+        return 'Line %s of file %s:\n%s' % (self.line, self.file, src)
 
 def action_method(wrapped):
     """ Wrapper to provide the right conflict info report data when a method
@@ -48,6 +43,9 @@ def action_method(wrapped):
         if self._ainfo is None:
             self._ainfo = []
         info = kw.pop('_info', None)
+        if is_nonstr_iter(info) and len(info) == 4:
+            # _info permitted as extract_stack tuple
+            info = ActionInfo(*info)
         if info is None:
             try:
                 f = traceback.extract_stack(limit=3)
diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index c656c3510..0261ae3db 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -1008,15 +1008,6 @@ class IActionInfo(Interface):
     line = Attribute(
         'Starting line number in file (as an integer) of action-invoking code.'
         'This will be ``None`` if the value could not be determined.')
-    column = Attribute(
-        'Starting column number in file (as an integer) of action-invoking '
-        'code.  This will be ``None`` if the value could not be determined.')
-    eline = Attribute(
-        'Ending line number in file (as an integer) of action-invoking code.'
-        'This will be ``None`` if the value could not be determined.')
-    ecolumn = Attribute(
-        'Ending column number in file (as an integer) of action-invoking code.'
-        'This will be ``None`` if the value could not be determined.')
 
     def __str__():
         """ Return a representation of the action information (including
diff --git a/pyramid/registry.py b/pyramid/registry.py
index d594ae910..7e373b58a 100644
--- a/pyramid/registry.py
+++ b/pyramid/registry.py
@@ -243,5 +243,4 @@ class Introspectable(dict):
                 (category_name, discriminator)
                 )
 
-
 global_registry = Registry('global')
diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py
index c2b63dfc0..17dacdc5b 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/pyramid/tests/test_config/test_init.py
@@ -976,7 +976,7 @@ pyramid.tests.test_config.dummy_include2""",
                 conflicts = e._conflicts.values()
                 for conflict in conflicts:
                     for confinst in conflict:
-                        yield confinst[3]
+                        yield confinst.src
             which = list(scanconflicts(why))
             self.assertEqual(len(which), 4)
             self.assertTrue("@view_config(renderer='string')" in which)
diff --git a/pyramid/tests/test_config/test_util.py b/pyramid/tests/test_config/test_util.py
index 12d3055d0..1180e7e29 100644
--- a/pyramid/tests/test_config/test_util.py
+++ b/pyramid/tests/test_config/test_util.py
@@ -331,11 +331,11 @@ class TestActionInfo(unittest.TestCase):
         verifyObject(IActionInfo, self._makeOne('f', 0, 'f', 'f'))
 
     def test_ctor(self):
-        inst = self._makeOne('filename', 10, 'function', '  linerepr\n\nfoo')
+        inst = self._makeOne('filename', 10, 'function', 'src')
+        self.assertEqual(inst.file, 'filename')
         self.assertEqual(inst.line, 10)
-        self.assertEqual(inst.column, None)
-        self.assertEqual(inst.eline, None)
-        self.assertEqual(inst.ecolumn, None)
+        self.assertEqual(inst.function, 'function')
+        self.assertEqual(inst.src, 'src')
 
     def test___str__(self):
         inst = self._makeOne('filename', 0, 'function', '   linerepr  ')