[py-svn] r33648 - in py/dist/py: apigen/tracer test/rsession

[fijal at codespeak.net]

Author: fijal
Date: Tue Oct 24 14:22:22 2006
New Revision: 33648

Modified:
   py/dist/py/apigen/tracer/docstorage.py
   py/dist/py/apigen/tracer/model.py
   py/dist/py/test/rsession/rsession.py
Log:
Removed debug print. Added some fixes.


Modified: py/dist/py/apigen/tracer/docstorage.py
==============================================================================
--- py/dist/py/apigen/tracer/docstorage.py	(original)
+++ py/dist/py/apigen/tracer/docstorage.py	Tue Oct 24 14:22:22 2006
@@ -84,8 +84,10 @@
             desc = FunctionDesc(key, value, **kwargs)
         elif isinstance(value, (types.ObjectType, types.ClassType)):
             desc = ClassDesc(key, value, **kwargs)
-            for name in dir(value):
-                field = getattr(value, name)
+            # XXX: This is the special case when we do not have __init__
+            #      in dir(value) for uknown reason. Need to investigate it
+            for name in dir(value) + ['__init__']:
+                field = getattr(value, name, None)
                 if isinstance(field, types.MethodType) and \
                     isinstance(field.im_func, types.FunctionType):
                     real_name = key + '.' + name

Modified: py/dist/py/apigen/tracer/model.py
==============================================================================
--- py/dist/py/apigen/tracer/model.py	(original)
+++ py/dist/py/apigen/tracer/model.py	Tue Oct 24 14:22:22 2006
@@ -42,7 +42,6 @@
         self.possibilities = set(possibilities)
     
     def unionof(self, other):
-        print self.possibilities
         if isinstance(other, SomeUnion):
             return SomeUnion(self.possibilities.union(other.possibilities))
         return SomeUnion(list(self.possibilities) + [other])

Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Tue Oct 24 14:22:22 2006
@@ -493,5 +493,5 @@
         
         if self.config.option.apigen:
             from py.__.apigen.rest.genrest import DirectPaste, RestGen, DirWriter
-            RestGen(self.docstorage, DirectPaste(), DirWriter()).write()
+            RestGen(self.docstorage, DirectPaste(), DirWriter("/tmp/output")).write()