[svn r57429] merging/porting the release branch changes and

cleanups to trunk.

svn merge -r 56716:HEAD ../release/0.9.x/ to trunk

--HG--
branch : trunk

py/apigen/tracer/testing/test_package.py

@@ -8,6 +8,7 @@ from py.__.apigen.tracer import model
 import sys
 import py
 
+
 def setup_module(mod):
     sys.path.insert(0, str(py.path.local(__file__).dirpath().join("package")))
     import submodule
@@ -24,6 +25,8 @@ class TestFullModule(object):
     def test_init(self):
         ds = self.ds
         print py.builtin.sorted(ds.descs.keys())
+        if sys.platform == "win32":
+            py.test.skip("not sure why, but this fails with 4 == 6")
         assert len(ds.descs) == 6
         assert py.builtin.sorted(ds.descs.keys()) == [
                 'notpak.notmod.notclass', 'notpak.notmod.notclass.__init__',