SystemField changed to use method "_text" instead of "text" to allow …

…override
marinho · Mar 29, 2011 · f5826db · f5826db
1 parent 66f7918
commit f5826db
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+2011-03-29: Version 0.4.12-stable
+--------------------------------
+
+* SystemField changed to use method "_text" instead of "text" to allow override
+
 2011-02-16: Version 0.4.11-alpha
 --------------------------------
 

diff --git a/docs/marketing/Geraldo Reports projects.key b/docs/marketing/Geraldo Reports projects.key
diff --git a/docs/marketing/Geraldo Reports projects.pdf b/docs/marketing/Geraldo Reports projects.pdf
diff --git a/docs/marketing/page1.png b/docs/marketing/page1.png
diff --git a/docs/marketing/page2.png b/docs/marketing/page2.png
diff --git a/geraldo/__init__.py b/geraldo/__init__.py
@@ -43,7 +43,7 @@
 - tests - a package with automated doc tests.
 """
 
-VERSION = (0, 4, 11, 'alpha')
+VERSION = (0, 4, 12, 'stable')
 
 def get_version():
     return '%d.%d.%d-%s'%VERSION

diff --git a/geraldo/widgets.py b/geraldo/widgets.py
@@ -329,7 +329,7 @@ def __init__(self, **kwargs):
 
         self.fields['current_datetime'] = datetime.datetime.now()
 
-    def text(self):
+    def _text(self):
         page_number = (self.fields.get('page_number') or self.generator._current_page_number) + self.generator.first_page_number - 1
         page_count = self.fields.get('page_count') or self.generator.get_page_count()
 
@@ -347,6 +347,8 @@ def text(self):
             return self.get_value(self.expression, fields)
 
         return self.expression%SystemFieldDict(self, fields)
+
+    def text(self): return self._text()
     text = property(text)
 
     def clone(self):