[Zenoss-commit] r9393 - trunk/Products/ZenRRD

[<sv...@ze...>]

Author: ecn
Date: 2008-06-03 13:58:00 -0400 (Tue, 03 Jun 2008)
New Revision: 9393

Modified:
   trunk/Products/ZenRRD/RenderServer.py
   trunk/Products/ZenRRD/zenrender.py
Log:
cleaner acceptance of ms option to render calls

Modified: trunk/Products/ZenRRD/RenderServer.py
===================================================================
--- trunk/Products/ZenRRD/RenderServer.py	2008-06-03 16:01:26 UTC (rev 9392)
+++ trunk/Products/ZenRRD/RenderServer.py	2008-06-03 17:58:00 UTC (rev 9393)
@@ -126,8 +126,10 @@
     security.declareProtected('View', 'render')
     def render(self, gopts=None, start=None, end=None, drange=None, 
                remoteUrl=None, width=None, ftype='PNG', getImage=True, 
-               graphid='', comment=None, REQUEST=None):
+               graphid='', comment=None, ms=None, REQUEST=None):
         """render a graph and return it"""
+        # ms unused: ms is just a timestamp used to force IE to reload
+        # images
         gopts = zlib.decompress(urlsafe_b64decode(gopts))
         gopts = gopts.split('|')
         gopts = self.removeInvalidRRDReferences(gopts)

Modified: trunk/Products/ZenRRD/zenrender.py
===================================================================
--- trunk/Products/ZenRRD/zenrender.py	2008-06-03 16:01:26 UTC (rev 9392)
+++ trunk/Products/ZenRRD/zenrender.py	2008-06-03 17:58:00 UTC (rev 9393)
@@ -65,10 +65,6 @@
         self.rs = RenderServer(self.name)
 
     def remote_render(self, *args, **kw):
-        try:
-            del kw['ms']
-        except KeyError:
-            pass
         return self.rs.render(*args, **kw)
 
     def remote_packageRRDFiles(self, *args, **kw):