[pypy-svn] r64406 - in pypy/release/1.1.x/pypy/doc: . jit

[arigo at codespeak.net]

Author: arigo
Date: Sun Apr 19 19:18:27 2009
New Revision: 64406

Modified:
   pypy/release/1.1.x/pypy/doc/confrest_oldpy.py
   pypy/release/1.1.x/pypy/doc/jit/   (props changed)
Log:
Merge r64405.


Modified: pypy/release/1.1.x/pypy/doc/confrest_oldpy.py
==============================================================================
--- pypy/release/1.1.x/pypy/doc/confrest_oldpy.py	(original)
+++ pypy/release/1.1.x/pypy/doc/confrest_oldpy.py	Sun Apr 19 19:18:27 2009
@@ -108,6 +108,7 @@
     title = "py lib"
     prefix_title = ""  # we have a logo already containing "py lib"
     encoding = 'latin1' 
+    stylesheet = None
     logo = html.div(
         html.a(
             html.img(alt="py lib", id='pyimg', height=114, width=154, 
@@ -130,7 +131,7 @@
             apigenpath = docpath
         self.apigenpath = apigenpath
         if stylesheet is None:
-            p = sourcepath.join("style.css")
+            p = sourcepath.join(self.stylesheet or "style.css")
             if p.check():
                 self.stylesheet = p
             else:
@@ -159,8 +160,8 @@
         stylesheet = self.stylesheet
         if isinstance(stylesheet, py.path.local):
             if not self.docpath.join(stylesheet.basename).check():
-                docpath.ensure(dir=True)
-                stylesheet.copy(docpath)
+                self.docpath.ensure(dir=True)
+                stylesheet.copy(self.docpath)
             stylesheet = relpath(outputpath.strpath,
                                  self.docpath.join(stylesheet.basename).strpath)