fixed rstat.getDataFrame()

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2095 fd906abe-77d9-0310-91a1-e0d9ade77398

pyscript/configure.zcml

@@ -20,7 +20,7 @@
         />
     <require
         permission="zope.ManageContent"
-        set_attributes="parameters source contentType"
+        set_attributes="title parameters source contentType"
         />
     <implements
         interface="zope.annotation.interfaces.IAttributeAnnotatable"

pyscript/rstat.py

@@ -88,7 +88,7 @@ class RStat(object):
         rows = {}
         for rowId, columnId, value in data:
             element = rows.setdefault(rowId, [])
-            element.append(rowId)
+            element.append(columnId)
         columnsToOmit = []
         for rowId, row in rows.items():
             for columnId in row:
@@ -98,8 +98,7 @@ class RStat(object):
         result = {}
         for rowId, columnId, value in data:
             if columnId not in columnsToOmit:
-                element = result.setdefault(rowId, [])
-                element.append(value)
-        rpy.set_default_mode(rpy.NO_CONVERSION)
-        matrix = r.data_frame(**result)
+                result.setdefault(rowId, []).append(value)
+        #print result
+        matrix = rpy.with_mode(rpy.NO_CONVERSION, r.data_frame)(**result)
         return matrix

pyscript/script.py

@@ -61,7 +61,7 @@ class RExpression(RestrictedPython.RCompile.RestrictedCompileMode):
 
     CodeGeneratorClass = compiler.pycodegen.ExpressionCodeGenerator
 
-    def __init__(self, source, filename, mode = "eval"):
+    def __init__(self, source, filename, mode="eval"):
         self.mode = mode
         RestrictedPython.RCompile.RestrictedCompileMode.__init__(
             self, source, filename)

pyscript/tests.py

@@ -26,7 +26,7 @@ from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.traversing.adapters import RootPhysicallyLocatable
 from zope.app.container.contained import Contained
 from zope.app.testing import placelesssetup
-from cybertools.pyscript.script import ScriptContainer
+from cybertools.pyscript.script import ScriptContainer, HAS_R
 
 
 class Root(ScriptContainer, Contained):
@@ -44,10 +44,12 @@ def setUp(test):
 
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-    return unittest.TestSuite((
-        DocFileSuite('README.txt', optionflags=flags,
-                     setUp=setUp, tearDown=placelesssetup.tearDown),
-        ))
+    suites = [DocFileSuite('README.txt', optionflags=flags,
+              setUp=setUp, tearDown=placelesssetup.tearDown)]
+    if HAS_R:
+        suites.append(DocFileSuite('rstat.txt', optionflags=flags,
+                      setUp=setUp, tearDown=placelesssetup.tearDown))
+    return unittest.TestSuite(suites)
 
 if __name__ == '__main__':
     unittest.main()