patch for layout service in 3.4.2

Jacob Smullyan <[email protected]> Thu, 18 May 2006 17:09:26 -0400
Newsgroups gmane.comp.web.skunkweb
Message-ID <[email protected]>
The layout service in skunkweb 3.4.2 has some nasty typo-like errors.
I can't commit to berlios right now so I'm attaching a patch.  When
berlios is working properly for me again I'll check it in and cut a
brown bag release.

j

-- 
Jacob Smullyan
skunkweb-3.4.2-layout.diff (text/plain, 1.7 KB)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1752)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2006-05-18  Jacob Smullyan  <[email protected]>
+
+	* SkunkWeb/Services/layout/slots.py: fix several NameErrors (cut
+	and paste errors).
+
 2006-05-09  Jacob Smullyan  <[email protected]>
 
 	* configure.in (SW_VERSION), configure, SkunkWeb/configure.in,
Index: SkunkWeb/Services/layout/slots.py
===================================================================
--- SkunkWeb/Services/layout/slots.py	(revision 1752)
+++ SkunkWeb/Services/layout/slots.py	(working copy)
@@ -29,9 +29,9 @@
 class ComponentSlot(Slot):
     def __init__(self, name, compname, comptype=None, cache=computils.NO, **kw):
         Slot.__init__(self, name)
-        self.compname=relpath(compname)
+        self.compname=computils.relpath(compname)
         if comptype is None:
-            self.comptype=guess_comptype(compname)
+            self.comptype=computils.guess_comptype(compname)
         self.cache=cache
         self.extra=kw
 
@@ -42,12 +42,12 @@
         try:
             push_slot(self.name)
             if self.comptype==DT_INCLUDE:
-                res=include(self.compname)
+                res=computils.include(self.compname)
             else:
-                res=component(self.compname,
-                              comptype=self.comptype,
-                              cache=cache,
-                              **kwargs)
+                res=computils.component(self.compname,
+                                        comptype=self.comptype,
+                                        cache=cache,
+                                        **kwargs)
 
         finally:
             pop_slot()