[svn r62633] fix path bugs, don't feel like writing a test for this, currently.
--HG-- branch : trunk
This commit is contained in:
parent
c61eb2caac
commit
e9f275b176
|
@ -136,10 +136,11 @@ class Project:
|
||||||
else:
|
else:
|
||||||
self.stylesheet = None
|
self.stylesheet = None
|
||||||
else:
|
else:
|
||||||
p = py.path.local(stylesheet)
|
p = sourcepath.join(stylesheet)
|
||||||
if p.check():
|
if p.check():
|
||||||
stylesheet = p
|
stylesheet = p
|
||||||
self.stylesheet = stylesheet
|
self.stylesheet = stylesheet
|
||||||
|
#assert self.stylesheet
|
||||||
self.apigen_relpath = relpath(
|
self.apigen_relpath = relpath(
|
||||||
self.docpath.strpath + '/', self.apigenpath.strpath + '/')
|
self.docpath.strpath + '/', self.apigenpath.strpath + '/')
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ def getproject(path):
|
||||||
confrest = parent.join("confrest.py")
|
confrest = parent.join("confrest.py")
|
||||||
if confrest.check():
|
if confrest.check():
|
||||||
Project = confrest.pyimport().Project
|
Project = confrest.pyimport().Project
|
||||||
return Project(parent.dirpath())
|
return Project(parent)
|
||||||
|
|
||||||
class ReSTFile(py.test.collect.File):
|
class ReSTFile(py.test.collect.File):
|
||||||
def __init__(self, fspath, parent, project=None):
|
def __init__(self, fspath, parent, project=None):
|
||||||
|
|
Loading…
Reference in New Issue