From e9f275b176b0f478514788947c880eb02e048a27 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Fri, 6 Mar 2009 11:59:02 +0100
Subject: [PATCH] [svn r62633] fix path bugs, don't feel like writing a test
 for this, currently.

--HG--
branch : trunk
---
 py/doc/confrest.py               | 3 ++-
 py/test/plugin/pytest_restdoc.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/py/doc/confrest.py b/py/doc/confrest.py
index 5b400aced..381dd1b86 100644
--- a/py/doc/confrest.py
+++ b/py/doc/confrest.py
@@ -136,10 +136,11 @@ class Project:
             else:
                 self.stylesheet = None
         else:
-            p = py.path.local(stylesheet)
+            p = sourcepath.join(stylesheet)
             if p.check():
                 stylesheet = p
             self.stylesheet = stylesheet
+        #assert self.stylesheet
         self.apigen_relpath = relpath(
             self.docpath.strpath + '/', self.apigenpath.strpath + '/')
 
diff --git a/py/test/plugin/pytest_restdoc.py b/py/test/plugin/pytest_restdoc.py
index f77c4ef14..1429b215e 100644
--- a/py/test/plugin/pytest_restdoc.py
+++ b/py/test/plugin/pytest_restdoc.py
@@ -24,7 +24,7 @@ def getproject(path):
         confrest = parent.join("confrest.py")
         if confrest.check():
             Project = confrest.pyimport().Project
-            return Project(parent.dirpath())
+            return Project(parent)
 
 class ReSTFile(py.test.collect.File):
     def __init__(self, fspath, parent, project=None):