[Checkins] SVN: z3ext.resource/trunk/ Fixed zrt resource, always return rendered content

[Nikolay Kim]

Log message for revision 103346:
  Fixed zrt resource, always return rendered content

Changed:
  U   z3ext.resource/trunk/CHANGES.txt
  U   z3ext.resource/trunk/setup.py
  U   z3ext.resource/trunk/src/z3ext/resource/zrtresource/zrtresource.py

-=-
Modified: z3ext.resource/trunk/CHANGES.txt
===================================================================
--- z3ext.resource/trunk/CHANGES.txt	2009-08-28 18:14:44 UTC (rev 103345)
+++ z3ext.resource/trunk/CHANGES.txt	2009-08-28 18:25:25 UTC (rev 103346)
@@ -2,9 +2,11 @@
 CHANGES
 =======
 
-1.3.0 (Unreleased)
+1.3.0 (2009-08-28)
 ------------------
 
+- Fixed zrt resource, always return rendered content
+
 - Copyright holder changed
 
 

Modified: z3ext.resource/trunk/setup.py
===================================================================
--- z3ext.resource/trunk/setup.py	2009-08-28 18:14:44 UTC (rev 103345)
+++ z3ext.resource/trunk/setup.py	2009-08-28 18:25:25 UTC (rev 103346)
@@ -21,7 +21,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '1.3.0dev'
+version = '1.3.0'
 
 
 setup(name='z3ext.resource',

Modified: z3ext.resource/trunk/src/z3ext/resource/zrtresource/zrtresource.py
===================================================================
--- z3ext.resource/trunk/src/z3ext/resource/zrtresource/zrtresource.py	2009-08-28 18:14:44 UTC (rev 103345)
+++ z3ext.resource/trunk/src/z3ext/resource/zrtresource/zrtresource.py	2009-08-28 18:25:25 UTC (rev 103346)
@@ -51,16 +51,9 @@
 
     def GET(self):
         """ default content """
-        data = super(ZRTFileResource, self).GET()
-        if self.request.response.getStatus() == 304:
-            return ''
+        return self.render(self.request)
 
-        # Process the file
-        p = ExtZRTProcessor(data, commands={'replace': Replace},
-                            commands_file = self._commands_file)
-        return p.process(getSite(), self.request)
 
-
 class ZRTFileResourceFactory(object):
 
     def __init__(self, path, checker, name, commands_file=''):