[py-svn] r33663 - in py/dist/py/apigen: rest rest/testing tracer/testing

[fijal at codespeak.net]

Author: fijal
Date: Tue Oct 24 17:46:21 2006
New Revision: 33663

Modified:
   py/dist/py/apigen/rest/genrest.py
   py/dist/py/apigen/rest/testing/test_rest.py
   py/dist/py/apigen/tracer/testing/test_package.py
Log:
Cleanup.


Modified: py/dist/py/apigen/rest/genrest.py
==============================================================================
--- py/dist/py/apigen/rest/genrest.py	(original)
+++ py/dist/py/apigen/rest/genrest.py	Tue Oct 24 17:46:21 2006
@@ -230,7 +230,7 @@
             except KeyboardInterrupt, SystemError:
                 raise
             except:
-                source = "*Cannot get source*"
+                source = ["*Cannot get source*"]
             lines = []
             for num, line in enumerate(source):
                 if num == call_site.lineno - frame.code.firstlineno - 1:

Modified: py/dist/py/apigen/rest/testing/test_rest.py
==============================================================================
--- py/dist/py/apigen/rest/testing/test_rest.py	(original)
+++ py/dist/py/apigen/rest/testing/test_rest.py	Tue Oct 24 17:46:21 2006
@@ -5,16 +5,13 @@
 import py
 from StringIO import StringIO
 
-try:
-    from py.__.apigen.rest.genrest import ViewVC, RestGen, PipeWriter, \
+from py.__.apigen.rest.genrest import ViewVC, RestGen, PipeWriter, \
                                             DirWriter, FileWriter, \
                                             DirectPaste, DirectFS
-    from py.__.apigen.tracer.tracer import Tracer
-    from py.__.apigen.tracer.docstorage import DocStorage
+from py.__.apigen.tracer.tracer import Tracer
+from py.__.apigen.tracer.docstorage import DocStorage
 
-    from py.__.apigen.tracer.testing.runtest import cut_pyc
-except ImportError, s:
-    py.test.skip("Cannot import: %s" % str(s))
+from py.__.apigen.tracer.testing.runtest import cut_pyc
 
 def setup_module(mod):
     mod.temppath = py.test.ensuretemp('restgen')

Modified: py/dist/py/apigen/tracer/testing/test_package.py
==============================================================================
--- py/dist/py/apigen/tracer/testing/test_package.py	(original)
+++ py/dist/py/apigen/tracer/testing/test_package.py	Tue Oct 24 17:46:21 2006
@@ -10,7 +10,10 @@
 
 def setup_module(mod):
     sys.path.insert(0, str(py.path.local(__file__).dirpath().join("package")))
-    import submodule
+    try:
+        import submodule
+    except ImportError:
+        py.test.skip("Importing submodule")
     mod.submodule = submodule
 
 def teardown_module(mod):