[gnue] r9547 - in trunk: gnue-common/src/definitions gnue-common/src/utils gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2007-05-03 01:53:01 -0500 (Thu, 03 May 2007)
New Revision: 9547

Modified:
   trunk/gnue-common/src/definitions/GParserHelpers.py
   trunk/gnue-common/src/utils/file.py
   trunk/gnue-common/src/utils/xlocale.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Epydoc fixes.


Modified: trunk/gnue-common/src/definitions/GParserHelpers.py
===================================================================
--- trunk/gnue-common/src/definitions/GParserHelpers.py 2007-05-02 12:00:22 UTC 
(rev 9546)
+++ trunk/gnue-common/src/definitions/GParserHelpers.py 2007-05-03 06:53:01 UTC 
(rev 9547)
@@ -654,7 +654,7 @@
   # Don't merge contents instances
   # ---------------------------------------------------------------------------
 
-  def merge (self, other, maxIdLength=None):
+  def merge (self, other, maxIdLength = None, overwrite=False):
     """
     Content objects cannot be merged together
     """

Modified: trunk/gnue-common/src/utils/file.py
===================================================================
--- trunk/gnue-common/src/utils/file.py 2007-05-02 12:00:22 UTC (rev 9546)
+++ trunk/gnue-common/src/utils/file.py 2007-05-03 06:53:01 UTC (rev 9547)
@@ -58,16 +58,16 @@
 def to_buffer(item):
     """
     Convert a string to a file object if it is not already.
-    
+
     Examples:
-    
+
         >>> to_buffer('This is text\nFoo.').read()
-        
+
         >>> my_file = open('/etc/passwd')
         >>> to_buffer(my_file) == my_file
         >>> myfile.read()
         <<< True
-        
+
     """
     if hasattr(item, 'read'): 
         return item

Modified: trunk/gnue-common/src/utils/xlocale.py
===================================================================
--- trunk/gnue-common/src/utils/xlocale.py      2007-05-02 12:00:22 UTC (rev 
9546)
+++ trunk/gnue-common/src/utils/xlocale.py      2007-05-03 06:53:01 UTC (rev 
9547)
@@ -45,9 +45,9 @@
     digits> can be repeated.
 
     Examples: assume a call of format_numeric('%.2f', 1234567.89, pat) with
-      pat =   ',3.'   result is 1,234,567.89
-      pat = ',3.3,'   result is 1,234.567,89
-      pat = '#2.1;'   result is 1#23.4#56.7;89
+        - pat =   ',3.'   result is 1,234,567.89
+        - pat = ',3.3,'   result is 1,234.567,89
+        - pat = '#2.1;'   result is 1#23.4#56.7;89
 
     In the last example you can see that the grouping pattern will be repeated
     as a whole.

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2007-05-02 12:00:22 UTC (rev 
9546)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2007-05-03 06:53:01 UTC (rev 
9547)
@@ -45,10 +45,10 @@
 
     A block covers all aspects of a form's connection to a data source.
 
-    Blocks can be filled with data by using the L{init_filter}, L{copy_filter},
-    and L{execute_filter} methods or in a single step with the L{set_filter}
-    method.  The L{clear} method populates the block with a single empty
-    record.
+    Blocks can be filled with data by using the L{init_filter},
+    L{change_filter}, and L{apply_filter} methods or in a single step with the
+    L{set_filter} method.  The L{clear} method populates the block with a
+    single empty record.
 
     Within the result set, blocks maintain a pointer to a current record which
     can be moved around with the L{first_record}, L{prev_record},