diff --git a/py/apigen/htmlgen.py b/py/apigen/htmlgen.py index 90c0a49bd..b77b77a90 100644 --- a/py/apigen/htmlgen.py +++ b/py/apigen/htmlgen.py @@ -193,9 +193,9 @@ def wrap_page(project, title, contentel, navel, outputpath, stylesheeturl, class AbstractPageBuilder(object): def write_page(self, title, reltargetpath, project, tag, nav): targetpath = self.base.join(reltargetpath) - stylesheeturl = relpath('%s/' % (targetpath.dirpath(),), + stylesheeturl = relpath('%s%s' % (targetpath.dirpath(), os.path.sep), self.base.join('style.css').strpath) - scripturls = [relpath('%s/' % (targetpath.dirpath(),), + scripturls = [relpath('%s%s' % (targetpath.dirpath(), os.path.sep), self.base.join('api.js').strpath)] page = wrap_page(project, title, tag, nav, self.base, stylesheeturl, scripturls) diff --git a/py/apigen/linker.py b/py/apigen/linker.py index c789a1c47..1fd64cb66 100644 --- a/py/apigen/linker.py +++ b/py/apigen/linker.py @@ -42,7 +42,7 @@ class Linker(object): finally: del self.fromlocation -def relpath(p1, p2, sep='/', back='..', normalize=True): +def relpath(p1, p2, sep=os.path.sep, back='..', normalize=True): """ create a relative path from p1 to p2 sep is the seperator used for input and (depending diff --git a/py/apigen/testing/test_apigen_functional.py b/py/apigen/testing/test_apigen_functional.py index c8196cd22..36164e616 100644 --- a/py/apigen/testing/test_apigen_functional.py +++ b/py/apigen/testing/test_apigen_functional.py @@ -94,8 +94,8 @@ def test_get_documentable_items(): 'main.sub.func', 'somenamespace.baz', 'somenamespace.foo'] def test_apigen_functional(): - if py.std.sys.platform == "win32": - py.test.skip("XXX test fails on windows") + #if py.std.sys.platform == "win32": + # py.test.skip("XXX test fails on windows") fs_root, package_name = setup_fs_project('test_apigen_functional') tempdir = py.test.ensuretemp('test_apigen_functional_results') pydir = py.magic.autopath().dirpath().dirpath().dirpath()