SVN: r20986 - in trunk/quixote: . demo doc

Author: akuchlin
Date: 2003-03-06 10:39:28 -0500 (Thu, 06 Mar 2003)
New Revision: 20986

Modified:
   trunk/quixote/CHANGES
   trunk/quixote/demo/__init__.py
   trunk/quixote/doc/static-files.txt
   trunk/quixote/util.py
Log:
Rename StaticFilesFolder to StaticDirectory

Modified: trunk/quixote/demo/__init__.py
==============================================================================
--- trunk/quixote/demo/__init__.py	(original)
+++ trunk/quixote/demo/__init__.py	2003-03-06 10:39:30.000000000 -0500
@@ -5,7 +5,7 @@
 from quixote.demo.pages import _q_index, dumpreq
 from quixote.demo.widgets import widgets
 from quixote.demo.integer_ui import IntegerUI
-from quixote.util import StaticFilesFolder
+from quixote.util import StaticDirectory
 
 def simple (request):
     # This function returns a plain text document, not HTML.
@@ -31,4 +31,4 @@
 import os
 from quixote.demo import forms
 curdir = os.path.dirname(forms.__file__)
-srcdir = StaticFilesFolder(curdir, list_folder=1)
+srcdir = StaticDirectory(curdir, list_folder=1)

Modified: trunk/quixote/util.py
==============================================================================
--- trunk/quixote/util.py	(original)
+++ trunk/quixote/util.py	2003-03-06 10:39:30.000000000 -0500
@@ -8,10 +8,10 @@
                           'func' with the method name and parameters.
   StaticFile            : Wraps a file from a filesystem as a
                           Quixote resource.
-  StaticFilesFolder     : Wraps a filesystem folder containing static
-                          files as a Quixote namespace.
+  StaticDirectory       : Wraps a directory containing static files as
+                          a Quixote namespace. 
 
-StaticFile and StaticFilesFolder were contributed by Hamish Lawson.
+StaticFile and StaticDirectory were contributed by Hamish Lawson.
 See doc/static-files.txt for examples of their use.
 """
 
@@ -108,7 +108,7 @@
         return contents
 
 
-class StaticFilesFolder:
+class StaticDirectory:
 
     """
     Wrap a filesystem folder containing static files as a Quixote namespace.
@@ -117,7 +117,7 @@
     _q_exports = []
 
     def __init__(self, path, use_cache=0, list_folder=0, follow_symlinks=0):
-        """StaticFilesFolder(path:string, use_cache:bool,
+        """StaticDirectory(path:string, use_cache:bool,
                              list_folder:bool, follow_symlinks:bool)
         
         Initialize instance with the absolute path to the file.
@@ -164,7 +164,7 @@
     def _q_getname(self, request, name):
         """
         Get a file from the filesystem folder and return the StaticFile
-        or StaticFilesFolder wrapper of it; use caching if that is in use.
+        or StaticDirectory wrapper of it; use caching if that is in use.
         """
         if name in ('.', '..'):
             raise errors.TraversalError(private_msg="Attempt to use '.', '..'")
@@ -182,7 +182,7 @@
                     item_filepath = os.path.join(self.path, dest)
 
             if os.path.isdir(item_filepath):
-                item = StaticFilesFolder(item_filepath, self.use_cache,
+                item = StaticDirectory(item_filepath, self.use_cache,
                         self.list_folder, self.follow_symlinks)
             elif os.path.isfile(item_filepath):
                 item = StaticFile(item_filepath, self.use_cache,
@@ -191,7 +191,7 @@
                 raise errors.TraversalError
             if self.use_cache:
                 self.cache[name] = item
-        if isinstance(item, StaticFilesFolder):
+        if isinstance(item, StaticDirectory):
             return item
         else:
             return item(request)

Modified: trunk/quixote/doc/static-files.txt
==============================================================================
--- trunk/quixote/doc/static-files.txt	(original)
+++ trunk/quixote/doc/static-files.txt	2003-03-06 10:39:30.000000000 -0500
@@ -28,9 +28,9 @@
 A directory
 -----------
 
-Map a complete filesytem folder containing static files, by default
+Map a complete filesystem directory containing static files, by default
 not caching their contents.
 
 ::
-    notes = StaticFilesFolder("/htdocs/legacy_app/notes")
+    notes = StaticDirectory("/htdocs/legacy_app/notes")
 

Modified: trunk/quixote/CHANGES
==============================================================================
--- trunk/quixote/CHANGES	(original)
+++ trunk/quixote/CHANGES	2003-03-06 10:39:30.000000000 -0500
@@ -8,7 +8,7 @@
     Note that this means HTML templates will not work with Python 2.0
     unless you compile the C extension.
 
-  * Added StaticFile and StaticFilesFolder classes to quixote.util.
+  * Added StaticFile and StaticDirectory classes to quixote.util.
     Consult doc/static-files.txt for examples.  (Contributed and
     documented by Hamish Lawson.)